Skip to content

Commit 65707ff

Browse files
BrennanConroyBrennanConroy
authored
Merge pull request #2185 from dotnet-maestro-bot/merge/release/3.0-to-master
[automated] Merge branch 'release/3.0' => 'master'
2 parents fc6fbca + e1324c0 commit 65707ff

File tree

10 files changed

+90
-86
lines changed

10 files changed

+90
-86
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,87 +10,87 @@
1010
-->
1111
<Dependencies>
1212
<ProductDependencies>
13-
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
13+
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
1414
<Uri>https://github.com/dotnet/corefx</Uri>
15-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
15+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
1616
</Dependency>
17-
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
17+
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
1818
<Uri>https://github.com/dotnet/corefx</Uri>
19-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
19+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
2020
</Dependency>
21-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
21+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2222
<Uri>https://github.com/dotnet/corefx</Uri>
23-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
23+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
2424
</Dependency>
25-
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
25+
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2626
<Uri>https://github.com/dotnet/corefx</Uri>
27-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
27+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
2828
</Dependency>
29-
<Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
29+
<Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3030
<Uri>https://github.com/dotnet/corefx</Uri>
31-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
31+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Reflection.Metadata" Version="1.8.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
33+
<Dependency Name="System.Reflection.Metadata" Version="1.8.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3434
<Uri>https://github.com/dotnet/corefx</Uri>
35-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
35+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
3636
</Dependency>
37-
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
37+
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3838
<Uri>https://github.com/dotnet/corefx</Uri>
39-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
39+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
4040
</Dependency>
41-
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
41+
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
4242
<Uri>https://github.com/dotnet/corefx</Uri>
43-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
43+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
45+
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
4646
<Uri>https://github.com/dotnet/corefx</Uri>
47-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
47+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
4848
</Dependency>
49-
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
49+
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5050
<Uri>https://github.com/dotnet/corefx</Uri>
51-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
51+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
53+
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5454
<Uri>https://github.com/dotnet/corefx</Uri>
55-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
55+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Text.Json" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
57+
<Dependency Name="System.Text.Json" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5858
<Uri>https://github.com/dotnet/corefx</Uri>
59-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
59+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha1.19404.5">
61+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha1.19411.12">
6262
<Uri>https://github.com/dotnet/core-setup</Uri>
63-
<Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
63+
<Sha>52c5ab896d148be85bb7be1656270092c3979790</Sha>
6464
</Dependency>
6565
<!--
6666
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
6767
All Runtime.$rid packages should have the same version.
6868
-->
69-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha1.19404.5">
69+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha1.19411.12">
7070
<Uri>https://github.com/dotnet/core-setup</Uri>
71-
<Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
71+
<Sha>52c5ab896d148be85bb7be1656270092c3979790</Sha>
7272
</Dependency>
73-
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha1.19404.5">
73+
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha1.19411.12">
7474
<Uri>https://github.com/dotnet/core-setup</Uri>
75-
<Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
75+
<Sha>52c5ab896d148be85bb7be1656270092c3979790</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19404.1">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.7">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
81+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19404.1">
83+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.7">
8484
<Uri>https://github.com/dotnet/arcade</Uri>
85-
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
85+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19404.1">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.7">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
89+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
91+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19409.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
9292
<Uri>https://github.com/dotnet/corefx</Uri>
93-
<Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
93+
<Sha>ba8156d2f0d206655caf0713f6bed0265f48f098</Sha>
9494
</Dependency>
9595
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta3-19407-05">
9696
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,26 @@
4242
-->
4343
<PropertyGroup Label="Automated">
4444
<!-- Packages from dotnet/core-setup -->
45-
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha1.19404.5</MicrosoftNETCoreAppRefPackageVersion>
46-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha1.19404.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
47-
<NETStandardLibraryRefPackageVersion>2.1.0-alpha1.19404.5</NETStandardLibraryRefPackageVersion>
45+
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha1.19411.12</MicrosoftNETCoreAppRefPackageVersion>
46+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha1.19411.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
47+
<NETStandardLibraryRefPackageVersion>2.1.0-alpha1.19411.12</NETStandardLibraryRefPackageVersion>
4848
<!-- Packages from dotnet/corefx -->
49-
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19381.2</MicrosoftWin32RegistryPackageVersion>
50-
<SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha1.19381.2</SystemComponentModelAnnotationsPackageVersion>
51-
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-alpha1.19381.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
52-
<SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha1.19381.2</SystemDiagnosticsEventLogPackageVersion>
53-
<SystemIOPipelinesPackageVersion>5.0.0-alpha1.19381.2</SystemIOPipelinesPackageVersion>
54-
<SystemReflectionMetadataPackageVersion>1.8.0-alpha1.19381.2</SystemReflectionMetadataPackageVersion>
55-
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha1.19381.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
56-
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityCryptographyCngPackageVersion>
57-
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityCryptographyXmlPackageVersion>
58-
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha1.19381.2</SystemServiceProcessServiceControllerPackageVersion>
59-
<SystemTextEncodingsWebPackageVersion>5.0.0-alpha1.19381.2</SystemTextEncodingsWebPackageVersion>
60-
<SystemTextJsonPackageVersion>5.0.0-alpha1.19381.2</SystemTextJsonPackageVersion>
49+
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19409.9</MicrosoftWin32RegistryPackageVersion>
50+
<SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha1.19409.9</SystemComponentModelAnnotationsPackageVersion>
51+
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-alpha1.19409.9</SystemDiagnosticsDiagnosticSourcePackageVersion>
52+
<SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha1.19409.9</SystemDiagnosticsEventLogPackageVersion>
53+
<SystemIOPipelinesPackageVersion>5.0.0-alpha1.19409.9</SystemIOPipelinesPackageVersion>
54+
<SystemReflectionMetadataPackageVersion>1.8.0-alpha1.19409.9</SystemReflectionMetadataPackageVersion>
55+
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha1.19409.9</SystemRuntimeCompilerServicesUnsafePackageVersion>
56+
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19409.9</SystemSecurityCryptographyCngPackageVersion>
57+
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha1.19409.9</SystemSecurityCryptographyXmlPackageVersion>
58+
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha1.19409.9</SystemServiceProcessServiceControllerPackageVersion>
59+
<SystemTextEncodingsWebPackageVersion>5.0.0-alpha1.19409.9</SystemTextEncodingsWebPackageVersion>
60+
<SystemTextJsonPackageVersion>5.0.0-alpha1.19409.9</SystemTextJsonPackageVersion>
6161
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
62-
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19381.2</MicrosoftNETCorePlatformsPackageVersion>
62+
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19409.9</MicrosoftNETCorePlatformsPackageVersion>
6363
<!-- Packages from dotnet/arcade -->
64-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19404.1</MicrosoftDotNetGenAPIPackageVersion>
64+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenAPIPackageVersion>
6565
<!-- Packages from dotnet/roslyn -->
6666
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta3-19407-05</MicrosoftNetCompilersToolsetVersion>
6767
</PropertyGroup>

