Skip to content

Don't fall back to .NET Standard package pruning for .NET Framework #51288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2025
Merged

Don't fall back to .NET Standard package pruning for .NET Framework #51288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8589b6
Don't fall back to .NET Standard package pruning for .NET Framework
dsplaisted Oct 16, 2025
630c84b
Update tests
dsplaisted Oct 16, 2025
a59f24e
Fix tests
dsplaisted Oct 16, 2025
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
6 changes: 0 additions & 6 deletions src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,6 @@ static Dictionary<string, NuGetVersion> LoadPackagesToPruneFromFrameworkPackages
{
var nugetFramework = new NuGetFramework(targetFrameworkIdentifier, Version.Parse(targetFrameworkVersion));

// FrameworkPackages just has data for .NET Framework 4.6.1, so turn on fallback for anything greater than that so it will resolve to the .NET Framework 4.6.1 data
if (!acceptNearestMatch && nugetFramework.IsDesktop() && nugetFramework.Version > new Version(4,6,1))
{
acceptNearestMatch = true;
}

var frameworkPackages = FrameworkPackages.GetFrameworkPackages(nugetFramework, [frameworkReference], acceptNearestMatch)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we ever want nearest match behavior at all. Is there a scenario where we actually need it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were also using the nearest match as part of a workaround for dotnet/windowsdesktop#4904. That may not be needed any more but I think we should keep this change as small as possible.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can delete in V.Next in conjunction with measuring that deleting it has zero change on all known TFMs. Just brute force and diff.

.SelectMany(packages => packages)
.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
Expand Down
39 changes: 39 additions & 0 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,45 @@ public void WithMultitargetedProjects_PruningsDefaultsAreApplies(string framewor
}
}

[Fact]
public void WithMultitargetedProject_NETFrameworkIsNotPruned()
{
var project = new TestProject("MultitargetedPruning")
{
TargetFrameworks = ToolsetInfo.CurrentTargetFramework + ";net462",
};
project.PackageReferences.Add(new TestPackageReference("System.ValueTuple", "4.6.1"));
project.SourceFiles.Add("Test.cs", @"
public class Class1
{
public (int, int) GetTuple() => (1, 2);
}
");
var testAsset = _testAssetsManager.CreateTestProject(project, identifier: "NETFrameworkIsNotPruned");
var buildCommand = new BuildCommand(testAsset);
buildCommand.Execute().Should().Pass();
var assetsFilePath = Path.Combine(buildCommand.GetBaseIntermediateDirectory().FullName, "project.assets.json");
var lockFile = LockFileUtilities.GetLockFile(assetsFilePath, new NullLogger());

foreach (var lockFileTarget in lockFile.Targets)
{
var valueTupleLibrary = lockFileTarget.Libraries.Where(library => library.Name.Equals("System.ValueTuple", StringComparison.OrdinalIgnoreCase)).Single();
var runtimeAssemblies = valueTupleLibrary.RuntimeAssemblies.Where(a => !Path.GetFileName(a.Path).Equals("_._"));
var compileTimeAssemblies = valueTupleLibrary.CompileTimeAssemblies.Where(a => !Path.GetFileName(a.Path).Equals("_._"));

if (lockFileTarget.TargetFramework.Framework.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase))
{
runtimeAssemblies.Should().NotBeEmpty();
compileTimeAssemblies.Should().NotBeEmpty();
}
else
{
runtimeAssemblies.Should().BeEmpty();
compileTimeAssemblies.Should().BeEmpty();
}
}
}

static List<KeyValuePair<string, string>> ParsePrunePackageReferenceJson(string json)
{
List<KeyValuePair<string, string>> ret = new();
Expand Down
Loading