Merge pull request #41735 from dotnet/merges/master-to-master-vs-deps

msftbot[bot] · web-flow · commit 75c7b4f68a34 · 2020-02-16T16:07:00.000Z
Merge master to master-vs-deps
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20114.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20115.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>16fbdca79f86f36434b80f2bb898861759ec754b</Sha>
+      <Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -7,6 +7,6 @@
     "xcopy-msbuild": "16.4.0-alpha"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20114.5"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20115.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`"xcopy-msbuild": "16.4.0-alpha"`
`8`	`8`	`},`
`9`	`9`	`"msbuild-sdks": {`
`10`		`- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20114.5"`
	`10`	`+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20115.1"`
`11`	`11`	`}`
`12`	`12`	`}`