diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc3eebb1a18..5c1c59bca56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,9 +5,9 @@ https://github.com/dotnet/roslyn-analyzers - + https://github.com/dotnet/arcade - 7324320f814152b72295946847ca72413507705a + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 @@ -18,9 +18,9 @@ https://github.com/dotnet/roslyn c1d8c6f043bc80425c6828455eb57f8a404759c6 - + https://github.com/dotnet/arcade - 7324320f814152b72295946847ca72413507705a + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 diff --git a/eng/Versions.props b/eng/Versions.props index 7c66217f415..b2bd528f76b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) - 6.0.0-beta.21460.7 + 6.0.0-beta.21515.3 3.3.2 6.0.0-preview.2.21154.6 4.0.0-5.21469.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 02347914f5d..44484289943 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -709,14 +709,7 @@ function MSBuild() { Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20' } - if ($ci) { - $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' - $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' - } + Enable-Nuget-EnhancedRetry $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject @@ -764,6 +757,8 @@ function MSBuild-Core() { } } + Enable-Nuget-EnhancedRetry + $buildTool = InitializeBuildTool $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" @@ -904,3 +899,18 @@ function Try-LogClientIpAddress() Write-Host "Unable to get this machine's effective IP address for logging: $_" } } + +# +# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. +# +function Enable-Nuget-EnhancedRetry() { + if ($ci) { + Write-Host "Setting NUGET enhanced retry environment variables" + $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' + $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + } +} diff --git a/global.json b/global.json index c0ab9c781c8..6a1d31f66cd 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,6 @@ }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21460.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3" } }