Merge in 'release/7.0' changes

dotnet · Nov 15, 2023 · 521fb01 · 521fb01
2 parents 14a0819 + 5d1235a
commit 521fb01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -39,17 +39,17 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23511.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23511.9">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23511.9">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23564.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
+      <Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -25,7 +25,7 @@
     <MicrosoftExtensionsLoggingVersion>7.0.0</MicrosoftExtensionsLoggingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
-    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23564.5</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <!-- NB: Roslyn version affects the minimum required Visual Studio version -->

diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
@@ -1,6 +1,5 @@
 variables:
   - group: AzureDevOps-Artifact-Feeds-Pats
-  - group: DotNet-Blob-Feed
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-MSRC-Storage
   - group: Publish-Build-Assets

diff --git a/global.json b/global.json
@@ -8,7 +8,7 @@
     "rollForward": "latestMajor"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5"
   }
 }