Merge in 'release/6.0' changes

dotnet · Aug 19, 2022 · 163a635 · 163a635
2 parents 18ddbe8 + 531f715
commit 163a635
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 57 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -30,77 +30,77 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
       <Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22412.2">
+    <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22418.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
+      <Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -41,21 +41,21 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22412.2</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22412.2</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22412.2</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22412.2</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22412.2</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22412.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22412.2</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22412.2</MicrosoftDotNetVersionToolsTasksVersion>
-    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22412.2</MicrosoftDotNetPackageTestingVersion>
+    <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22418.3</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22418.3</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22418.3</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22418.3</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22418.3</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22418.3</MicrosoftDotNetPackageTestingVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->

diff --git a/global.json b/global.json
@@ -12,10 +12,10 @@
     "python3": "3.7.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22412.2",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2",
-    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22412.2",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22418.3",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22418.3",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22418.3",
+    "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22418.3",
     "Microsoft.Build.NoTargets": "3.1.0",
     "Microsoft.Build.Traversal": "3.0.23",
     "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"