diff --git a/NuGet.config b/NuGet.config index 93ef6929c1a43ca6eeeca98b921ed520461c5c8e..e85e57eec96d617fee0be634a544dd90003d4e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,18 @@ <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> <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" /> <!-- End: Package sources from dotnet-aspnetcore-tooling --> - <add key="darc-int-dotnet-extensions-4210e7d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json" /> - <add key="darc-int-dotnet-efcore-d078590" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d078590d/nuget/v3/index.json" /> - <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" /> + <!-- Begin: Package sources from dotnet-corefx --> <add key="darc-int-dotnet-corefx-50a99d5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-50a99d5d/nuget/v3/index.json" /> + <!-- End: Package sources from dotnet-corefx --> + <!-- Begin: Package sources from dotnet-core-setup --> + <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" /> + <!-- End: Package sources from dotnet-core-setup --> + <!-- Begin: Package sources from dotnet-efcore --> + <add key="darc-int-dotnet-efcore-d078590" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-d078590d/nuget/v3/index.json" /> + <!-- End: Package sources from dotnet-efcore --> + <!-- Begin: Package sources from dotnet-extensions --> + <add key="darc-int-dotnet-extensions-4210e7d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json" /> + <!-- End: Package sources from dotnet-extensions --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -18,20 +26,27 @@ <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" /> </packageSources> <disabledPackageSources> + <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-extensions --> + <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> + <add key="darc-int-dotnet-extensions-4210e7d" value="true" /> <add key="darc-int-dotnet-extensions-4210e7d" value="true" /> <!-- End: Package sources from dotnet-extensions --> <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> <add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" /> + <add key="darc-int-dotnet-aspnetcore-tooling-7f783df" value="true" /> <!-- End: Package sources from dotnet-aspnetcore-tooling --> <!-- Begin: Package sources from dotnet-efcore --> <add key="darc-int-dotnet-efcore-d078590" value="true" /> + <add key="darc-int-dotnet-efcore-d078590" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-core-setup --> <add key="darc-int-dotnet-core-setup-0267ad0" value="true" /> + <add key="darc-int-dotnet-core-setup-0267ad0" value="true" /> <!-- End: Package sources from dotnet-core-setup --> <!-- Begin: Package sources from dotnet-corefx --> <add key="darc-int-dotnet-corefx-50a99d5" value="true" /> + <add key="darc-int-dotnet-corefx-50a99d5" value="true" /> <!-- End: Package sources from dotnet-corefx --> </disabledPackageSources> </configuration> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2965a92196b83e2b0ca2f386ece06f19b86dfeb4..0f36dbee287659c9ee07d68ca0635b967608bae8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -418,17 +418,17 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> <Sha>4210e7d19b3e18ecadbd1c4c8589e39eea035d5f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21063.4"> + <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21072.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha> + <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21063.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21072.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha> + <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21063.4"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21072.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d01f08a47a14c3842f5f74e14e6a6a8b7b7a5593</Sha> + <Sha>620462dd065490620c03a80cea8e251004f6bf21</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.12-servicing.21069.9" CoherentParentDependency="Microsoft.EntityFrameworkCore"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 6c1458e53c6075447344f36da3dbad6f7c6a659f..e6ad9f7309619938d9c868c0885626b013906eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> <PropertyGroup Label="Automated"> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21063.4</MicrosoftDotNetGenAPIPackageVersion> + <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21072.7</MicrosoftDotNetGenAPIPackageVersion> <!-- Packages from dotnet/roslyn --> <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion> <!-- Packages from dotnet/core-setup --> diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 968b39bef5f1931fa7aabe07c4ada88155ea7762..3bd8b29ebd721b5a9f01e957f72bf03e7f58225c 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/> + <package id="Microsoft.Guardian.Cli" version="0.53.3"/> </packages> diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index bf09d2511c65b4189056190861b472108d7ee223..34ea015684c77a01a06604a0e6df9ab27ec6bc66 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 f50507a06c1b5e71d67dcab482c2414ec5844506..84651fea050ed979f1283b6c100ed15a99de1ea0 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 666809c40a331a52731cdf1bee8485464cb46fd7..c68a32efe1009c2067a7bb387ca7f1ba7db000b6 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "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" } }