File tree Expand file tree Collapse file tree 4 files changed +24
-4
lines changed Expand file tree Collapse file tree 4 files changed +24
-4
lines changed Original file line number Diff line number Diff line change 33 <ProductDependencies >
44 </ProductDependencies >
55 <ToolsetDependencies >
6- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6 .0.0-beta.21427.6 " >
6+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 7 .0.0-beta.21453.2 " >
77 <Uri >https://github.com/dotnet/arcade</Uri >
8- <Sha >474307e526160c813c9fd58060eb8356ccca6099 </Sha >
8+ <Sha >0ec8dbacaefa7ccdb4bc96e120e07dc60c6eda98 </Sha >
99 <SourceBuild RepoName =" arcade" ManagedOnly =" true" />
1010 </Dependency >
1111 </ToolsetDependencies >
Original file line number Diff line number Diff line change @@ -709,6 +709,15 @@ function MSBuild() {
709709 Write-PipelineSetVariable - Name ' NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' - Value ' 20'
710710 }
711711
712+ if ($ci ) {
713+ $env: NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = ' true'
714+ $env: NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
715+ $env: NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
716+ Write-PipelineSetVariable - Name ' NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' - Value ' true'
717+ Write-PipelineSetVariable - Name ' NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' - Value ' 6'
718+ Write-PipelineSetVariable - Name ' NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' - Value ' 1000'
719+ }
720+
712721 $toolsetBuildProject = InitializeToolset
713722 $basePath = Split-Path - parent $toolsetBuildProject
714723 $possiblePaths = @ (
@@ -717,6 +726,8 @@ function MSBuild() {
717726 (Join-Path $basePath (Join-Path $buildTool.Framework ' Microsoft.DotNet.Arcade.Sdk.dll' )),
718727 (Join-Path $basePath (Join-Path netcoreapp2.1 ' Microsoft.DotNet.ArcadeLogging.dll' )),
719728 (Join-Path $basePath (Join-Path netcoreapp2.1 ' Microsoft.DotNet.Arcade.Sdk.dll' ))
729+ (Join-Path $basePath (Join-Path netcoreapp3.1 ' Microsoft.DotNet.ArcadeLogging.dll' )),
730+ (Join-Path $basePath (Join-Path netcoreapp3.1 ' Microsoft.DotNet.Arcade.Sdk.dll' ))
720731 )
721732 $selectedPath = $null
722733 foreach ($path in $possiblePaths ) {
Original file line number Diff line number Diff line change @@ -417,6 +417,13 @@ function MSBuild {
417417 export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
418418 Write-PipelineSetVariable -name " NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value " 20"
419419 Write-PipelineSetVariable -name " NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value " 20"
420+
421+ export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
422+ export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
423+ export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
424+ Write-PipelineSetVariable -name " NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value " true"
425+ Write-PipelineSetVariable -name " NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value " 6"
426+ Write-PipelineSetVariable -name " NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value " 1000"
420427 fi
421428
422429 local toolset_dir=" ${_InitializeToolset%/* } "
@@ -427,6 +434,8 @@ function MSBuild {
427434 possiblePaths+=( " $toolset_dir /$_InitializeBuildToolFramework /Microsoft.DotNet.Arcade.Sdk.dll" )
428435 possiblePaths+=( " $toolset_dir /netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
429436 possiblePaths+=( " $toolset_dir /netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
437+ possiblePaths+=( " $toolset_dir /netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
438+ possiblePaths+=( " $toolset_dir /netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
430439 for path in " ${possiblePaths[@]} " ; do
431440 if [[ -f $path ]]; then
432441 selectedPath=$path
Original file line number Diff line number Diff line change 11{
22 "tools" : {
3- "dotnet" : " 6.0.100-rc.1.21379.2 " ,
3+ "dotnet" : " 6.0.100-rc.1.21430.12 " ,
44 "vs" : {
55 "version" : " 16.8"
66 },
77 "xcopy-msbuild" : " 16.8.0-preview2.1"
88 },
99 "msbuild-sdks" : {
10- "Microsoft.DotNet.Arcade.Sdk" : " 6 .0.0-beta.21427.6 "
10+ "Microsoft.DotNet.Arcade.Sdk" : " 7 .0.0-beta.21453.2 "
1111 }
1212}
You can’t perform that action at this time.
0 commit comments