Merge pull request #8065 from dotnet/merges/master-to-release/dev16.5

KevinRansom · web-flow · commit 6822bcb624e2 · 2020-01-01T19:04:20.000-08:00
Merge master to release/dev16.5
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.19627.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d2d025c1de37b1258f147851cb3e7373ad5ff09d</Sha>
+      <Sha>01d0b636bfb96edf62a77912de25aa5cef143946</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19627.1",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19630.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"msbuild-sdks": {`
`13`		`- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19627.1",`
	`13`	`+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19630.1",`
`14`	`14`	`"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"`
`15`	`15`	`}`
`16`	`16`	`}`