Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 76c56ac

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210122.7 (#28141)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 1.0.0-beta.21063.4 -> To Version 1.0.0-beta.21072.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent e120173 commit 76c56ac

File tree

6 files changed

+62
-17
lines changed

6 files changed

+62
-17
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21063.4">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
7+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21063.4">
9+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
11+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21063.4">
13+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21072.7">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
15+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.21063.4">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.21072.7">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
19+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20460.1">
2222
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<UsingToolXliff>false</UsingToolXliff>
1616
<!-- Package versions -->
1717
<!-- arcade -->
18-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21063.4</MicrosoftDotNetBuildTasksFeedVersion>
19-
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.21063.4</MicrosoftDotNetBuildTasksPackagingVersion>
20-
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.21063.4</MicrosoftDotNetHelixSdkVersion>
18+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21072.7</MicrosoftDotNetBuildTasksFeedVersion>
19+
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.21072.7</MicrosoftDotNetBuildTasksPackagingVersion>
20+
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.21072.7</MicrosoftDotNetHelixSdkVersion>
2121
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2222
<!-- roslyn -->
2323
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

‎eng/common/sdl/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
44
</packages>

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
continueOnError: ${{ parameters.sdlContinueOnError }}
6666
- ${{ if eq(parameters.overrideParameters, '') }}:
6767
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
68-
-GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
68+
-GuardianPackageName Microsoft.Guardian.Cli.0.53.3
6969
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
7070
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
7171
${{ parameters.additionalParameters }}

‎eng/common/tools.ps1‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,32 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
176176
if (!(Test-Path $installScript)) {
177177
Create-Directory $dotnetRoot
178178
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
179-
Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript
179+
180+
$maxRetries = 5
181+
$retries = 1
182+
183+
$uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
184+
185+
while($true) {
186+
try {
187+
Write-Host "GET $uri"
188+
Invoke-WebRequest $uri -OutFile $installScript
189+
break
190+
}
191+
catch {
192+
Write-Host "Failed to download '$uri'"
193+
Write-Error $_.Exception.Message -ErrorAction Continue
194+
}
195+
196+
if (++$retries -le $maxRetries) {
197+
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
198+
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
199+
Start-Sleep -Seconds $delayInSeconds
200+
}
201+
else {
202+
throw "Unable to download file in $maxRetries attempts."
203+
}
204+
}
180205
}
181206

182207
return $installScript
@@ -366,7 +391,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){
366391
if (!(Test-Path $vsWhereExe)) {
367392
Create-Directory $vsWhereDir
368393
Write-Host "Downloading vswhere"
369-
Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
394+
$maxRetries = 5
395+
$retries = 1
396+
397+
while($true) {
398+
try {
399+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
400+
break
401+
}
402+
catch{
403+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
404+
}
405+
406+
if (++$retries -le $maxRetries) {
407+
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
408+
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
409+
Start-Sleep -Seconds $delayInSeconds
410+
}
411+
else {
412+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
413+
}
414+
}
370415
}
371416

372417
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"python": "2.7.15"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
11-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4",
10+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
11+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7",
1212
"Microsoft.Build.NoTargets": "1.0.53",
1313
"Microsoft.Build.Traversal": "2.0.2"
1414
}

0 commit comments

Comments
 (0)