Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 11 additions & 28 deletions src/MSBuild/ValidateMSBuildPackageDependencyVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,38 +87,21 @@ 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.
Comment thread
SimaTian marked this conversation as resolved.
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
{
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}).");

}
}
}
}

// if (!foundSystemValueTuple)
// {
// Log.LogError("Binding redirect for 'System.ValueTuple' missing.");
// }

return !Log.HasLoggedErrors;
}
}
Expand Down