‎eng/common/performance/performance-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) {
3333
}
3434

3535
if ($Internal) {
36-
$Queue = "Windows.10.Amd64.ClientRS5.Perf"
36+
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
3737
$PerfLabArguments = "--upload-to-perflab-container"
3838
$ExtraBenchmarkDotNetArguments = ""
3939
$Creator = ""

‎eng/common/performance/performance-setup.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then
132132
if [[ "$architecture" = "arm64" ]]; then
133133
queue=Ubuntu.1804.Arm64.Perf
134134
else
135-
queue=Ubuntu.1804.Amd64.Perf
135+
queue=Ubuntu.1804.Amd64.Tiger.Perf
136136
fi
137137
fi
138138

@@ -157,20 +157,20 @@ if [[ "$use_core_run" = true ]]; then
157157
fi
158158

159159
# Make sure all of our variables are available for future steps
160-
echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run"
161-
echo "##vso[task.setvariable variable=Architecture]$architecture"
162-
echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory"
163-
echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory"
164-
echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory"
165-
echo "##vso[task.setvariable variable=Queue]$queue"
166-
echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments"
167-
echo "##vso[task.setvariable variable=Python]python3"
168-
echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments"
169-
echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments"
170-
echo "##vso[task.setvariable variable=BDNCategories]$run_categories"
171-
echo "##vso[task.setvariable variable=TargetCsproj]$csproj"
172-
echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo"
173-
echo "##vso[task.setvariable variable=Creator]$creator"
174-
echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix"
175-
echo "##vso[task.setvariable variable=Kind]$kind"
176-
echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework"
160+
Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
161+
Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
162+
Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
163+
Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
164+
Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
165+
Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
166+
Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
167+
Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
168+
Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
169+
Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
170+
Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
171+
Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
172+
Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
173+
Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
174+
Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
175+
Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
176+
Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
displayName: Run SDL tool
1111
variables:
1212
- group: DotNet-VSTS-Bot
13+
pool:
14+
name: Hosted VS2017
1315
steps:
1416
- checkout: self
1517
clean: true

‎eng/common/templates/post-build/post-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ stages:
5252
filePath: eng\common\sdk-task.ps1
5353
arguments: -task SigningValidation -restore -msbuildEngine dotnet
5454
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
55+
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
5556
/p:Configuration=Release
5657

5758
- ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19404.1",
15-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19404.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7",
15+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7"
1616
}
1717
}

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
29+
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
3030
<NuspecProperty Include="OutputBinary=$(OutputPath)**\$(AssemblyName).dll" />
3131
<NuspecProperty Include="OutputSymbol=$(OutputPath)**\$(AssemblyName).pdb" />
3232
<NuspecProperty Include="OutputDocumentation=$(OutputPath)**\$(AssemblyName).xml" />

‎src/Logging/Logging.EventSource/test/EventSourceLoggerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ private static class EventTypes
704704
#else
705705
{ "E5JS", (e) => VerifySingleEvent(e, "Logger2", EventTypes.MessageJson, 5, null, LogLevel.Critical,
706706
@"""ArgumentsJson"":{""stringParam"":""bar"",""int1Param"":""23"",""int2Param"":""45""",
707-
@"""ExceptionJson"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":""-2146233088"",""VerboseMessage"":""System.Exception: oops ---\u003e System.Exception: inner oops") },
707+
@"""ExceptionJson"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":""-2146233088"",""VerboseMessage"":""System.Exception: oops ---\u003E System.Exception: inner oops") },
708708

709709
{ "E5MSG", (e) => VerifySingleEvent(e, "Logger2", EventTypes.Message, 5, null, LogLevel.Critical,
710710
@"{""Key"":""stringParam"",""Value"":""bar""}",

0 commit comments

Comments
 (0)