From 3b204ac0f9894cddd95f7cc9e4ae66e53f60d222 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 18:13:42 -0700 Subject: [PATCH 1/4] [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#88762) * Update dependencies from https://github.com/dotnet/arcade build 20230711.3 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.23313.5 -> To Version 6.0.0-beta.23361.3 * Update dependencies from https://github.com/dotnet/emsdk build 20230712.3 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.21 -> To Version 6.0.21 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 82 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++-------- global.json | 12 +++--- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6544a77805caf6..c82725c9415005 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e04ddefbde4dcd..6f48f69f03a077 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,15 +10,15 @@ https://github.com/dotnet/emsdk - 864fae9e00da58498da19b40d46be706a9bf5f47 + 60d640a5c1025d1e9e89188cabe41e692d0f5468 https://github.com/dotnet/emsdk - 864fae9e00da58498da19b40d46be706a9bf5f47 + 60d640a5c1025d1e9e89188cabe41e692d0f5468 https://github.com/dotnet/emsdk - 864fae9e00da58498da19b40d46be706a9bf5f47 + 60d640a5c1025d1e9e89188cabe41e692d0f5468 https://github.com/dotnet/wcf @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness 233cbdd69acedc940fc3342f66b649ac0fb44333 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b45f75f0fa0d59..a727c5e705a1bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 2.5.1-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 2.5.1-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 51640c121ac78b..e3e2a3849d98b8 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.118", + "version": "6.0.120", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.118" + "dotnet": "6.0.120" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23361.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 4787f4299157cb0f2ab1cc884b80303b4685d71d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:13:14 -0700 Subject: [PATCH 2/4] Update branding to 6.0.22 (#89800) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a727c5e705a1bf..692dda2b0a718e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.21 + 6.0.22 6 0 - 21 + 22 6.0.400 servicing From 15189df81aa546f440a41417a05acbca2999683f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:28:39 -0700 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/emsdk build 20230801.4 (#89805) 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.21 -> To Version 6.0.22 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index c82725c9415005..ab88b252e856d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f48f69f03a077..0410a4ffb7a979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 7312355e44fd230b7aa26c7190f3870391751476 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 9c6b0b8f9608e330ef23badc2347fa3320abb885 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 9c6b0b8f9608e330ef23badc2347fa3320abb885 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 9c6b0b8f9608e330ef23badc2347fa3320abb885 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 692dda2b0a718e..73372e5099f155 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22 + 6.0.22 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From 261ece1903dfc97aad9d3eb943d466d7669e5109 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:30:32 -0700 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/xharness build 20230616.1 (#88771) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.23309.2 -> To Version 6.0.0-prerelease.23316.1 Co-authored-by: dotnet-maestro[bot] --- .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 2496faeb421ec2..40a6e03daafd48 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "6.0.0-prerelease.23309.2", + "version": "6.0.0-prerelease.23316.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0410a4ffb7a979..36d2049d1053f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,13 +214,13 @@ https://github.com/mono/linker c8499798a2a09639174e2f5c694d6652794cc73d - + https://github.com/dotnet/xharness - 233cbdd69acedc940fc3342f66b649ac0fb44333 + 7370c34d6af084a9dce5c755b0d7d1defdc96fec - + https://github.com/dotnet/xharness - 233cbdd69acedc940fc3342f66b649ac0fb44333 + 7370c34d6af084a9dce5c755b0d7d1defdc96fec https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 73372e5099f155..b6697de2c950b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 1.0.1-prerelease-00006 17.4.0-preview-20220707-01 - 6.0.0-prerelease.23309.2 - 6.0.0-prerelease.23309.2 + 6.0.0-prerelease.23316.1 + 6.0.0-prerelease.23316.1 6.0.0-alpha.0.23226.4 2.4.2-pre.9 2.4.2