From 05cb4b383ac9e55723ffc60a078ceddb6526ddb1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 3 Jan 2021 12:05:56 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/xharness
dotnet/llvm-project dotnet/icu dotnet/arcade (#46450)
[master] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/icu dotnet/arcade
- Merge branch 'master' into darc-master-471b4a40-3bef-4a13-b73c-02196b660069
- Merge branch 'master' into darc-master-471b4a40-3bef-4a13-b73c-02196b660069
---
.config/dotnet-tools.json | 2 +-
eng/Version.Details.xml | 112 +++++++++++++++++++-------------------
eng/Versions.props | 46 ++++++++--------
eng/common/tools.sh | 4 +-
global.json | 10 ++--
5 files changed, 88 insertions(+), 86 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index c2449f6ce67..921ea03b2ae 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.20621.4",
+ "version": "1.0.0-prerelease.20630.1",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f984d249f9..9231ef71969 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,78 +1,78 @@
-
+
https://github.com/dotnet/icu
- 5135179db94078b700b4fb7fb6bce964bd5cf1c2
+ 7dd03ef8233bf8bd614033bf2f961f871564321e
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 3ba79fbd73d6765b67d0f75ac9dac148d6bea346
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -134,37 +134,37 @@
https://github.com/dotnet/runtime-assets
eb7c48f9c4b6a199b5c090e301f2895600bbf775
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
-
+
https://github.com/dotnet/llvm-project
- acabc6dccdf4e02581bea8eb42b5e48429a44b9c
+ edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41
https://github.com/dotnet/runtime
@@ -202,13 +202,13 @@
https://github.com/mono/linker
e68a1c586b5b5174e21e3f0d4b00322c547e4c3d
-
+
https://github.com/dotnet/xharness
- 1d3ec3b30c26ebd40cf0312f9f86d95ee2330bd1
+ 71ee4e865578cc9202508d8ae6c14c7c9ecee935
-
+
https://github.com/dotnet/xharness
- 1d3ec3b30c26ebd40cf0312f9f86d95ee2330bd1
+ 71ee4e865578cc9202508d8ae6c14c7c9ecee935
diff --git a/eng/Versions.props b/eng/Versions.props
index 888a0119503..f4ee94caf0d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -47,18 +47,18 @@
6.0.0-preview1.20513.4
3.8.0-4.20503.2
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 2.5.1-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20630.3
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
- 6.0.0-beta.20621.12
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 2.5.1-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
5.9.0-preview.2
@@ -142,8 +142,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.20621.4
- 1.0.0-prerelease.20621.4
+ 1.0.0-prerelease.20630.1
+ 1.0.0-prerelease.20630.1
2.4.1
2.4.2
1.3.0
@@ -156,16 +156,16 @@
6.0.0-alpha.1.20628.2
- 6.0.0-alpha.1.20621.2
+ 6.0.0-alpha.1.20628.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
- 9.0.1-alpha.1.20621.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
+ 9.0.1-alpha.1.20628.1
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 0295dd9ff63..b160c370f84 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -273,7 +273,9 @@ function GetDotNetInstallScript {
if command -v curl > /dev/null; then
# first, try directly, if this fails we will retry with verbose logging
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
- echo "curl failed; will now retry with verbose logging."
+ echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
+ echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
+ echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
diff --git a/global.json b/global.json
index a74a53a8bd6..a9d50396574 100644
--- a/global.json
+++ b/global.json
@@ -12,11 +12,11 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20621.12",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.3",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20621.12",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20621.12",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20621.12",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20630.2",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.2",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20630.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20630.2",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20630.2",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20627.5",
"Microsoft.Build.NoTargets": "2.0.1",
--
GitLab