Skip to content

Commit 163a635

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 18ddbe8 + 531f715 commit 163a635

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,77 +30,77 @@
3030
</Dependency>
3131
</ProductDependencies>
3232
<ToolsetDependencies>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22418.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
35+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22412.2">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22418.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
39+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22412.2">
41+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22418.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
43+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22412.2">
45+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22418.3">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
47+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22412.2">
49+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22418.3">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
51+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22412.2">
53+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22418.3">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
55+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22412.2">
57+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
59+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22412.2">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22418.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
63+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22412.2">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22418.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
67+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22418.3">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
71+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22412.2">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22418.3">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
75+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22412.2">
77+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22418.3">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
79+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22412.2">
81+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22418.3">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
83+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22412.2">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22418.3">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
87+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22412.2">
89+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22418.3">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
91+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22412.2">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22418.3">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
95+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22412.2">
97+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22418.3">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
99+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22412.2">
101+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22418.3">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
103+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
104104
</Dependency>
105105
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
106106
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223223
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22412.2">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22418.3">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
227+
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</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‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@
4141
<!-- SDK dependencies -->
4242
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
4343
<!-- Arcade dependencies -->
44-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22412.2</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22412.2</MicrosoftDotNetCodeAnalysisVersion>
47-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22412.2</MicrosoftDotNetGenAPIVersion>
48-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22412.2</MicrosoftDotNetGenFacadesVersion>
49-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22412.2</MicrosoftDotNetXUnitExtensionsVersion>
50-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22412.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
51-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersVersion>
53-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksPackagingVersion>
54-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksTemplatingVersion>
55-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22412.2</MicrosoftDotNetRemoteExecutorVersion>
57-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22412.2</MicrosoftDotNetVersionToolsTasksVersion>
58-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22412.2</MicrosoftDotNetPackageTestingVersion>
44+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22418.3</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22418.3</MicrosoftDotNetCodeAnalysisVersion>
47+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenAPIVersion>
48+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenFacadesVersion>
49+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22418.3</MicrosoftDotNetXUnitExtensionsVersion>
50+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksInstallersVersion>
53+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksPackagingVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksTemplatingVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22418.3</MicrosoftDotNetRemoteExecutorVersion>
57+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22418.3</MicrosoftDotNetVersionToolsTasksVersion>
58+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22418.3</MicrosoftDotNetPackageTestingVersion>
5959
<!-- NuGet dependencies -->
6060
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6161
<!-- Installer dependencies -->

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22412.2",
16-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
17-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2",
18-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22412.2",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22418.3",
16+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22418.3",
17+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22418.3",
18+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22418.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)