From 30d7ea0feda1f046578afd0b4273ee6f81b9c753 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:41:19 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20201218.3 (#867)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/tools.ps1 | 25 ++++++++++++++++++++-----
global.json | 2 +-
3 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c99e0585..e666f126 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 26b005488dd7ddf6356873cb01a7b763a82a9622
+ e9b75e1cd4e63570624006a6d5bdb48b5b40b513
-
+
https://github.com/dotnet/arcade
- 26b005488dd7ddf6356873cb01a7b763a82a9622
+ e9b75e1cd4e63570624006a6d5bdb48b5b40b513
-
+
https://github.com/dotnet/arcade
- 26b005488dd7ddf6356873cb01a7b763a82a9622
+ e9b75e1cd4e63570624006a6d5bdb48b5b40b513
-
+
https://github.com/dotnet/arcade
- 26b005488dd7ddf6356873cb01a7b763a82a9622
+ e9b75e1cd4e63570624006a6d5bdb48b5b40b513
-
+
https://github.com/dotnet/arcade
- 26b005488dd7ddf6356873cb01a7b763a82a9622
+ e9b75e1cd4e63570624006a6d5bdb48b5b40b513
https://github.com/dotnet/arcade-services
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index bc8b66e2..ce280eb9 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 81810a60..9ae72fb8 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20616.18"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20618.3"
}
}