From 2d864de42463c509a5f19df65314f0bc66f03644 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 13:54:52 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230315.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.23114.5 -> To Version 6.0.0-beta.23165.1 --- NuGet.config | 4 +++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 12 +++---- 4 files changed, 63 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff0700470b4e80..2d83de308d455a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1b33746aff9d6..1d67de9c35b883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ab23d8ba693edf..e93eefc5061998 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 2.5.1-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 2.5.1-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 77cb23295c93c0..e6866c7d68c96a 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.114", + "version": "6.0.115", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.114" + "dotnet": "6.0.115" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23114.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23165.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23165.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23165.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 29e0a5ecf5281ae6fbbb5270ab47f18eb36fa047 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 18:26:55 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/emsdk build 20230316.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.15 -> To Version 6.0.15 --- NuGet.config | 6 +----- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d83de308d455a..b99c6bcbbc65f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d67de9c35b883..6b623b4f6430a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,15 +10,15 @@ https://github.com/dotnet/emsdk - 0c39542771ca202430d0042f710622b5b916ff0a + b7ad738902376490b94b1f018c2a766bf0ef3d25 https://github.com/dotnet/emsdk - 0c39542771ca202430d0042f710622b5b916ff0a + b7ad738902376490b94b1f018c2a766bf0ef3d25 https://github.com/dotnet/emsdk - 0c39542771ca202430d0042f710622b5b916ff0a + b7ad738902376490b94b1f018c2a766bf0ef3d25 https://github.com/dotnet/wcf From 1481d828a9ff538bbb96fd6d7ec589338c3ad4e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 14:20:10 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20230317.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.23114.5 -> To Version 6.0.0-beta.23167.1 --- NuGet.config | 1 - eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 4 files changed, 57 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index b99c6bcbbc65f3..d5dbd101f043e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b623b4f6430a9..a84cc41d01734a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e93eefc5061998..878675935c20b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 2.5.1-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 2.5.1-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index e6866c7d68c96a..46c71ec7dd04f3 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23165.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23165.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23165.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23167.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From eaa748777d4f5eea2840bcee71ba499d5e6ad82f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 17:54:13 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/emsdk build 20230320.2 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.15 -> To Version 6.0.15 --- NuGet.config | 1 + eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5dbd101f043e1..5cd1bd96d3af8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a84cc41d01734a..a6ce3d4ae30788 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,15 +10,15 @@ https://github.com/dotnet/emsdk - b7ad738902376490b94b1f018c2a766bf0ef3d25 + 253a56aaea0d63f84cc277cef649834f4c1798c6 https://github.com/dotnet/emsdk - b7ad738902376490b94b1f018c2a766bf0ef3d25 + 253a56aaea0d63f84cc277cef649834f4c1798c6 https://github.com/dotnet/emsdk - b7ad738902376490b94b1f018c2a766bf0ef3d25 + 253a56aaea0d63f84cc277cef649834f4c1798c6 https://github.com/dotnet/wcf