From 6ba360389122ec46f8f71ac6dae0094e0d26429b Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Lopez Date: Tue, 26 Sep 2023 21:34:37 +0000 Subject: [PATCH 1/8] [release/7.0] Update MsQuic --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 037e8efe160493..2b4be07b30e4fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,7 +179,7 @@ 7.0.0-rtm.23409.2 - 2.2.2 + 2.2.3-ci.391104 7.0.0-alpha.1.22459.1 11.1.0-alpha.1.23115.1 From d8891c3919f68347ae3fef68b3188bb25a775215 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 3 Oct 2023 18:35:41 -0700 Subject: [PATCH 2/8] Update branding to 7.0.13 (#92970) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9fb25e98c63da2..cd94301f9c2fea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.12 + 7.0.13 7 0 - 12 + 13 7.0.100 6.0.$([MSBuild]::Add($(PatchVersion), 11)) servicing From 3870c07accf4c31d6c473ce24893b97dcde81a6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:02:12 -0600 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/emsdk build 20231004.1 (#92992) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.12 -> To Version 7.0.13 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c77e9437dd4b1..cc344fd0bdf393 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + From 8f3034031d8af3d63e254cae6eb667047461dde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:50:08 -0600 Subject: [PATCH 4/8] Update eng/Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fff63a2388adf4..9cae5445e3d0f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,7 +179,7 @@ 7.0.0-rtm.23409.2 - 2.2.3-ci.391104 + 2.2.3 7.0.0-alpha.1.22459.1 11.1.0-alpha.1.23115.1 From 683c61f6ddfee12b9afe5ebdc33493e29dd35a50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:23:07 -0600 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 (#93389) 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 , 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 7.0.0-beta.23408.3 -> To Version 7.0.0-beta.23511.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 10 +++--- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f88eabbf97c138..61773a892f685a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/runtime-assets @@ -258,9 +258,9 @@ https://github.com/dotnet/xharness b045958a6c648fbcd322161f5785bc5353e4afab - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9cae5445e3d0f4..f860c41afb194e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 2.5.1-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 2.5.1-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 + 7.0.0-beta.23511.9 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 1c1c4df5af0da5..bd356d3409d868 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.110", + "version": "7.0.112", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.110" + "dotnet": "7.0.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23511.9", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6" From b15a318b27ce4df91e25487d19709d730ae85375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:24:58 -0600 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/xharness build 20230905.3 (#93391) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 7.0.0-prerelease.23407.3 -> To Version 7.0.0-prerelease.23455.3 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aea8cb38a58fac..abd16ce0b962df 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "7.0.0-prerelease.23407.3", + "version": "7.0.0-prerelease.23455.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61773a892f685a..7b6de5f88c8931 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,17 +246,17 @@ https://github.com/dotnet/linker 53b3303c57b3fe659500fb362a0eef12991c1197 - + https://github.com/dotnet/xharness - b045958a6c648fbcd322161f5785bc5353e4afab + dc8fda8988583416f2c76a75d19ad35c583c9eb6 - + https://github.com/dotnet/xharness - b045958a6c648fbcd322161f5785bc5353e4afab + dc8fda8988583416f2c76a75d19ad35c583c9eb6 - + https://github.com/dotnet/xharness - b045958a6c648fbcd322161f5785bc5353e4afab + dc8fda8988583416f2c76a75d19ad35c583c9eb6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index f860c41afb194e..537d2fbac11fb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,9 +154,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 7.0.0-prerelease.23407.3 - 7.0.0-prerelease.23407.3 - 7.0.0-prerelease.23407.3 + 7.0.0-prerelease.23455.3 + 7.0.0-prerelease.23455.3 + 7.0.0-prerelease.23455.3 7.0.0-alpha.0.23411.1 2.4.2 1.0.0 From fb39575ad01c64f276fc1312a42189539828ffba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:45:11 -0600 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/emsdk build 20231012.1 (#93408) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.13 -> To Version 7.0.13 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc344fd0bdf393..f9a9c97b16b8b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + +