Merge in 'release/6.0' changes

dotnet-bot · dotnet-bot · commit b5ad096f0e3a · 2022-05-12T18:36:08.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.22254.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22261.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
+      <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22254.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22261.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
+      <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</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.22254.3",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22254.3"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22261.7"
   }
 }

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.22254.3",`
`22`		`- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22254.3"`
	`21`	`+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7",`
	`22`	`+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22261.7"`
`23`	`23`	`}`
`24`	`24`	`}`