diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-11-15 01:51:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 01:51:24 +0300 |
commit | d5e90f5814c48cbae141e93f13194934e73c1265 (patch) | |
tree | d4255d59ffc8e657a3a13301b044f30c4f2f96d1 /eng/common/tools.ps1 | |
parent | 742b71402b3f6c88fc22956a819d7ea00408f42c (diff) |
[master] Update dependencies from dotnet/arcade (#779)
* Update dependencies from https://github.com/dotnet/arcade build 20191004.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19504.2
* Update dependencies from https://github.com/dotnet/arcade build 20191005.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19505.1
* Update dependencies from https://github.com/dotnet/arcade build 20191006.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19506.1
* Update dependencies from https://github.com/dotnet/arcade build 20191009.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19509.5
* Update dependencies from https://github.com/dotnet/arcade build 20191010.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19510.4
* Update dependencies from https://github.com/dotnet/arcade build 20191011.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19511.1
* Update dependencies from https://github.com/dotnet/arcade build 20191015.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.1
* Update dependencies from https://github.com/dotnet/arcade build 20191015.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.2
* Update dependencies from https://github.com/dotnet/arcade build 20191017.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19517.8
* Update dependencies from https://github.com/dotnet/arcade build 20191018.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19518.2
* Update dependencies from https://github.com/dotnet/arcade build 20191021.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19521.4
* Update dependencies from https://github.com/dotnet/arcade build 20191022.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19522.8
* Update dependencies from https://github.com/dotnet/arcade build 20191023.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3
* Update dependencies from https://github.com/dotnet/arcade build 20191024.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19524.2
* Update dependencies from https://github.com/dotnet/arcade build 20191025.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19525.2
* Update dependencies from https://github.com/dotnet/arcade build 20191026.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19526.1
* Update dependencies from https://github.com/dotnet/arcade build 20191027.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19527.3
* Update dependencies from https://github.com/dotnet/arcade build 20191028.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19528.5
* Update dependencies from https://github.com/dotnet/arcade build 20191029.9
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19529.9
* Update dependencies from https://github.com/dotnet/arcade build 20191030.15
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19530.15
* Update dependencies from https://github.com/dotnet/arcade build 20191031.14
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19531.14
* Update dependencies from https://github.com/dotnet/arcade build 20191101.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19551.3
* Update dependencies from https://github.com/dotnet/arcade build 20191102.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19552.1
* Update dependencies from https://github.com/dotnet/arcade build 20191104.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19554.3
* Update dependencies from https://github.com/dotnet/arcade build 20191105.7
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19555.7
* Update dependencies from https://github.com/dotnet/arcade build 20191106.10
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19556.10
* Update dependencies from https://github.com/dotnet/arcade build 20191107.20
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19557.20
* Update dependencies from https://github.com/dotnet/arcade build 20191108.11
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19558.11
* Update dependencies from https://github.com/dotnet/arcade build 20191111.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19561.8
* Update dependencies from https://github.com/dotnet/arcade build 20191112.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19562.5
* Update dependencies from https://github.com/dotnet/arcade build 20191113.9
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19563.9
* Update dependencies from https://github.com/dotnet/arcade build 20191114.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19564.2
Diffstat (limited to 'eng/common/tools.ps1')
-rw-r--r-- | eng/common/tools.ps1 | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5c94bd78d..42ca33ac3 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -49,6 +49,8 @@ # An array of names of processes to stop on script exit if prepareMachine is true. $processesToStopOnExit = if (Test-Path variable:processesToStopOnExit) { $processesToStopOnExit } else { @("msbuild", "dotnet", "vbcscompiler") } +$disableConfigureToolsetImport = if (Test-Path variable:disableConfigureToolsetImport) { $disableConfigureToolsetImport } else { $null } + set-strictmode -version 2.0 $ErrorActionPreference = "Stop" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 @@ -175,7 +177,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -186,10 +195,29 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + } + } } } @@ -418,7 +446,7 @@ function GetSdkTaskProject([string]$taskName) { } function InitializeNativeTools() { - 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 = @{ @@ -599,3 +627,12 @@ Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir Write-PipelineSetVariable -Name 'TMP' -Value $TempDir + +# Import custom tools configuration, if present in the repo. +# Note: Import in global scope so that the script set top-level variables without qualification. +if (!$disableConfigureToolsetImport) { + $configureToolsetScript = Join-Path $EngRoot "configure-toolset.ps1" + if (Test-Path $configureToolsetScript) { + . $configureToolsetScript + } +} |