From 53a16ac11fc0185a0d7b207f77ed4f989d75224c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Aug 2019 12:17:57 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20190827.8 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19427.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19427.8 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19427.8 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19427.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- eng/common/native/CommonLibrary.psm1 | 2 ++ eng/common/sdl/init-sdl.ps1 | 3 +++ eng/common/tools.ps1 | 2 ++ eng/common/tools.sh | 15 +++++++++++---- global.json | 2 +- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18500252a7..6a9c6c9fab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,21 +135,21 @@ - + https://github.com/dotnet/arcade - 36ce21e795e2e90081300f4cb645dfd8cf6eb2b3 + c02ca5d078b5b54bef8043d972082f41fd912190 - + https://github.com/dotnet/arcade - c7f03b2cf06bdfc64dad4140fd0d486127095cd8 + c02ca5d078b5b54bef8043d972082f41fd912190 - + https://github.com/dotnet/arcade - c7f03b2cf06bdfc64dad4140fd0d486127095cd8 + c02ca5d078b5b54bef8043d972082f41fd912190 - + https://github.com/dotnet/arcade - c7f03b2cf06bdfc64dad4140fd0d486127095cd8 + c02ca5d078b5b54bef8043d972082f41fd912190 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 357e97ed72..a0ec558608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,9 +35,9 @@ - 2.2.0-beta.19422.24 - 1.0.0-beta.19422.24 - 1.0.0-beta.19422.24 + 2.2.0-beta.19427.8 + 1.0.0-beta.19427.8 + 1.0.0-beta.19427.8 1.0.0-beta2-19367-01 diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index 2a08d5246e..41416862d9 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -152,6 +152,8 @@ function Get-File { } else { Write-Verbose "Downloading $Uri" + # Don't display the console progress UI - it's a huge perf hit + $ProgressPreference = 'SilentlyContinue' while($Attempt -Lt $DownloadRetries) { try { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 26e01c0673..c737eb0e71 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 $LASTEXITCODE = 0 +# Don't display the console progress UI - it's a huge perf hit +$ProgressPreference = 'SilentlyContinue' + # Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file $encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9c12b1b4fd..bb5638930a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,6 +163,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript } @@ -282,6 +283,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Create-Directory $packageDir Write-Host "Downloading $packageName $packageVersion" + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath Unzip $packagePath $packageDir } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3af9be6157..94a1edd7d0 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -208,12 +208,19 @@ function GetDotNetInstallScript { # Use curl if available, otherwise use wget if command -v curl > /dev/null; then - curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" - else - wget -q -O "$install_script" "$install_script_url" + curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + wget -q -O "$install_script" "$install_script_url" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } fi fi - # return value _GetDotNetInstallScript="$install_script" } diff --git a/global.json b/global.json index aba09bff6b..33b7add33c 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19426.12" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19427.8" } }