Merge in 'release/7.0' changes

dotnet · Nov 16, 2023 · 3d7e00c · 3d7e00c
2 parents f46a36f + 23e935c
commit 3d7e00c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -302,22 +302,22 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>8587d13a2764c025277d628471984bae8e16427c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23556.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23556.6">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23556.6">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23556.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -134,8 +134,8 @@
     <MicrosoftEntityFrameworkCoreVersion>7.0.15</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>7.0.15</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23556.6</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23556.6</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23564.5</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23564.5</MicrosoftDotNetBuildTasksTemplatingVersion>
     <!-- Packages from dotnet/source-build-externals -->
     <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/xdt -->

diff --git a/global.json b/global.json
@@ -27,7 +27,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23556.6"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5"
   }
 }