From 0f37a6c7cc8da88e1968d2e91e8625ba17dc1814 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 16:22:53 +0000 Subject: [PATCH 1/9] Initial plan From 30222ed5acfbcf2ce3494f41e6d1a2b8a6a8c940 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 16:30:35 +0000 Subject: [PATCH 2/9] Update runtime packages from 9.0.11 to 10.0.0 Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- eng/Version.Details.props | 34 +++++++------- eng/Version.Details.xml | 34 +++++++------- src/MSBuild/app.amd64.config | 48 ++++++++++---------- src/MSBuild/app.config | 22 ++++----- src/Tasks/System.Resources.Extensions.pkgdef | 4 +- 5 files changed, 71 insertions(+), 71 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7e0f7bb8c69..0aa1e7bc00b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 10.0.0-beta.25605.3 10.0.0-beta.25605.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d63feb3370f..ade03ecccc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,103 +3,103 @@ - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 9bf8b014e38..a05eff5ace5 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -70,8 +70,8 @@ - - + + @@ -101,23 +101,23 @@ - - + + - - + + - - + + - - + + @@ -200,18 +200,18 @@ - - + + - - + + - - + + @@ -220,23 +220,23 @@ - - + + - - + + - - + + - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 9c41d0b862c..e15faf9d143 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -33,7 +33,7 @@ - + @@ -62,19 +62,19 @@ - + - + - + - + @@ -86,15 +86,15 @@ - + - + - + @@ -102,15 +102,15 @@ - + - + - + diff --git a/src/Tasks/System.Resources.Extensions.pkgdef b/src/Tasks/System.Resources.Extensions.pkgdef index a90ae6d001b..1bada34a686 100644 --- a/src/Tasks/System.Resources.Extensions.pkgdef +++ b/src/Tasks/System.Resources.Extensions.pkgdef @@ -3,5 +3,5 @@ "codeBase"="$BaseInstallDir$\MSBuild\Current\Bin\System.Resources.Extensions.dll" "publicKeyToken"="cc7b13ffcd2ddd51" "culture"="neutral" -"oldVersion"="0.0.0.0-9.0.0.11" -"newVersion"="9.0.0.11" +"oldVersion"="0.0.0.0-10.0.0.0" +"newVersion"="10.0.0.0" From f7f985407a860ab6acf07a8bf6787e98578f9f83 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:00:29 +0000 Subject: [PATCH 3/9] Fix restore errors by updating dependency versions - Update eng/Versions.props: SystemMemory, SystemRuntimeCompilerServicesUnsafe, SystemThreadingTasksExtensions from 4.6.0/6.1.0/4.6.0 to 4.6.3/6.1.2/4.6.3 - Update src/Directory.Build.targets: Update frozen maintenance package versions to match 10.0.0 package requirements - Update binding redirects in app.config and app.amd64.config for System.Numerics.Vectors to 4.1.6.0 Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- eng/Versions.props | 6 +++--- src/Directory.Build.targets | 10 +++++----- src/MSBuild/app.amd64.config | 4 ++-- src/MSBuild/app.config | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5ab5660455d..8bb976ae0b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ However, we can update, binding-redirect to, and distribute the newest version (that matches the VS-referenced versions) in order to get the benefits of updating. See uses of $(UseFrozenMaintenancePackageVersions) for details. --> - 4.6.0 - 6.1.0 - 4.6.0 + 4.6.3 + 6.1.2 + 4.6.3 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 6818b3b1965..0489a834f4d 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -150,11 +150,11 @@ true 6.0.1 - 4.5.5 - 6.0.0 - 4.5.4 - 4.5.1 - 4.5.0 + 4.6.3 + 6.1.2 + 4.6.3 + 4.6.1 + 4.6.1 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index a05eff5ace5..3d750a52cbf 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -195,8 +195,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index e15faf9d143..5102e9ec916 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -82,7 +82,7 @@ - + From c5845ab91788a645690b541c96027ec1835339b5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:07:26 +0000 Subject: [PATCH 4/9] Fix package path target frameworks from net461/net46 to net462 The 4.6.x versions of System.* packages use net462 target framework folders, not net461/net46. Updated Directory.Build.targets to reference the correct paths. Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- src/Directory.Build.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 0489a834f4d..50857751323 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -176,19 +176,19 @@ - + - + - + - + - + From b9412d2bef22e246deceed612101fee110ca231b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:54:59 +0000 Subject: [PATCH 5/9] Revert frozen maintenance package version updates per review feedback Do not update frozen maintenance package versions as they are frozen for important reasons. Reverted Directory.Build.targets to original state before my changes. Note: Build currently fails with dependency conflicts between 10.0.0 runtime packages and frozen maintenance package versions. Awaiting guidance on resolution approach. Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- src/Directory.Build.targets | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 50857751323..6818b3b1965 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -150,11 +150,11 @@ true 6.0.1 - 4.6.3 - 6.1.2 - 4.6.3 - 4.6.1 - 4.6.1 + 4.5.5 + 6.0.0 + 4.5.4 + 4.5.1 + 4.5.0 @@ -176,19 +176,19 @@ - + - + - + - + - + From 9c866deef6ae9159f26340e37d6680bac0b18b5e Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 12 Dec 2025 14:22:23 -0600 Subject: [PATCH 6/9] Bump a couple of missed binding redirects --- src/MSBuild/app.amd64.config | 20 ++++++++++---------- src/MSBuild/app.config | 14 +++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 3d750a52cbf..7d613032b76 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -75,8 +75,8 @@ - - + + @@ -94,8 +94,8 @@ - - + + @@ -190,8 +190,8 @@ - - + + @@ -215,8 +215,8 @@ - - + + @@ -240,8 +240,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 5102e9ec916..afd4d90bbcc 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -37,7 +37,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -108,13 +108,17 @@ + + + + - + From b87e2d543ce412b1f38fa8c62a702bf015e66047 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 12 Dec 2025 17:15:37 -0600 Subject: [PATCH 7/9] Freeze many more packages --- src/Directory.Build.targets | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 6818b3b1965..a58a4bc167c 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -155,12 +155,39 @@ 4.5.4 4.5.1 4.5.0 + 4.5.0 + 4.7.1 + + + 9.0.11 + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + $(FrozenRuntimeVersionFor9) + + + + + + + + + + + @@ -175,20 +202,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b9e0f497601f2b1b2cc882b4a3725f11ca5181f1 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 12 Dec 2025 17:17:26 -0600 Subject: [PATCH 8/9] deal with ValueTuple update --- Directory.Packages.props | 1 + eng/Versions.props | 1 + src/MSBuild/MSBuild.csproj | 1 + src/MSBuild/app.amd64.config | 3 +-- src/MSBuild/app.config | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2961c3bd5ff..ca8d09d42c3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -45,6 +45,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 8bb976ae0b5..ae4feff9b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,6 +51,7 @@ 4.6.3 6.1.2 4.6.3 + 4.6.1 diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj index e43039e8e6c..e4fbd077a17 100644 --- a/src/MSBuild/MSBuild.csproj +++ b/src/MSBuild/MSBuild.csproj @@ -192,6 +192,7 @@ + diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 7d613032b76..d47240576cc 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -248,8 +248,7 @@ - - + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index afd4d90bbcc..e8c33eb16ad 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -125,7 +125,7 @@ - + From 75540f12489c4f0b587b83925c87834b41c9a0b2 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 12 Dec 2025 17:18:46 -0600 Subject: [PATCH 9/9] modernize valuetuple handling (just don't ship it) --- .../ValidateMSBuildPackageDependencyVersions.cs | 16 ++++++++-------- src/Package/MSBuild.VSSetup/files.swr | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs index f68a6317b66..af57996ef8d 100644 --- a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs +++ b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs @@ -20,11 +20,11 @@ public class ValidateMSBuildPackageDependencyVersions : Task // Microsoft.Build.Conversion.Core and Microsoft.Build.Engine are deprecated, but they're still used in VS for now. This project doesn't directly reference them, so they don't appear in its output directory. // Microsoft.NET.StringTools uses API not available in net35, but since we need it to work for TaskHosts as well, there are simpler versions implemented for that. Ensure it's the right version. // Microsoft.Activities.Build and XamlBuildTask are loaded within an AppDomain in the XamlBuildTask after having been loaded from the GAC elsewhere. See https://github.com/dotnet/msbuild/pull/856 - private string[] assembliesToIgnore = { "Microsoft.Build.Conversion.Core", "Microsoft.NET.StringTools.net35", "Microsoft.Build.Engine", "Microsoft.Activities.Build", "XamlBuildTask" }; + private string[] assembliesToIgnore = { "Microsoft.Build.Conversion.Core", "Microsoft.NET.StringTools.net35", "Microsoft.Build.Engine", "Microsoft.Activities.Build", "System.ValueTuple", "XamlBuildTask" }; public override bool Execute() { - bool foundSystemValueTuple = false; + // bool foundSystemValueTuple = false; var settings = new XmlReaderSettings { @@ -94,7 +94,7 @@ public override bool Execute() if (String.Equals(name, "System.ValueTuple", StringComparison.OrdinalIgnoreCase) && String.Equals(version, "4.0.0.0") && String.Equals(assemblyVersion, "4.0.3.0")) { - foundSystemValueTuple = true; + // foundSystemValueTuple = true; } else { @@ -113,11 +113,11 @@ public override bool Execute() } } } - - if (!foundSystemValueTuple) - { - Log.LogError("Binding redirect for 'System.ValueTuple' missing."); - } + + // if (!foundSystemValueTuple) + // { + // Log.LogError("Binding redirect for 'System.ValueTuple' missing."); + // } return !Log.HasLoggedErrors; } diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index 3b75caa7fb1..5a6c0c59356 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -52,7 +52,6 @@ folder InstallDir:\MSBuild\Current\Bin file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2 file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2 file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2 - file source=$(X86BinPath)System.ValueTuple.dll file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2 file source=$(X86BinPath)System.Resources.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=3 file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=2 @@ -221,7 +220,6 @@ folder InstallDir:\MSBuild\Current\Bin\amd64 file source=$(X86BinPath)Microsoft.IO.Redist.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenArchitecture=all - file source=$(X86BinPath)System.ValueTuple.dll file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Resources.Extensions.dll file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenArchitecture=all