Update dependencies from https://github.com/dotnet/arcade build 20190827.8 (#4367)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19427.8
This commit is contained in:
dotnet-maestro[bot] 2019-08-28 12:37:30 +00:00 committed by GitHub
parent aea859b6eb
commit 5124586c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 7 deletions

View file

@ -65,9 +65,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19426.12"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19427.8">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36ce21e795e2e90081300f4cb645dfd8cf6eb2b3</Sha> <Sha>c02ca5d078b5b54bef8043d972082f41fd912190</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

View file

@ -152,6 +152,8 @@ function Get-File {
} }
else { else {
Write-Verbose "Downloading $Uri" Write-Verbose "Downloading $Uri"
# Don't display the console progress UI - it's a huge perf hit
$ProgressPreference = 'SilentlyContinue'
while($Attempt -Lt $DownloadRetries) while($Attempt -Lt $DownloadRetries)
{ {
try { try {

View file

@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0 Set-StrictMode -Version 2.0
$LASTEXITCODE = 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 # 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")) $encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")

View file

@ -163,6 +163,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
$installScript = Join-Path $dotnetRoot "dotnet-install.ps1" $installScript = Join-Path $dotnetRoot "dotnet-install.ps1"
if (!(Test-Path $installScript)) { if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot 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 Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript
} }
@ -282,6 +283,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
Create-Directory $packageDir Create-Directory $packageDir
Write-Host "Downloading $packageName $packageVersion" 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 Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath
Unzip $packagePath $packageDir Unzip $packagePath $packageDir
} }

View file

@ -208,12 +208,19 @@ function GetDotNetInstallScript {
# Use curl if available, otherwise use wget # Use curl if available, otherwise use wget
if command -v curl > /dev/null; then if command -v curl > /dev/null; then
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
else local exit_code=$?
wget -q -O "$install_script" "$install_script_url" 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
fi fi
# return value # return value
_GetDotNetInstallScript="$install_script" _GetDotNetInstallScript="$install_script"
} }

View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview6-012264" "dotnet": "3.0.100-preview6-012264"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19426.12" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19427.8"
} }
} }