Skip to content

Commit e40b3ab

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 32583: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
2 parents f40cb78 + 3b204ac commit e40b3ab

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-864fae9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-864fae9e/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-60d640a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-60d640a5/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-wcf -->
1515
<!-- End: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml

+41-41
Original file line numberDiff line numberDiff line change
@@ -10,93 +10,93 @@
1010
</Dependency>
1111
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.21">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
13+
<Sha>60d640a5c1025d1e9e89188cabe41e692d0f5468</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.21">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
17+
<Sha>60d640a5c1025d1e9e89188cabe41e692d0f5468</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.21">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
21+
<Sha>60d640a5c1025d1e9e89188cabe41e692d0f5468</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
2525
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23313.5">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23361.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
31+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23313.5">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23361.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
35+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23313.5">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23361.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
39+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23313.5">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23361.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
43+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23313.5">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23361.3">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
47+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23313.5">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23361.3">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
51+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23313.5">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23361.3">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
55+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23313.5">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23361.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
59+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23313.5">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23361.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
63+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23313.5">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23361.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
67+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23313.5">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23361.3">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
71+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23313.5">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23361.3">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
75+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23313.5">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23361.3">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
79+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23313.5">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23361.3">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
83+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23313.5">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23361.3">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
87+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23313.5">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23361.3">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
91+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23313.5">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23361.3">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
95+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23313.5">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23361.3">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
99+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223223
<Sha>233cbdd69acedc940fc3342f66b649ac0fb44333</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23313.5">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23361.3">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>91616785a1a6578c83f7e93d98c34a1eb83d6223</Sha>
227+
<Sha>cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34</Sha>
228228
</Dependency>
229229
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
<!-- SDK dependencies -->
4343
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
4444
<!-- Arcade dependencies -->
45-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23313.5</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksFeedVersion>
47-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23313.5</MicrosoftDotNetCodeAnalysisVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23313.5</MicrosoftDotNetGenAPIVersion>
49-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23313.5</MicrosoftDotNetGenFacadesVersion>
50-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23313.5</MicrosoftDotNetXUnitExtensionsVersion>
51-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23313.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
52-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksArchivesVersion>
53-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksInstallersVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23313.5</MicrosoftDotNetRemoteExecutorVersion>
58-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23313.5</MicrosoftDotNetVersionToolsTasksVersion>
59-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23313.5</MicrosoftDotNetPackageTestingVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23361.3</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksFeedVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23361.3</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23361.3</MicrosoftDotNetGenAPIVersion>
49+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23361.3</MicrosoftDotNetGenFacadesVersion>
50+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23361.3</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
52+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksArchivesVersion>
53+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksInstallersVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23361.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23361.3</MicrosoftDotNetRemoteExecutorVersion>
58+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23361.3</MicrosoftDotNetVersionToolsTasksVersion>
59+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23361.3</MicrosoftDotNetPackageTestingVersion>
6060
<!-- NuGet dependencies -->
6161
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6262
<!-- Installer dependencies -->

‎global.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"sdk": {
3-
"version": "6.0.118",
3+
"version": "6.0.120",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "6.0.118"
8+
"dotnet": "6.0.120"
99
},
1010
"native-tools": {
1111
"cmake": "3.16.4",
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23313.5",
16-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5",
17-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5",
18-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23313.5",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23361.3",
16+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3",
17+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23361.3",
18+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23361.3",
1919
"Microsoft.Build.NoTargets": "3.1.0",
2020
"Microsoft.Build.Traversal": "3.0.23",
2121
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"

0 commit comments

Comments
 (0)