Update dependency files (#21403)

* Update dependencies from https://github.com/dotnet/arcade build 626

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18605.14
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18605.14

* Update dependencies from https://github.com/dotnet/arcade build 650

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18606.9
- Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18606.9

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fde5343..2822342 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18604.15">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18606.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f14da17c737c4f2b5408c4c0801d7e913a95766f</Sha>
+      <Sha>fe25f076bdd44568aa6334d4266e6553719cf91d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18604.15">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18606.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f14da17c737c4f2b5408c4c0801d7e913a95766f</Sha>
+      <Sha>fe25f076bdd44568aa6334d4266e6553719cf91d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 29b54a1..290637c 100644 (file)
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -176,8 +176,9 @@ function InstallXCopyMSBuild([string] $packageVersion) {
 # or $null if no instance meeting the requirements is found on the machine.
 #
 function LocateVisualStudio {
-  $vswhereVersion = Get-Member -InputObject $GlobalJson.tools -Name "vswhere"
-  if ($vsWhereVersion -eq $null) {
+  if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") {
+    $vswhereVersion = $GlobalJson.tools.vswhere
+  } else {
     $vswhereVersion = "2.5.2"
   }
 

diff --git a/global.json b/global.json
index eb6d3e5..d8fd519 100644 (file)
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18604.15",
-    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18604.15"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18606.9",
+    "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18606.9"
   }
 }