From 7677a898c75b01111a0fad50ba9bbce3f451c890 Mon Sep 17 00:00:00 2001 From: SimaTian Date: Tue, 27 Jan 2026 15:46:21 +0100 Subject: [PATCH 1/3] remove dead code --- .../ValidateMSBuildPackageDependencyVersions.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs index af57996ef8d..f4881ca47d5 100644 --- a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs +++ b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs @@ -91,12 +91,8 @@ public override bool Execute() // we still ship the version we explicitly reference to let // API consumers bind to it at runtime. // See https://github.com/dotnet/msbuild/issues/6976. - if (String.Equals(name, "System.ValueTuple", StringComparison.OrdinalIgnoreCase) && - String.Equals(version, "4.0.0.0") && String.Equals(assemblyVersion, "4.0.3.0")) - { - // foundSystemValueTuple = true; - } - else + if (!(String.Equals(name, "System.ValueTuple", StringComparison.OrdinalIgnoreCase) && + String.Equals(version, "4.0.0.0") && String.Equals(assemblyVersion, "4.0.3.0"))) { Log.LogError( subcategory: null, @@ -113,12 +109,6 @@ public override bool Execute() } } } - - // if (!foundSystemValueTuple) - // { - // Log.LogError("Binding redirect for 'System.ValueTuple' missing."); - // } - return !Log.HasLoggedErrors; } } From 81d2951fb85d45baa648b5dd46bc691e68497002 Mon Sep 17 00:00:00 2001 From: SimaTian Date: Tue, 27 Jan 2026 16:01:20 +0100 Subject: [PATCH 2/3] remove the if alltogether --- ...alidateMSBuildPackageDependencyVersions.cs | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs index f4881ca47d5..2ed0e38e1b9 100644 --- a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs +++ b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs @@ -91,20 +91,17 @@ public override bool Execute() // we still ship the version we explicitly reference to let // API consumers bind to it at runtime. // See https://github.com/dotnet/msbuild/issues/6976. - if (!(String.Equals(name, "System.ValueTuple", StringComparison.OrdinalIgnoreCase) && - String.Equals(version, "4.0.0.0") && String.Equals(assemblyVersion, "4.0.3.0"))) - { - Log.LogError( - subcategory: null, - errorCode: null, - helpKeyword: null, - file: appConfigPath, - lineNumber: bindingRedirectLineNumber, - columnNumber: 0, - endLineNumber: 0, - endColumnNumber: 0, - message: $"Binding redirect for '{name}' redirects to a different version ({version}) than MSBuild ships ({assemblyVersion})."); - } + Log.LogError( + subcategory: null, + errorCode: null, + helpKeyword: null, + file: appConfigPath, + lineNumber: bindingRedirectLineNumber, + columnNumber: 0, + endLineNumber: 0, + endColumnNumber: 0, + message: $"Binding redirect for '{name}' redirects to a different version ({version}) than MSBuild ships ({assemblyVersion})."); + } } } From 8512a7979a83c5ea49221bb9766d847aaaca63af Mon Sep 17 00:00:00 2001 From: Tomas Bartonek Date: Tue, 27 Jan 2026 16:15:44 +0100 Subject: [PATCH 3/3] Update ValidateMSBuildPackageDependencyVersions.cs --- src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs index 2ed0e38e1b9..770dcb4fae8 100644 --- a/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs +++ b/src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs @@ -87,10 +87,6 @@ public override bool Execute() string assemblyVersion = AssemblyName.GetAssemblyName(path).Version.ToString(); if (!version.Equals(assemblyVersion)) { - // Ensure that the binding redirect is to the GAC version, but - // we still ship the version we explicitly reference to let - // API consumers bind to it at runtime. - // See https://github.com/dotnet/msbuild/issues/6976. Log.LogError( subcategory: null, errorCode: null,