Skip to content

Commit 9ad6b63

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210923.5 (#5384)
[release/6.0-rc2] Update dependencies from dotnet/arcade
1 parent 7a877ae commit 9ad6b63

File tree

7 files changed

+50
-22
lines changed

7 files changed

+50
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21473.5">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
88+
<Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21427.6">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21473.5">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
92+
<Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21473.5">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
96+
<Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21427.6">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21473.5">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
100+
<Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21427.6">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21473.5">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
104+
<Sha>c575da80f465e0b5fb98f416be92bb98b2f54b41</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
</PropertyGroup>
4040
<!-- Packages that come from https://github.com/dotnet/arcade -->
4141
<PropertyGroup>
42-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21427.6</MicrosoftDotNetApiCompatVersion>
43-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21427.6</MicrosoftDotNetCodeAnalysisPackageVersion>
44-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21427.6</MicrosoftDotNetGenAPIVersion>
42+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21473.5</MicrosoftDotNetApiCompatVersion>
43+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21473.5</MicrosoftDotNetCodeAnalysisPackageVersion>
44+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21473.5</MicrosoftDotNetGenAPIVersion>
4545
</PropertyGroup>
4646
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
4747
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎eng/common/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ function InitializeCustomToolset {
187187
}
188188

189189
function Build {
190+
190191
if [[ "$ci" == true ]]; then
191192
TryLogClientIpAddress
192193
fi

‎eng/common/cross/toolchain.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ function(add_toolchain_linker_flag Flag)
138138
if (NOT Config STREQUAL "")
139139
set(CONFIG_SUFFIX "_${Config}")
140140
endif()
141-
set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
142-
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
141+
set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
142+
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
143143
endfunction()
144144

145145
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

‎eng/common/tools.ps1‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
154154
return $global:_DotNetInstallDir
155155
}
156156

157-
# In case of network error, try to log the current IP for reference
158-
Try-LogClientIpAddress
159-
160157
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161158
$env:DOTNET_MULTILEVEL_LOOKUP=0
162159

@@ -712,6 +709,8 @@ function MSBuild() {
712709
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
713710
}
714711

712+
Enable-Nuget-EnhancedRetry
713+
715714
$toolsetBuildProject = InitializeToolset
716715
$basePath = Split-Path -parent $toolsetBuildProject
717716
$possiblePaths = @(
@@ -720,6 +719,8 @@ function MSBuild() {
720719
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
721720
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
722721
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
722+
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
723+
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
723724
)
724725
$selectedPath = $null
725726
foreach ($path in $possiblePaths) {
@@ -756,6 +757,8 @@ function MSBuild-Core() {
756757
}
757758
}
758759

760+
Enable-Nuget-EnhancedRetry
761+
759762
$buildTool = InitializeBuildTool
760763

761764
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
@@ -896,3 +899,18 @@ function Try-LogClientIpAddress()
896899
Write-Host "Unable to get this machine's effective IP address for logging: $_"
897900
}
898901
}
902+
903+
#
904+
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
905+
#
906+
function Enable-Nuget-EnhancedRetry() {
907+
if ($ci) {
908+
Write-Host "Setting NUGET enhanced retry environment variables"
909+
$env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
910+
$env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
911+
$env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
912+
Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
913+
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
914+
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
915+
}
916+
}

‎eng/common/tools.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff 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

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100-rc.1.21416.15",
3+
"dotnet": "6.0.100-rc.1.21430.12",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21473.5",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21473.5"
1717
},
1818
"sdk": {
19-
"version": "6.0.100-rc.1.21416.15"
19+
"version": "6.0.100-rc.1.21430.12"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)