diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2018-12-07 14:48:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-07 14:48:12 +0000 |
| commit | a0ee8a67fd104d906f19b9273eaf801720c25271 (patch) | |
| tree | 25322c30d070f4fccfb73b0d665d8cb7ff517a94 | |
| parent | 77a5a729dd1ce008d4da2bc3f3b5775e4664dd75 (diff) | |
| download | coreclr-a0ee8a67fd104d906f19b9273eaf801720c25271.tar.gz coreclr-a0ee8a67fd104d906f19b9273eaf801720c25271.tar.bz2 coreclr-a0ee8a67fd104d906f19b9273eaf801720c25271.zip | |
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
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/common/tools.ps1 | 5 | ||||
| -rw-r--r-- | global.json | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fde5343a7e..282234297c 100644 --- 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 29b54a16a6..290637c5fa 100644 --- 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 eb6d3e56a2..d8fd519952 100644 --- 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" } } |