Merge pull request #7100 from dotnet/merges/master-to-release/dev16.3

dotnet-automerge-bot · web-flow · commit d51ae07ec786 · 2019-07-02T18:31:44.000-07:00
Merge master to release/dev16.3
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="1.0.0-beta.19330.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19351.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>89fab80685c91024c8f9e21f1c37f62580f648f8</Sha>
+      <Sha>1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19330.1",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19351.4",
     "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": "1.0.0-beta.19330.1",`
	`13`	`+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19351.4",`
`14`	`14`	`"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"`
`15`	`15`	`}`
`16`	`16`	`}`