diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f1ac5ed0a5f..dabd9d396c7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -65,21 +65,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
c2e8c9f71737d87a95610851587e2a1eaf18c91c
-
+
https://github.com/dotnet/arcade
- d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593
+ 620462dd065490620c03a80cea8e251004f6bf21
-
+
https://github.com/dotnet/arcade
- d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593
+ 620462dd065490620c03a80cea8e251004f6bf21
-
+
https://github.com/dotnet/arcade
- d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593
+ 620462dd065490620c03a80cea8e251004f6bf21
-
+
https://github.com/dotnet/arcade
- d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593
+ 620462dd065490620c03a80cea8e251004f6bf21
diff --git a/eng/Versions.props b/eng/Versions.props
index 55cd69f6b31..cd9a1c197b5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,8 +37,8 @@
- 1.0.0-beta.21063.4
- 2.4.1-beta.21063.4
+ 1.0.0-beta.21072.7
+ 2.4.1-beta.21072.7
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 968b39bef5f..3bd8b29ebd7 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
-
+
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index bf09d2511c6..34ea015684c 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -65,7 +65,7 @@ jobs:
continueOnError: ${{ parameters.sdlContinueOnError }}
- ${{ if eq(parameters.overrideParameters, '') }}:
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
- -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
+ -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
${{ parameters.additionalParameters }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index f50507a06c1..84651fea050 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -176,7 +176,32 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
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
+
+ $maxRetries = 5
+ $retries = 1
+
+ $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
+
+ while($true) {
+ try {
+ Write-Host "GET $uri"
+ Invoke-WebRequest $uri -OutFile $installScript
+ break
+ }
+ catch {
+ Write-Host "Failed to download '$uri'"
+ Write-Error $_.Exception.Message -ErrorAction Continue
+ }
+
+ 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 {
+ throw "Unable to download file in $maxRetries attempts."
+ }
+ }
}
return $installScript
@@ -366,7 +391,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){
if (!(Test-Path $vsWhereExe)) {
Create-Directory $vsWhereDir
Write-Host "Downloading vswhere"
- Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+ $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."
+ }
+ }
}
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
diff --git a/global.json b/global.json
index 8eb978fc73f..45e9f7726ac 100644
--- a/global.json
+++ b/global.json
@@ -15,8 +15,8 @@
"version": "3.1.100"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7",
"Microsoft.NET.Sdk.IL": "3.1.9-servicing.20458.2"
},
"native-tools": {