diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-11-19 18:47:57 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-11-19 18:47:57 +0300 |
commit | a6db160596bb987af11fb2844d51c9a3a7c73133 (patch) | |
tree | a8e9a349963b64d74819a177bdf359e986fccd16 /eng/common/tools.ps1 | |
parent | 0c3ffb9cc9839a99b71e1c8dc2e85d462820a31c (diff) |
[master] Update dependencies from dotnet/arcade dotnet/core-setup dotnet/corefx (#17690)
* Update dependencies from https://github.com/dotnet/arcade build 20191102.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19552.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19552.1
* Update dependencies from https://github.com/dotnet/core-setup build 20191104.1
- Microsoft.NETCore.App - 5.0.0-alpha.1.19554.1
* Update dependencies from https://github.com/dotnet/corefx build 20191103.8
- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha.1.19553.8
* Update dependencies from https://github.com/dotnet/arcade build 20191108.11
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19558.11
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19558.11
* Update dependencies from https://github.com/dotnet/core-setup build 20191109.5
- Microsoft.NETCore.App - 5.0.0-alpha.1.19559.5
* Update dependencies from https://github.com/dotnet/corefx build 20191109.6
- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha.1.19559.6
* Update dependencies from https://github.com/dotnet/arcade build 20191117.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19567.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19567.2
* Update dependencies from https://github.com/dotnet/core-setup build 20191114.1
- Microsoft.NETCore.App - 5.0.0-alpha.1.19564.1
* Update dependencies from https://github.com/dotnet/corefx build 20191113.6
- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha.1.19563.6
* Use NETCoreApp version 5.0.0-alpha.1.19563.3
Later versions have an issue and the new dotnet/runtime assets aren't ready yet.
* Disable failing tests
* Fix merge error
Diffstat (limited to 'eng/common/tools.ps1')
-rw-r--r-- | eng/common/tools.ps1 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c4ca69dd47c..42ca33ac33d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -446,10 +446,7 @@ function GetSdkTaskProject([string]$taskName) { } function InitializeNativeTools() { - if ($env:DisableNativeToolsetInstalls) { - return - } - if (Get-Member -InputObject $GlobalJson -Name "native-tools") { + if (-Not (Test-Path variable:DisableNativeToolsetInstalls) -And (Get-Member -InputObject $GlobalJson -Name "native-tools")) { $nativeArgs= @{} if ($ci) { $nativeArgs = @{ |