diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 05b940ac44d583..7acdf9970510fc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,79 +8,79 @@
https://github.com/dotnet/msquic
98129287d56a5e0348c291ce4260e630b4aa510d
-
+
https://github.com/dotnet/emsdk
- 9838ec0843442f761488cfec9cf34612c9f675e6
+ 5cac15def164fc5ab593f8a0d3159dc51acd3cdd
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 761d2e6545a31d2ebf9cb60443ed2a9c2f8268b5
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
https://github.com/microsoft/vstest
@@ -202,9 +202,9 @@
https://github.com/dotnet/xharness
e9669dc84ecd668d3bbb748758103e23b394ffef
-
+
https://github.com/dotnet/arcade
- 474307e526160c813c9fd58060eb8356ccca6099
+ 7324320f814152b72295946847ca72413507705a
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 9cfd309e073b43..e6617f9257537f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,20 +52,20 @@
1.0.0-rc.2.21419.17
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 2.5.1-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21431.1
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
- 6.0.0-beta.21427.6
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 2.5.1-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
+ 6.0.0-beta.21460.7
6.0.0-preview.1.102
@@ -183,7 +183,7 @@
11.1.0-alpha.1.21416.1
11.1.0-alpha.1.21416.1
- 6.0.0-rc.2.21451.1
+ 6.0.0-rtm.21464.2
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
1.1.87-gba258badda
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index fc11001aa76c82..ec8971eb0195f8 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -138,8 +138,8 @@ function(add_toolchain_linker_flag Flag)
if (NOT Config STREQUAL "")
set(CONFIG_SUFFIX "_${Config}")
endif()
- set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
- set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+ set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
+ set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
endfunction()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 56ee4a577acab4..02347914f5dbca 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -709,6 +709,15 @@ 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'
+ }
+
$toolsetBuildProject = InitializeToolset
$basePath = Split-Path -parent $toolsetBuildProject
$possiblePaths = @(
@@ -717,6 +726,8 @@ function MSBuild() {
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+ (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
$selectedPath = $null
foreach ($path in $possiblePaths) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 41e323104df468..6a4871ef72b7a9 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -417,6 +417,13 @@ function MSBuild {
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
+
+ export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
+ export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
+ export 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"
fi
local toolset_dir="${_InitializeToolset%/*}"
@@ -427,6 +434,8 @@ function MSBuild {
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
if [[ -f $path ]]; then
selectedPath=$path
diff --git a/global.json b/global.json
index 103cec939e94b6..0cfd182128d924 100644
--- a/global.json
+++ b/global.json
@@ -1,21 +1,21 @@
{
"sdk": {
- "version": "6.0.100-rc.1.21411.28",
+ "version": "6.0.100-rc.1.21430.12",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.100-rc.1.21411.28"
+ "dotnet": "6.0.100-rc.1.21430.12"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21427.6",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21427.6",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21460.7",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21460.7",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21460.7",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21460.7",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"