Skip to content

ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdentifier is null. #52407

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
baronfel merged 2 commits into from
Jan 15, 2026
Merged

ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdentifier is null. #52407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15cce55
ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdent…
tmds Jan 12, 2026
a734d24
Add test.
tmds Jan 12, 2026
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
72 changes: 72 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,30 @@ public class ProcessFrameworkReferencesTests
}
""";

private const string NonPortableRid = "fedora.42-x64";

private static readonly string NonPortableRuntimeGraph = $$"""
{
"runtimes": {
"base": {
"#import": []
},
"any": {
"#import": ["base"]
},
"linux": {
"#import": ["any"]
},
"linux-x64": {
"#import": ["linux"]
},
"{{NonPortableRid}}": {
"#import": ["linux-x64"]
}
}
}
""";

// Shared known framework references
private readonly MockTaskItem _validWindowsSDKKnownFrameworkReference = CreateKnownFrameworkReference(
"Microsoft.Windows.SDK.NET.Ref", "net5.0-windows10.0.18362", "10.0.18362.1-preview",
Expand Down Expand Up @@ -493,6 +517,7 @@ public void It_handles_real_world_ridless_scenario_with_aot_and_trimming()
["TargetFramework"] = "net10.0",
["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler",
["ILCompilerPackVersion"] = "10.0.0-rc.2.25457.102",
["ILCompilerPortableRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64",
["ILCompilerRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64"
});

Expand Down Expand Up @@ -967,5 +992,52 @@ public void It_handles_complex_cross_compilation_RuntimeIdentifiers()
$"Should include runtime pack for supported RID: {rid}");
}
}

[Theory]
[InlineData(null, "linux-x64")]
[InlineData("linux-x64", "linux-x64")]
[InlineData(NonPortableRid, NonPortableRid)]
public void It_selects_correct_ILCompiler_based_on_RuntimeIdentifier(string? runtimeIdentifier, string expectedILCompilerRid)
{
var netCoreAppRef = CreateKnownFrameworkReference("Microsoft.NETCore.App", "net10.0", "10.0.1",
"Microsoft.NETCore.App.Runtime.**RID**",
"linux-x64;" + NonPortableRid);

var ilCompilerPack = new MockTaskItem("Microsoft.DotNet.ILCompiler", new Dictionary<string, string>
{
["TargetFramework"] = "net10.0",
["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler",
["ILCompilerPackVersion"] = "10.0.1",
["ILCompilerPortableRuntimeIdentifiers"] = "linux-x64",
["ILCompilerRuntimeIdentifiers"] = "linux-x64;" + NonPortableRid
});

var config = new TaskConfiguration
{
TargetFrameworkVersion = "10.0",
EnableRuntimePackDownload = true,
PublishAot = true,
NETCoreSdkRuntimeIdentifier = NonPortableRid,
NETCoreSdkPortableRuntimeIdentifier = "linux-x64",
RuntimeIdentifier = runtimeIdentifier,
RuntimeGraphPath = CreateRuntimeGraphFile(NonPortableRuntimeGraph),
FrameworkReferences = new[] { new MockTaskItem("Microsoft.NETCore.App", new Dictionary<string, string>()) },
KnownFrameworkReferences = new[] { netCoreAppRef },
KnownILCompilerPacks = new[] { ilCompilerPack }
};

var task = CreateTask(config);
task.Execute().Should().BeTrue("Task should succeed");

// Validate that the expected ILCompiler pack is used
task.PackagesToDownload.Should().NotBeNull();
task.PackagesToDownload.Should().Contain(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler"),
"Should include ILCompiler pack when PublishAot is true");

var ilCompilerPackage = task.PackagesToDownload.FirstOrDefault(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler"));
ilCompilerPackage.Should().NotBeNull();
ilCompilerPackage!.ItemSpec.Should().Contain(expectedILCompilerRid,
$"Should use {expectedILCompilerRid} ILCompiler pack");
}
}
}
1 change: 0 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,6 @@ private ToolPackSupport AddToolPack(
string? supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _);

bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier)
&& supportedTargetRid is not null && supportedPortableTargetRid is not null
&& supportedTargetRid == supportedPortableTargetRid;

// Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture
Expand Down
Loading