Skip to content

Commit da86749

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210122.7 (#30055)
[release/3.1] Update dependencies from dotnet/arcade
1 parent 6c16632 commit da86749

File tree

7 files changed

+76
-16
lines changed

7 files changed

+76
-16
lines changed

‎NuGet.config‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
77
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-7f783df7/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
9-
<add key="darc-int-dotnet-extensions-4210e7d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-efcore-d078590" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d078590d/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-core-setup-0267ad0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0267ad09/nuget/v3/index.json" />
9+
<!-- Begin: Package sources from dotnet-corefx -->
1210
<add key="darc-int-dotnet-corefx-50a99d5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-50a99d5d/nuget/v3/index.json" />
11+
<!-- End: Package sources from dotnet-corefx -->
12+
<!-- Begin: Package sources from dotnet-core-setup -->
13+
<add key="darc-int-dotnet-core-setup-0267ad0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0267ad09/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-core-setup -->
15+
<!-- Begin: Package sources from dotnet-efcore -->
16+
<add key="darc-int-dotnet-efcore-d078590" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d078590d/nuget/v3/index.json" />
17+
<!-- End: Package sources from dotnet-efcore -->
18+
<!-- Begin: Package sources from dotnet-extensions -->
19+
<add key="darc-int-dotnet-extensions-4210e7d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json" />
20+
<!-- End: Package sources from dotnet-extensions -->
1321
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1422
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1523
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,20 +26,27 @@
1826
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1927
</packageSources>
2028
<disabledPackageSources>
29+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2130
<!-- Begin: Package sources from dotnet-extensions -->
31+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
32+
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
2233
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
2334
<!-- End: Package sources from dotnet-extensions -->
2435
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
2536
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
37+
<add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" />
2638
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
2739
<!-- Begin: Package sources from dotnet-efcore -->
2840
<add key="darc-int-dotnet-efcore-d078590" value="true" />
41+
<add key="darc-int-dotnet-efcore-d078590" value="true" />
2942
<!-- End: Package sources from dotnet-efcore -->
3043
<!-- Begin: Package sources from dotnet-core-setup -->
3144
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
45+
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
3246
<!-- End: Package sources from dotnet-core-setup -->
3347
<!-- Begin: Package sources from dotnet-corefx -->
3448
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
49+
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
3550
<!-- End: Package sources from dotnet-corefx -->
3651
</disabledPackageSources>
3752
</configuration>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>4210e7d19b3e18ecadbd1c4c8589e39eea035d5f</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21063.4">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21072.7">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
423+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21063.4">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
427+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21063.4">
429+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha>
431+
<Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.12-servicing.21069.9" CoherentParentDependency="Microsoft.EntityFrameworkCore">
434434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21063.4</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

‎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
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21072.7",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21072.7"
3030
}
3131
}

0 commit comments

Comments
 (0)