diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4591f15c..b23963cbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 26b005488dd7ddf6356873cb01a7b763a82a9622 + e9b75e1cd4e63570624006a6d5bdb48b5b40b513 - + https://github.com/dotnet/arcade - 26b005488dd7ddf6356873cb01a7b763a82a9622 + e9b75e1cd4e63570624006a6d5bdb48b5b40b513 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bf2c068e3..b447ee9d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.20616.18 + 6.0.0-beta.20618.3 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bc8b66e29..ce280eb95 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -439,11 +439,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' - try { - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + $maxRetries = 5 + $retries = 1 + + while($true) { + try { + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + break + } + catch{ + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + } + + if (++$retries -le $maxRetries) { + $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff + Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." + Start-Sleep -Seconds $delayInSeconds + } + else { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." + } } } diff --git a/global.json b/global.json index 95f730173..c0daf89a9 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20616.18" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20618.3" } }