diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-03-19 12:23:59 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-03-19 12:23:59 -0700 |
commit | 36b8237ad6ce317d8621985ee9a7ade5201f4fc2 (patch) | |
tree | 8329a3f185c0c3684eb1ee488db3a57e87f11806 /eng/common/init-tools-native.ps1 | |
parent | 7c226433c1d53e2978be99db9cba47597b20763d (diff) | |
download | coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.tar.gz coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.tar.bz2 coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.zip |
Update dependencies from https://github.com/dotnet/arcade build 20190317.10 (#23339)
This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19167.10
Diffstat (limited to 'eng/common/init-tools-native.ps1')
-rw-r--r-- | eng/common/init-tools-native.ps1 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index e25c60fed4..495a563a75 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -98,10 +98,20 @@ try { Write-Verbose "Executing '$LocalInstallerCommand'" Invoke-Expression "$LocalInstallerCommand" if ($LASTEXITCODE -Ne "0") { - Write-Error "Execution failed" - exit 1 + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + Write-Warning $errMsg + $toolInstallationFailure = $true + } else { + Write-Error $errMsg + exit 1 + } } } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + exit 1 + } } else { Write-Host "No native tools defined in global.json" |