From f2b3063bfd8cf8c1076d43c39725d4ab39225200 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:11:20 -0600 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/xharness build 20230801.2 (#90245) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.23316.1 -> To Version 6.0.0-prerelease.23401.2 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 40a6e03daafd48..b059ebd61620f4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "6.0.0-prerelease.23316.1", + "version": "6.0.0-prerelease.23401.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36d2049d1053f0..95ca749b99f55b 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 - 7370c34d6af084a9dce5c755b0d7d1defdc96fec + 5aa438c8aa5ca20646b5d91149fd9be8646dbe65 - + https://github.com/dotnet/xharness - 7370c34d6af084a9dce5c755b0d7d1defdc96fec + 5aa438c8aa5ca20646b5d91149fd9be8646dbe65 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b6697de2c950b4..b27598477df098 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.23316.1 - 6.0.0-prerelease.23316.1 + 6.0.0-prerelease.23401.2 + 6.0.0-prerelease.23401.2 6.0.0-alpha.0.23226.4 2.4.2-pre.9 2.4.2 From e1ed4b0953a7e9b87d869de899a5729bb3a441d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 22:36:28 -0700 Subject: [PATCH 2/2] [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#90241) * Update dependencies from https://github.com/dotnet/arcade build 20230808.5 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.23361.3 -> To Version 6.0.0-beta.23408.5 * Update dependencies from https://github.com/dotnet/emsdk build 20230809.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.22 -> To Version 6.0.22 --------- 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 ab88b252e856d9..f181885081d037 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95ca749b99f55b..6123f232c0a978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,15 +10,15 @@ https://github.com/dotnet/emsdk - 9c6b0b8f9608e330ef23badc2347fa3320abb885 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/emsdk - 9c6b0b8f9608e330ef23badc2347fa3320abb885 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/emsdk - 9c6b0b8f9608e330ef23badc2347fa3320abb885 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/wcf @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness 5aa438c8aa5ca20646b5d91149fd9be8646dbe65 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b27598477df098..293c900dc99925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 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-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 2.5.1-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 6.0.0-preview.1.102 diff --git a/global.json b/global.json index e3e2a3849d98b8..45cd221a8188e9 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.120", + "version": "6.0.121", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.120" + "dotnet": "6.0.121" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "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.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23408.5", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"