From 9a0ae65864f9d387c0cb9ad2b657563ab03ff5cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:25:51 +0000 Subject: [PATCH 01/42] Update dependencies from https://github.com/dotnet/arcade build 20210726.4 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21373.11 -> To Version 6.0.0-beta.21376.4 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++-------- global.json | 8 ++--- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57e52dc79db2be..9a46c615f8a970 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness ccb49ae05b6d98b29871a1779408d4579e16d6e5 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + e6abc186425e675e0f201acc1c33e183a0e51c86 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b03ef6f33987fb..9cb45fff72efd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21375.2 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 2.5.1-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 2.5.1-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 + 6.0.0-beta.21376.4 6.0.0-preview.1.102 diff --git a/global.json b/global.json index ad51e8c2d4275c..14678a72dec8e7 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.21373.11", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21376.4", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21376.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21376.4", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21376.4", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" From 61efb75845a3a0223baa86bb2011900c28f4e27b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:26:29 +0000 Subject: [PATCH 02/42] Update dependencies from https://github.com/dotnet/icu build 20210726.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rc.1.21369.1 -> To Version 6.0.0-rc.1.21376.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a46c615f8a970..2b67bf913bc461 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 08293141bc33a81b7e58120535079d8eac36519f + 92ce79f5d734c7fff5f617cbba1f182eab2a98cf https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 9cb45fff72efd0..8d279456fe7d40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ 6.0.100-preview.6.21378.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21369.1 + 6.0.0-rc.1.21376.1 6.0.0-preview.7.21379.5 From e0c6284db82d3a31c0619fda522169527c33a967 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:27:09 +0000 Subject: [PATCH 03/42] Update dependencies from https://github.com/dotnet/xharness build 20210727.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21373.1 -> To Version 1.0.0-prerelease.21377.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37cc0681fbf9db..e877ee10d5a36e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21373.1", + "version": "1.0.0-prerelease.21377.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b67bf913bc461..a94fd79a7d2772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker 0cb9250a903cfc90cbac602ed79c0cbc588d8d3f - + https://github.com/dotnet/xharness - ccb49ae05b6d98b29871a1779408d4579e16d6e5 + be39724d305a31becc0f13229249966c7cb9d334 - + https://github.com/dotnet/xharness - ccb49ae05b6d98b29871a1779408d4579e16d6e5 + be39724d305a31becc0f13229249966c7cb9d334 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8d279456fe7d40..90fd35a5cb59c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21373.1 - 1.0.0-prerelease.21373.1 + 1.0.0-prerelease.21377.2 + 1.0.0-prerelease.21377.2 1.0.1-alpha.0.21369.1 2.4.1 2.4.2 From 7b6afc61ed0ad8f45437d94b55fd63603ef697bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:27:45 +0000 Subject: [PATCH 04/42] Update dependencies from https://github.com/dotnet/llvm-project build 20210726.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21369.1 -> To Version 11.1.0-alpha.1.21376.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a94fd79a7d2772..5de75dc92262bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -122,37 +122,37 @@ https://github.com/dotnet/runtime-assets bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 0a2782bda41792c9af6c406bdd987b0831f097ad https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 90fd35a5cb59c1..36cea15cc945a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,14 +173,14 @@ 6.0.0-preview.7.21379.5 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21376.1 6.0.0-rc.1.21376.4 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 2c368d225751d5a70b9966983f78730a5b5f846a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:28:22 +0000 Subject: [PATCH 05/42] Update dependencies from https://github.com/dotnet/runtime-assets build 20210726.2 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21371.1 -> To Version 6.0.0-beta.21376.2 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5de75dc92262bc..284af408a05e95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,41 +86,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed https://github.com/dotnet/llvm-project @@ -222,9 +222,9 @@ https://github.com/dotnet/hotreload-utils 589840a79ed6335a310a011ee9e244e660798cf5 - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + f0aff8cc69ca653148a8b5f93f61c876ac21f3ed https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 36cea15cc945a3..b0d60c561806ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,16 +114,16 @@ 4.5.0 6.0.0-rc.1.21375.2 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 + 6.0.0-beta.21376.2 1.0.0-prerelease.21374.3 1.0.0-prerelease.21374.3 From 213e523d18eb54323d9b209269c6ea58d86f7d92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:29:00 +0000 Subject: [PATCH 06/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210726.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21369.1 -> To Version 1.0.1-alpha.0.21376.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 284af408a05e95..0002433ce577dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization f8742ac0820e98221e7eec5f13989d9538579399 - + https://github.com/dotnet/hotreload-utils - 589840a79ed6335a310a011ee9e244e660798cf5 + e5c244ad8fe1f0056d141dfab7b2722f8c93d1ec https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index b0d60c561806ac..48b3fd8aa50bf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21377.2 1.0.0-prerelease.21377.2 - 1.0.1-alpha.0.21369.1 + 1.0.1-alpha.0.21376.1 2.4.1 2.4.2 1.3.0 From 4650ad4951542c741d245d54f5413ca328fe31fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:29:38 +0000 Subject: [PATCH 07/42] Update dependencies from https://github.com/dotnet/msquic build 20210726.1 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21379.5 -> To Version 6.0.0-preview.7.21376.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0002433ce577dd..2a45e5035bb24a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu 92ce79f5d734c7fff5f617cbba1f182eab2a98cf - + https://github.com/dotnet/msquic - d7db669b70f4dd67ec001c192f9809c218cab88b + c3274066e2447973cd08470177de9b715572b78f https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 48b3fd8aa50bf8..c2cabf63de88b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 6.0.0-rc.1.21376.1 - 6.0.0-preview.7.21379.5 + 6.0.0-preview.7.21376.1 11.1.0-alpha.1.21376.1 11.1.0-alpha.1.21376.1 From ae3f14d87643258bbe967bf6f272c6c159b164ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:30:17 +0000 Subject: [PATCH 08/42] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210727.3 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21374.3 -> To Version 1.0.0-prerelease.21377.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a45e5035bb24a..7d59a1ba587e59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,21 +202,21 @@ https://github.com/dotnet/arcade e6abc186425e675e0f201acc1c33e183a0e51c86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + e0a957bc4320c160c28f0a4575bd838ec576ccc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + e0a957bc4320c160c28f0a4575bd838ec576ccc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + e0a957bc4320c160c28f0a4575bd838ec576ccc1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + e0a957bc4320c160c28f0a4575bd838ec576ccc1 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index c2cabf63de88b4..f44f3e868b0be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,10 +125,10 @@ 6.0.0-beta.21376.2 6.0.0-beta.21376.2 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 + 1.0.0-prerelease.21377.3 + 1.0.0-prerelease.21377.3 + 1.0.0-prerelease.21377.3 + 1.0.0-prerelease.21377.3 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From d4d0138b5d6bbd80aca75955f679db09850b0ff8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:31:14 +0000 Subject: [PATCH 09/42] Update dependencies from https://github.com/dotnet/arcade build 20210727.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21376.4 -> To Version 6.0.0-beta.21377.2 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++-------- global.json | 8 ++--- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d59a1ba587e59..e544a8856d01a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness be39724d305a31becc0f13229249966c7cb9d334 - + https://github.com/dotnet/arcade - e6abc186425e675e0f201acc1c33e183a0e51c86 + cab4a3c50fd042677ea17cfc5171b4ce8b29930f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f44f3e868b0be6..cec4dc88e6abb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21375.2 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 2.5.1-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 - 6.0.0-beta.21376.4 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 2.5.1-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 + 6.0.0-beta.21377.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 14678a72dec8e7..282d2c8427380f 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.21376.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21377.2", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21376.4", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21376.4", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21376.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21377.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21377.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21377.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" From 702f4e17a6ce751247581312acf685b82c82cda7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:31:50 +0000 Subject: [PATCH 10/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210727.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21376.1 -> To Version 1.0.1-alpha.0.21377.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e544a8856d01a3..efdbeb6b9b8e24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization e0a957bc4320c160c28f0a4575bd838ec576ccc1 - + https://github.com/dotnet/hotreload-utils - e5c244ad8fe1f0056d141dfab7b2722f8c93d1ec + 580e574360beb971fb07824223d1e714ae82d2ee https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index cec4dc88e6abb7..6629c85e3f800c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21377.2 1.0.0-prerelease.21377.2 - 1.0.1-alpha.0.21376.1 + 1.0.1-alpha.0.21377.1 2.4.1 2.4.2 1.3.0 From 9486252c4f36eae2bc587a348314a4fe323192a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:32:28 +0000 Subject: [PATCH 11/42] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20210727.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 6.0.0-rc1.21375.2 -> To Version 6.0.0-rc1.21377.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efdbeb6b9b8e24..b4b9bdfe8ea7d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -226,9 +226,9 @@ https://github.com/dotnet/runtime-assets f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/roslyn-analyzers - 19af44783ceecc31842d7028e3b0ce83095ea166 + d36599d59dffb849cd07f728059f47a3c837f7b0 diff --git a/eng/Versions.props b/eng/Versions.props index 6629c85e3f800c..e8a0dda90db950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21375.2 + 6.0.0-rc1.21377.2 6.0.0-beta.21377.2 6.0.0-beta.21377.2 From c8c04ed5abfa6d4a90287b390402adb1d77eff9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:33:07 +0000 Subject: [PATCH 12/42] Update dependencies from https://github.com/dotnet/emsdk build 20210728.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rc.1.21376.4 -> To Version 6.0.0-rc.1.21378.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4b9bdfe8ea7d2..9332b454c0ae38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic c3274066e2447973cd08470177de9b715572b78f - + https://github.com/dotnet/emsdk - 7a7664b07a1625bc1682e0735019178e69fcfbec + a4b73e3e43d8a23a467016f1ffb22ab4821da774 diff --git a/eng/Versions.props b/eng/Versions.props index e8a0dda90db950..913e9dff133d10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 11.1.0-alpha.1.21376.1 11.1.0-alpha.1.21376.1 - 6.0.0-rc.1.21376.4 + 6.0.0-rc.1.21378.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From 8e5f53dcce2cb873c436544abba4f67fc754e8ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:33:44 +0000 Subject: [PATCH 13/42] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210728.5 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21377.3 -> To Version 1.0.0-prerelease.21378.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9332b454c0ae38..09acddfcf8f25c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,21 +202,21 @@ https://github.com/dotnet/arcade cab4a3c50fd042677ea17cfc5171b4ce8b29930f - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - e0a957bc4320c160c28f0a4575bd838ec576ccc1 + 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - e0a957bc4320c160c28f0a4575bd838ec576ccc1 + 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - e0a957bc4320c160c28f0a4575bd838ec576ccc1 + 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - e0a957bc4320c160c28f0a4575bd838ec576ccc1 + 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 913e9dff133d10..2592b1e442fbab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,10 +125,10 @@ 6.0.0-beta.21376.2 6.0.0-beta.21376.2 - 1.0.0-prerelease.21377.3 - 1.0.0-prerelease.21377.3 - 1.0.0-prerelease.21377.3 - 1.0.0-prerelease.21377.3 + 1.0.0-prerelease.21378.5 + 1.0.0-prerelease.21378.5 + 1.0.0-prerelease.21378.5 + 1.0.0-prerelease.21378.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 1f11c6dd420642368428c18ebc5cbcda74e7323e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:34:41 +0000 Subject: [PATCH 14/42] Update dependencies from https://github.com/dotnet/arcade build 20210728.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21377.2 -> To Version 6.0.0-beta.21378.2 --- eng/Version.Details.xml | 72 ++++++++++++++++---------------- eng/Versions.props | 28 ++++++------- eng/common/internal/Tools.csproj | 2 +- global.json | 8 ++-- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09acddfcf8f25c..8a98c43007c039 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness be39724d305a31becc0f13229249966c7cb9d334 - + https://github.com/dotnet/arcade - cab4a3c50fd042677ea17cfc5171b4ce8b29930f + dd3652e2ae5ea89703a2286295de9efe908974f1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2592b1e442fbab..7e019eb2518bc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 2.5.1-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 - 6.0.0-beta.21377.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 2.5.1-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 6.0.0-preview.1.102 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2e32af..2067b8df8d985d 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,5 @@ + - net472 diff --git a/global.json b/global.json index 282d2c8427380f..6f78cfdf4cbc2b 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.21377.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21378.2", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21377.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21377.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21377.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21378.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" From bd4d77ea279e0c1c024b86c47b1afc2e176cf6c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:35:19 +0000 Subject: [PATCH 15/42] Update dependencies from https://github.com/dotnet/xharness build 20210728.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21377.2 -> To Version 1.0.0-prerelease.21378.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e877ee10d5a36e..1db2d5a6f6b03a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21377.2", + "version": "1.0.0-prerelease.21378.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a98c43007c039..56975a61aaa6a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker 0cb9250a903cfc90cbac602ed79c0cbc588d8d3f - + https://github.com/dotnet/xharness - be39724d305a31becc0f13229249966c7cb9d334 + 016171de04070fdd21472bd7514bb0272f0ad3aa - + https://github.com/dotnet/xharness - be39724d305a31becc0f13229249966c7cb9d334 + 016171de04070fdd21472bd7514bb0272f0ad3aa https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 7e019eb2518bc1..91c68b89620bcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21377.2 - 1.0.0-prerelease.21377.2 + 1.0.0-prerelease.21378.1 + 1.0.0-prerelease.21378.1 1.0.1-alpha.0.21377.1 2.4.1 2.4.2 From 13b3bc40211b6839037ad7b4149883b76d9670dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:35:54 +0000 Subject: [PATCH 16/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210728.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21377.1 -> To Version 1.0.1-alpha.0.21378.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56975a61aaa6a8..16031fc711df41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 - + https://github.com/dotnet/hotreload-utils - 580e574360beb971fb07824223d1e714ae82d2ee + bf78644781f5ae4e73714fa2c9a6dcee305b9b0a https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 91c68b89620bcf..4e7d0dce831118 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.1-alpha.0.21377.1 + 1.0.1-alpha.0.21378.1 2.4.1 2.4.2 1.3.0 From fe2dfac4f4809bc9844f7663f15e322c64e0889a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:36:33 +0000 Subject: [PATCH 17/42] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20210728.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 6.0.0-rc1.21377.2 -> To Version 6.0.0-rc1.21378.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16031fc711df41..d1f220848770e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -226,9 +226,9 @@ https://github.com/dotnet/runtime-assets f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/roslyn-analyzers - d36599d59dffb849cd07f728059f47a3c837f7b0 + 92cc1339befaae2508da6480dcc7b29ebb1d5f67 diff --git a/eng/Versions.props b/eng/Versions.props index 4e7d0dce831118..27d9433397ceb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21377.2 + 6.0.0-rc1.21378.3 6.0.0-beta.21378.2 6.0.0-beta.21378.2 From 79fba9005776ff2c0a843dd192e2b107995dc214 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:37:11 +0000 Subject: [PATCH 18/42] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210729.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21378.5 -> To Version 1.0.0-prerelease.21379.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1f220848770e7..e486517f1f35ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,21 +202,21 @@ https://github.com/dotnet/arcade dd3652e2ae5ea89703a2286295de9efe908974f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 9e8fcb473640ce1bb843e0b9a741cda23dcfa092 + 60bf5650ba15cc46cec560bcee2bd45080873176 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 27d9433397ceb7..49139c083d6313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,10 +125,10 @@ 6.0.0-beta.21376.2 6.0.0-beta.21376.2 - 1.0.0-prerelease.21378.5 - 1.0.0-prerelease.21378.5 - 1.0.0-prerelease.21378.5 - 1.0.0-prerelease.21378.5 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From d8f25ff92b9a8aa593f2845d1dfe40acd41b35d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:38:06 +0000 Subject: [PATCH 19/42] Update dependencies from https://github.com/dotnet/arcade build 20210729.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21378.2 -> To Version 6.0.0-beta.21379.2 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++-------- global.json | 8 ++--- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e486517f1f35ec..7ac8a193625c3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness 016171de04070fdd21472bd7514bb0272f0ad3aa - + https://github.com/dotnet/arcade - dd3652e2ae5ea89703a2286295de9efe908974f1 + 62a8aafffd4c68ef887680f6837abdff906a662c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 49139c083d6313..212c85497ab4f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21378.3 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 2.5.1-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 - 6.0.0-beta.21378.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 2.5.1-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 6f78cfdf4cbc2b..b4394ce0e61475 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.21378.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21379.2", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21379.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21379.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" From dc27ebc4ccad6c9683f4e561b9290e097f63391a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:38:44 +0000 Subject: [PATCH 20/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210730.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21378.1 -> To Version 1.0.2-alpha.0.21380.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac8a193625c3d..f4ff6c05a394a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - bf78644781f5ae4e73714fa2c9a6dcee305b9b0a + 92c4fd29a0f84dd95c1c8e8f89f14a704c6caee2 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 212c85497ab4f8..c0eeb78c9fe45f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.1-alpha.0.21378.1 + 1.0.2-alpha.0.21380.1 2.4.1 2.4.2 1.3.0 From 4c5fe60cf667546fbee159efbfff456c6cd28f1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:39:20 +0000 Subject: [PATCH 21/42] Update dependencies from https://github.com/dotnet/msquic build 20210729.5 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21376.1 -> To Version 6.0.0-preview.7.21379.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4ff6c05a394a0..a2fe6267f7ac51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu 92ce79f5d734c7fff5f617cbba1f182eab2a98cf - + https://github.com/dotnet/msquic - c3274066e2447973cd08470177de9b715572b78f + deb3a26c20315aa4c659079071b821e5d5230242 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index c0eeb78c9fe45f..b8bd319e7dda11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 6.0.0-rc.1.21376.1 - 6.0.0-preview.7.21376.1 + 6.0.0-preview.7.21379.5 11.1.0-alpha.1.21376.1 11.1.0-alpha.1.21376.1 From 621d71b3b33c06d731da258a33be6d8e6937cf8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:39:56 +0000 Subject: [PATCH 22/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210730.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21380.1 -> To Version 1.0.2-alpha.0.21380.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2fe6267f7ac51..011c97f42ee57e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - 92c4fd29a0f84dd95c1c8e8f89f14a704c6caee2 + 910f08a72e21afe5a9a2dc4ea591ad1226ca1213 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index b8bd319e7dda11..49eb581422678c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.2-alpha.0.21380.1 + 1.0.2-alpha.0.21380.3 2.4.1 2.4.2 1.3.0 From 3854df48b1844f609e8b2a9281b23fc9880b43a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:40:36 +0000 Subject: [PATCH 23/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210731.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21380.3 -> To Version 1.0.2-alpha.0.21381.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 011c97f42ee57e..e9445eb14c1588 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - 910f08a72e21afe5a9a2dc4ea591ad1226ca1213 + e83b3b14ad85b92861144101728ffd82ac6f4e98 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 49eb581422678c..fe4e770cc5f7ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.2-alpha.0.21380.3 + 1.0.2-alpha.0.21381.1 2.4.1 2.4.2 1.3.0 From b9ce44f22dc8c1551db2580313c170214724bf5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Aug 2021 12:41:14 +0000 Subject: [PATCH 24/42] Update dependencies from https://github.com/dotnet/runtime build 20210801.3 Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Text.Json , System.Runtime.CompilerServices.Unsafe From Version 6.0.0-rc.1.21375.2 -> To Version 6.0.0-rc.1.21401.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9445eb14c1588..939ea4fc9db471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,33 +158,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index fe4e770cc5f7ec..7da6171dff148c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,11 +70,11 @@ 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-rc.1.21375.2 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21401.3 3.1.0 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 5.0.0 4.3.0 @@ -108,11 +108,11 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-rc.1.21375.2 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21401.3 4.5.4 4.5.0 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 6.0.0-beta.21376.2 6.0.0-beta.21376.2 diff --git a/global.json b/global.json index b4394ce0e61475..77c48a103385d2 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21379.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" + "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21401.3" } } From 37ea122b58be83821fad06d028731a8c9f90b490 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Mon, 2 Aug 2021 09:49:20 -0500 Subject: [PATCH 25/42] fix log formatting --- src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index 4dc7c374268c4b..5cc5df79144624 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -84,7 +84,7 @@ protected override async Task AcceptEvent(SessionId sessionId, string meth { if (a.Type != JTokenType.Array) { - logger.LogDebug("Invalid event raised args, expected an array: {a}"); + logger.LogDebug($"Invalid event raised args, expected an array: {a.Type}"); } else { From a4ba761c0c1fd4ac4edf2b31e42103bdacc4f74c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Aug 2021 12:10:05 +0000 Subject: [PATCH 26/42] Update dependencies from https://github.com/dotnet/icu build 20210802.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rc.1.21369.1 -> To Version 6.0.0-rc.1.21402.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 939ea4fc9db471..014bcd24b09979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 92ce79f5d734c7fff5f617cbba1f182eab2a98cf + 662f7844f6abda0f24549679894d825c8cc247c2 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 7da6171dff148c..fc04b1d6ad1937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ 6.0.100-preview.6.21378.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21376.1 + 6.0.0-rc.1.21402.1 6.0.0-preview.7.21379.5 From ee560c648b00156c70681bebeb5e4975e607644e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Aug 2021 12:11:35 +0000 Subject: [PATCH 27/42] Update dependencies from https://github.com/dotnet/llvm-project build 20210802.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21369.1 -> To Version 11.1.0-alpha.1.21402.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 014bcd24b09979..557a2121fdb00b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -122,37 +122,37 @@ https://github.com/dotnet/runtime-assets f0aff8cc69ca653148a8b5f93f61c876ac21f3ed - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0a2782bda41792c9af6c406bdd987b0831f097ad + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fc04b1d6ad1937..b449dbff96d7cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,14 +173,14 @@ 6.0.0-preview.7.21379.5 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 - 11.1.0-alpha.1.21376.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 6.0.0-rc.1.21378.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 5f5c0936141b95d49f241167330aa44416835987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Aug 2021 12:12:18 +0000 Subject: [PATCH 28/42] Update dependencies from https://github.com/dotnet/runtime-assets build 20210802.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21371.1 -> To Version 6.0.0-beta.21402.1 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 557a2121fdb00b..c0d84afa0b9be9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,41 +86,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 https://github.com/dotnet/llvm-project @@ -222,9 +222,9 @@ https://github.com/dotnet/hotreload-utils e83b3b14ad85b92861144101728ffd82ac6f4e98 - + https://github.com/dotnet/runtime-assets - f0aff8cc69ca653148a8b5f93f61c876ac21f3ed + 80614a9bba6e6524dfac7b72fb078182e0d94dd3 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index b449dbff96d7cf..c206f252441d9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,16 +114,16 @@ 4.5.0 6.0.0-rc.1.21401.3 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 - 6.0.0-beta.21376.2 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 + 6.0.0-beta.21402.1 1.0.0-prerelease.21379.4 1.0.0-prerelease.21379.4 From 9513d57cbf09638ce8f9bbc9ca956f158ee0ddcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Aug 2021 12:17:55 +0000 Subject: [PATCH 29/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210802.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21369.1 -> To Version 1.0.2-alpha.0.21402.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0d84afa0b9be9..522480520fe1d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - e83b3b14ad85b92861144101728ffd82ac6f4e98 + 312d3ada595616e44ad827f64231109dc4ea1431 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index c206f252441d9d..f72445f1ff76f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.2-alpha.0.21381.1 + 1.0.2-alpha.0.21402.1 2.4.1 2.4.2 1.3.0 From 43d3da9be1c009f85a7577337b84428f9fbdb0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 4 Aug 2021 12:21:17 +0200 Subject: [PATCH 30/42] Remove wrong parameter in JsonConsoleFormatterTests.cs --- .../JsonConsoleFormatterTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs index f58e10b8403540..37122859b1e67c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs @@ -36,7 +36,7 @@ public void NoLogScope_DoesNotWriteAnyScopeContentToOutput_Json() // Act using (logger.BeginScope("Scope with named parameter {namedParameter}", 123)) using (logger.BeginScope("SimpleScope")) - logger.Log(LogLevel.Warning, 0, "Message with {args}", 73, _defaultFormatter); + logger.Log(LogLevel.Warning, 0, "Message with {args}", 73); // Assert Assert.Equal(1, sink.Writes.Count); From 10b703f68d31ff3326533b81165094e1370f8a54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Aug 2021 12:18:18 +0000 Subject: [PATCH 31/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210803.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21369.1 -> To Version 1.0.2-alpha.0.21403.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30b49eccff24c7..918650bb7fb27f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - 312d3ada595616e44ad827f64231109dc4ea1431 + a3c16f2f2b4f72973e3c8769de984222d52d4610 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 9da2095ebdf268..61b67fbaecfe2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21378.1 1.0.0-prerelease.21378.1 - 1.0.2-alpha.0.21402.1 + 1.0.2-alpha.0.21403.1 2.4.1 2.4.2 1.3.0 From 396520d9c173ab50d75ebc74d292dc77ca504b3b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 4 Aug 2021 22:04:02 +0200 Subject: [PATCH 32/42] Downgrade io.ports native --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 61b67fbaecfe2e..25e8d585c4d801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ 6.0.0-rc.1.21401.3 4.5.4 4.5.0 - 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21375.2 6.0.0-beta.21402.1 6.0.0-beta.21402.1 From c92180b63629c514dc528f4e6565d0b5a5850c57 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 4 Aug 2021 22:04:52 +0200 Subject: [PATCH 33/42] Update Version.Details.xml --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 918650bb7fb27f..0600adbc08a302 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ https://github.com/dotnet/runtime d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - d90f6b6c86be7001dc839e147ab229dfd1c7d20d + 95863758cd16c345d0b8fca067d5db5d6901e498 https://github.com/dotnet/runtime From dcb221712e860030da25f548276f077c45cc282f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Aug 2021 21:39:06 +0000 Subject: [PATCH 34/42] Update dependencies from https://github.com/dotnet/arcade build 20210729.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21373.11 -> To Version 6.0.0-beta.21379.2 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0600adbc08a302..76ea3ae28cfe7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/arcade 62a8aafffd4c68ef887680f6837abdff906a662c - + https://github.com/dotnet/arcade - 35a36a8ec705945b20275a7d63478affb396ff89 + 62a8aafffd4c68ef887680f6837abdff906a662c https://github.com/dotnet/arcade @@ -198,7 +198,7 @@ https://github.com/dotnet/xharness 016171de04070fdd21472bd7514bb0272f0ad3aa - + https://github.com/dotnet/arcade 62a8aafffd4c68ef887680f6837abdff906a662c diff --git a/eng/Versions.props b/eng/Versions.props index 25e8d585c4d801..835e4070413e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21378.3 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 2.5.1-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21403.2 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21402.1 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 2.5.1-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 + 6.0.0-beta.21379.2 6.0.0-preview.1.102 From 6929e4b3395cd6a909cddc42fdf339a4ea17b684 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Aug 2021 22:48:34 +0000 Subject: [PATCH 35/42] Update dependencies from https://github.com/dotnet/arcade build 20210803.5 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21373.11 -> To Version 6.0.0-beta.21403.5 --- eng/Version.Details.xml | 72 ++++++++++++++++---------------- eng/Versions.props | 28 ++++++------- eng/common/cross/build-rootfs.sh | 22 +++++++--- eng/common/internal/Tools.csproj | 1 - global.json | 12 +++--- 5 files changed, 72 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76ea3ae28cfe7a..437734dd864c50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness 016171de04070fdd21472bd7514bb0272f0ad3aa - + https://github.com/dotnet/arcade - 62a8aafffd4c68ef887680f6837abdff906a662c + 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 835e4070413e68..347f942cc96384 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21378.3 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 2.5.1-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 - 6.0.0-beta.21379.2 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 2.5.1-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 735a4c82838982..59714ff5c34736 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -7,9 +7,9 @@ usage() echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd11 or freebsd12." + echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13" echo " for illumos can be: illumos." - echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD" + echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 @@ -60,13 +60,15 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.1-RELEASE" +__FreeBSDBase="12.2-RELEASE" __FreeBSDPkg="1.12.0" +__FreeBSDABI="12" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" __FreeBSDPackages+=" krb5" +__FreeBSDPackages+=" terminfo-db" __IllumosPackages="icu-64.2nb2" __IllumosPackages+=" mit-krb5-1.16.2nb4" @@ -208,12 +210,20 @@ while :; do ;; freebsd11) __FreeBSDBase="11.3-RELEASE" + __FreeBSDABI="11" ;& freebsd12) __CodeName=freebsd __BuildArch=x64 __SkipUnmount=1 ;; + freebsd13) + __CodeName=freebsd + __FreeBSDBase="13.0-RELEASE" + __FreeBSDABI="13" + __BuildArch=x64 + __SkipUnmount=1 + ;; illumos) __CodeName=illumos __BuildArch=x64 @@ -291,9 +301,9 @@ if [[ "$__CodeName" == "alpine" ]]; then rm -r $__ApkToolsDir elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p $__RootfsDir/usr/local/etc + JOBS="$(getconf _NPROCESSORS_ONLN)" wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version - # For now, ask for 11 ABI even on 12. This can be revisited later. - echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf + echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf mkdir -p $__RootfsDir/tmp # get and build package manager @@ -301,7 +311,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg} # needed for install to succeed mkdir -p $__RootfsDir/host/etc - ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install + ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg} # install packages we need. INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 2067b8df8d985d..beb9c4648ea19a 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,4 @@ - net472 diff --git a/global.json b/global.json index 77c48a103385d2..52466463f155f6 100644 --- a/global.json +++ b/global.json @@ -1,22 +1,22 @@ { "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-rc.1.21379.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-rc.1.21379.2" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21379.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21403.5", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21379.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21379.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21403.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21403.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21403.5", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21401.3" From a6e02f5dd3c72dfdfb4c8eb474e6723c4d64a124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 5 Aug 2021 01:29:19 +0200 Subject: [PATCH 36/42] Revert sdk bump --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 52466463f155f6..372e3718ce1f44 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21379.2", + "version": "6.0.0-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-rc.1.21379.2" + "dotnet": "6.0.0-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", From e3afda22c9a23b05ac84c2aa2a791f960849c648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 5 Aug 2021 01:29:59 +0200 Subject: [PATCH 37/42] Fixup --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 372e3718ce1f44..d566dd0715d4ab 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.0-preview.6.21355.2", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.0-preview.6.21355.2" + "dotnet": "6.0.100-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", From 9a310633680e367837d2dd52de4463c700daff11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Aug 2021 12:13:37 +0000 Subject: [PATCH 38/42] Update dependencies from https://github.com/dotnet/arcade build 20210803.5 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21373.11 -> To Version 6.0.0-beta.21403.5 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index d566dd0715d4ab..52466463f155f6 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-rc.1.21379.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-rc.1.21379.2" }, "native-tools": { "cmake": "3.16.4", From 901f35cd25ad7ff955a476a60dd0b409db320e57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Aug 2021 12:16:00 +0000 Subject: [PATCH 39/42] Update dependencies from https://github.com/dotnet/xharness build 20210804.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21373.1 -> To Version 1.0.0-prerelease.21404.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1db2d5a6f6b03a..e39fc127a1123f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21378.1", + "version": "1.0.0-prerelease.21404.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 437734dd864c50..e18c553b23e67c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker ae18468b8712503aee67911228dd921601bd423a - + https://github.com/dotnet/xharness - 016171de04070fdd21472bd7514bb0272f0ad3aa + e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/xharness - 016171de04070fdd21472bd7514bb0272f0ad3aa + e9669dc84ecd668d3bbb748758103e23b394ffef https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 347f942cc96384..3e449df6fbb9b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21378.1 - 1.0.0-prerelease.21378.1 + 1.0.0-prerelease.21404.1 + 1.0.0-prerelease.21404.1 1.0.2-alpha.0.21403.1 2.4.1 2.4.2 From f4ae79178ba879ad83b96b2b2b900c46d24b22df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Aug 2021 12:17:41 +0000 Subject: [PATCH 40/42] Update dependencies from https://github.com/dotnet/runtime-assets build 20210805.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21371.1 -> To Version 6.0.0-beta.21405.1 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e18c553b23e67c..81fb3b1cc06568 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,41 +86,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d https://github.com/dotnet/llvm-project @@ -222,9 +222,9 @@ https://github.com/dotnet/hotreload-utils a3c16f2f2b4f72973e3c8769de984222d52d4610 - + https://github.com/dotnet/runtime-assets - 80614a9bba6e6524dfac7b72fb078182e0d94dd3 + 07259c6fd799b74979769501c6da609c6a53061d https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 3e449df6fbb9b6..8ef8886efd30e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,16 +114,16 @@ 4.5.0 6.0.0-rc.1.21375.2 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 - 6.0.0-beta.21402.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 1.0.0-prerelease.21379.4 1.0.0-prerelease.21379.4 From f8d0a7871639ae937224ed92940422486c96840c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Aug 2021 12:27:46 +0000 Subject: [PATCH 41/42] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210804.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21402.1 -> To Version 1.0.2-alpha.0.21404.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81fb3b1cc06568..a539dfdbc7e727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - a3c16f2f2b4f72973e3c8769de984222d52d4610 + 187d28ec14993a75eb7d2a72fc12f336efafe138 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 8ef8886efd30e2..85e922430d1d94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,7 +154,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21404.1 1.0.0-prerelease.21404.1 - 1.0.2-alpha.0.21403.1 + 1.0.2-alpha.0.21404.1 2.4.1 2.4.2 1.3.0 From 404aa1dba24f50aac61d5aeec75a13ea473c1f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 5 Aug 2021 18:44:53 +0200 Subject: [PATCH 42/42] Bump arcade --- eng/Version.Details.xml | 72 +++++----- eng/Versions.props | 28 ++-- eng/common/templates/phases/base.yml | 130 ------------------ .../templates/phases/publish-build-assets.yml | 52 ------- global.json | 8 +- 5 files changed, 54 insertions(+), 236 deletions(-) delete mode 100644 eng/common/templates/phases/base.yml delete mode 100644 eng/common/templates/phases/publish-build-assets.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c2d6b6471da3e..9bf1b585fe95c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 9fc83fbf76339c9dec4f5a8bf4718df2d42992a3 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 8a660621cebba9..09cb4fbd0d9a56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,20 +54,20 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 2.5.1-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 2.5.1-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 6.0.0-preview.1.102 diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml deleted file mode 100644 index 0123cf43b1680b..00000000000000 --- a/eng/common/templates/phases/base.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - # Optional: Clean sources before building - clean: true - - # Optional: Git fetch depth - fetchDepth: '' - - # Optional: name of the phase (not specifying phase name may cause name collisions) - name: '' - # Optional: display name of the phase - displayName: '' - - # Optional: condition for the job to run - condition: '' - - # Optional: dependencies of the phase - dependsOn: '' - - # Required: A defined YAML queue - queue: {} - - # Required: build steps - steps: [] - - # Optional: variables - variables: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - ## Telemetry variables - - # Optional: enable sending telemetry - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _HelixBuildConfig - differentiate between Debug, Release, other - # _HelixSource - Example: build/product - # _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch) - enableTelemetry: false - - # Optional: Enable installing Microbuild plugin - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _TeamName - the name of your team - # _SignType - 'test' or 'real' - enableMicrobuild: false - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -phases: -- phase: ${{ parameters.name }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - queue: ${{ parameters.queue }} - - ${{ if ne(parameters.variables, '') }}: - variables: - ${{ insert }}: ${{ parameters.variables }} - - steps: - - checkout: self - clean: ${{ parameters.clean }} - ${{ if ne(parameters.fetchDepth, '') }}: - fetchDepth: ${{ parameters.fetchDepth }} - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-start.yml - parameters: - buildConfig: $(_HelixBuildConfig) - helixSource: $(_HelixSource) - helixType: $(_HelixType) - runAsPublic: ${{ parameters.runAsPublic }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildSigningPlugin@2 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - - env: - TeamName: $(_TeamName) - continueOnError: false - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - # Run provided build steps - - ${{ parameters.steps }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resources - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - env: - TeamName: $(_TeamName) - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-end.yml - parameters: - helixSource: $(_HelixSource) - helixType: $(_HelixType) - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: CopyFiles@2 - displayName: Gather Asset Manifests - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' - TargetFolder: '$(Build.StagingDirectory)/AssetManifests' - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) - - task: PublishBuildArtifacts@1 - displayName: Push Asset Manifests - inputs: - PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' - PublishLocation: Container - ArtifactName: AssetManifests - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml deleted file mode 100644 index 4e51e472e2bbab..00000000000000 --- a/eng/common/templates/phases/publish-build-assets.yml +++ /dev/null @@ -1,52 +0,0 @@ -parameters: - dependsOn: '' - queue: {} - configuration: 'Debug' - condition: succeeded() - continueOnError: false - runAsPublic: false - publishUsingPipelines: false -phases: - - phase: Asset_Registry_Publish - displayName: Publish to Build Asset Registry - dependsOn: ${{ parameters.dependsOn }} - queue: ${{ parameters.queue }} - variables: - _BuildConfig: ${{ parameters.configuration }} - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: AzureKeyVault@1 - inputs: - azureSubscription: 'DotNet-Engineering-Services_KeyVault' - KeyVaultName: EngKeyVault - SecretsFilter: 'MaestroAccessToken' - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_Asset_Registry_Publish - continueOnError: true - condition: always() diff --git a/global.json b/global.json index d566dd0715d4ab..a769292d1363c7 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.21403.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21405.3", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21403.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21403.5", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21403.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21405.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21401.3"