From f7ad5837cfb762db7d7bbd958b5c8e2a624fe29b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Apr 2025 13:08:44 +0200 Subject: [PATCH 01/16] Update to latest maintenance-packages While 0457980198466131a217ef58b4a91b47bb4b9574 just got merged, some of the previously released packages had issues that got fixed with the latest release. Also add entries for System.Buffers and System.Numerics.Vectors so that transitive pinning moves them to latest. --- eng/Packages.props | 2 ++ eng/Versions.props | 12 +++++++----- src/MSBuild/app.amd64.config | 28 ++++++++++++++-------------- src/MSBuild/app.config | 10 +++++----- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props index 456f037819e..79caea1d041 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -17,6 +17,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 4ee8c37b3e0..4086678da6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,17 +27,19 @@ + 6.1.2 + 0.2.104-beta + 4.6.1 - 4.6.0 - 4.6.0 - 6.1.0 - 0.2.104-beta - 6.1.0 + 4.6.2 + 4.6.1 + 6.1.1 5.0.0 + 4.6.2 diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index dea6d8dbc9c..1a42083c6ed 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -39,8 +39,8 @@ - - + + @@ -94,8 +94,8 @@ - - + + @@ -190,13 +190,13 @@ - - + + - - + + @@ -215,8 +215,8 @@ - - + + @@ -240,16 +240,16 @@ - - + + - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index cd0059bd3db..84cfbfb874e 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -45,7 +45,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -114,14 +114,14 @@ - + - + From 6fc59d1ce9dfc782e5045f9fbaa537c0c7c9c450 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Apr 2025 15:08:12 +0200 Subject: [PATCH 02/16] Update binding redirects --- src/MSBuild/app.amd64.config | 16 ++++++++-------- src/MSBuild/app.config | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 1a42083c6ed..2e4497b99bf 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -39,8 +39,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 84cfbfb874e..1a87633c9a9 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -45,7 +45,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -114,7 +114,7 @@ - + From f56ea08364f1487d6f3f980eb27a70894c08f8bd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Apr 2025 15:12:04 +0200 Subject: [PATCH 03/16] Update bindingRedirect comments in config files --- src/MSBuild/app.amd64.config | 2 +- src/MSBuild/app.config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 2e4497b99bf..7146c4ce75a 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -245,7 +245,7 @@ - diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 1a87633c9a9..03354cb104b 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -1,4 +1,4 @@ - +
@@ -118,7 +118,7 @@ - From 523d1a6e6e58dad7da3a899fc2aefee3866d7de6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Apr 2025 20:12:29 +0200 Subject: [PATCH 04/16] Keep conditionals --- eng/Versions.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 848d8ab2d4c..465831633bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,6 +25,16 @@ true + + + 6.1.3 + 4.6.1 + 4.6.3 + 6.1.2 + 4.6.3 + 6.1.3 From 7d717c8756fa70b83706db58324b225605459675 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Apr 2025 20:14:00 +0200 Subject: [PATCH 05/16] Add condition to PropertyGroup in Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 465831633bb..3694c0722cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 6.1.2 4.6.3 - + 6.1.3 4.6.1 From 6187f914756affbe9544e028af60b33a61a98507 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Apr 2025 20:46:13 +0200 Subject: [PATCH 06/16] fiiiix --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 3694c0722cb..2fb369b6499 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,6 +32,7 @@ 6.1.3 4.6.1 4.6.3 + 4.6.1 6.1.2 4.6.3 From 039ec9a96f5d88abc5fe9d46d3367eb1b7bd1f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Provazn=C3=ADk?= Date: Mon, 18 Aug 2025 10:23:29 +0200 Subject: [PATCH 07/16] fix merge --- eng/Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Packages.props b/eng/Packages.props index 0e9ddaa7684..7c3e5389552 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -18,6 +18,7 @@ + From 17a2723fecdd5061fb403e2a073b9e0b2b77007b Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Mon, 2 Feb 2026 15:53:07 +0100 Subject: [PATCH 08/16] add missed import --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index edf4c993db1..2a6320983d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,6 +53,7 @@ See uses of $(UseFrozenMaintenancePackageVersions) for details. --> 4.6.3 + 4.6.1 6.1.2 4.6.3 4.6.1 From c2ab908495fad125c30c1d0a54db85b58090e372 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 3 Feb 2026 16:12:03 +0100 Subject: [PATCH 09/16] cleanup --- Directory.Packages.props | 2 -- eng/Versions.props | 4 ---- src/Directory.Build.targets | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f262f911e5b..2de8bea8769 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -24,7 +24,6 @@ - @@ -33,7 +32,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index 2a6320983d5..66d720a00a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,16 +36,13 @@ already consuming the newest version of these same dependencies. --> 6.1.3 - 4.6.1 4.6.3 - 4.6.1 6.1.2 4.6.3 6.1.3 - 4.6.1 4.6.3 - 4.6.1 6.1.2 4.6.3 4.6.1 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a58a4bc167c..75e6fd71672 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -153,8 +153,8 @@ 4.5.5 6.0.0 4.5.4 - 4.5.1 - 4.5.0 + 4.6.1 + 4.6.1 4.5.0 4.7.1 From 5fa0afad2ec5dbe84e726b98d7cefa2d9bf107d0 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 3 Feb 2026 16:16:38 +0100 Subject: [PATCH 10/16] update binding redirects --- src/MSBuild/app.amd64.config | 8 ++++---- src/MSBuild/app.config | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index e25329bd0e4..f9516074c6c 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -96,8 +96,8 @@ - - + + @@ -117,8 +117,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index a76790e062c..22fc5993cd5 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -53,7 +53,7 @@ - + @@ -74,7 +74,7 @@ - + From 95b3ed9fb9717c2db5c31c856515fe84feab5f63 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Tue, 3 Feb 2026 17:11:34 +0100 Subject: [PATCH 11/16] update binding redirects --- src/MSBuild/app.amd64.config | 8 ++++---- src/MSBuild/app.config | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index f9516074c6c..19019b78786 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -96,8 +96,8 @@ - - + + @@ -117,8 +117,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 22fc5993cd5..dff5e31bb4c 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -53,7 +53,7 @@ - + @@ -74,7 +74,7 @@ - + From fc106706ecb24ecc5eac617b04d31a6e9c7b3c58 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:30:09 +0100 Subject: [PATCH 12/16] Update bindingRedirect and codeBase for System.Buffers --- src/MSBuild/app.amd64.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 19019b78786..a91ff2a02af 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -96,8 +96,8 @@ - - + + From eab4f1e0e3343808b4dc8a73f504c8dec238be5e Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:30:42 +0100 Subject: [PATCH 13/16] Update bindingRedirect for System.Buffers version --- src/MSBuild/app.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index dff5e31bb4c..8acd5df9fc2 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -53,7 +53,7 @@ - + From 88141dcc876288510e1fa20e99781192ba9102f3 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:04:57 +0100 Subject: [PATCH 14/16] Update app.config --- src/MSBuild/app.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 8acd5df9fc2..a76790e062c 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -74,7 +74,7 @@ - + From c129e33ff21be3511c283a0c44678b076858bbcd Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:05:46 +0100 Subject: [PATCH 15/16] Update bindingRedirect and codeBase for System.Numerics.Vectors --- src/MSBuild/app.amd64.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index a91ff2a02af..e25329bd0e4 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -117,8 +117,8 @@ - - + + From e39f4f64c9243bb0fe0bc63f76111862b544ae33 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Thu, 5 Feb 2026 19:20:01 +0100 Subject: [PATCH 16/16] Update Directory.Build.targets --- src/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 75e6fd71672..a58a4bc167c 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -153,8 +153,8 @@ 4.5.5 6.0.0 4.5.4 - 4.6.1 - 4.6.1 + 4.5.1 + 4.5.0 4.5.0 4.7.1