Merge branch 'release/3.1.4xx' into internal-merge-3.1.4xx-2022-05-10-1216

vseanreesermsft · web-flow · commit 7830ba78e1a3 · 2022-05-18T09:20:06.000-07:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -42,9 +42,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22212.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22260.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>110afd89a939ac6476282e27d7290583ad3b1715</Sha>
+      <Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
     </Dependency>
   </ToolsetDependencies>
   <ProductDependencies>
diff --git a/global.json b/global.json
@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22212.4"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22260.3"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"msbuild-sdks": {`
`11`		`- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22212.4"`
	`11`	`+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22260.3"`
`12`	`12`	`}`
`13`	`13`	`}`