Merge commit '5e2ea6acf11e3e7747df47a7943d7ad88d8dd58a'

Mirroring · Mirroring · commit 2903f6b1b808 · 2024-09-12T20:01:43.000Z
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,13 +47,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
+      <Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
+      <Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -18,7 +18,7 @@
     "rollForward": "latestMajor"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"rollForward": "latestMajor"`
`19`	`19`	`},`
`20`	`20`	`"msbuild-sdks": {`
`21`		`- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",`
`22`		`- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"`
	`21`	`+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",`
	`22`	`+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"`
`23`	`23`	`}`
`24`	`24`	`}`