Skip to content

Select the NativeAOT runtime pack as the target package when it's provided as part of the KnownILCompilerPack metadata #46611

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Select the NativeAOT runtime pack as the target package when it's provided as part of the KnownILCompilerPack metadata #46611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fa393b
Select the NativeAOT runtime pack as the target package when it's pro…
jkoritzinsky Jan 31, 2025
19ea939
Merge branch 'main' of https://github.com/dotnet/sdk into nativeaot-s…
jkoritzinsky Mar 14, 2025
ec7b0a0
Use Sven's comment wording
jkoritzinsky Mar 14, 2025
ce791be
Check for an empty string, not just null.
jkoritzinsky Mar 18, 2025
31b6a69
Merge branch 'main' of github.com:dotnet/sdk into nativeaot-select-ru…
jkoritzinsky Mar 21, 2025
2cc9b5a
Download the Target ILC pack if it's not available on disk (the most …
jkoritzinsky Mar 25, 2025
59f9585
Merge branch 'main' into nativeaot-select-runtime-pack
jkoritzinsky Apr 8, 2025
787aed3
Merge branch 'main' into nativeaot-select-runtime-pack
jkoritzinsky Apr 19, 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
1 change: 1 addition & 0 deletions src/Layout/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net10.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerRuntimePackNamePattern="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
/>
Expand Down
27 changes: 25 additions & 2 deletions 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 @@ -845,13 +845,36 @@ private ToolPackSupport AddToolPack(
{
return ToolPackSupport.UnsupportedForTargetRuntimeIdentifier;
}
if (!hostRuntimeIdentifier.Equals(targetRuntimeIdentifier))

// If there's an available runtime pack, use it instead of the ILCompiler package for target-specific bits.
bool useRuntimePackForAllTargets = false;
string targetPackNamePattern = packNamePattern;
if (knownPack.GetMetadata("ILCompilerRuntimePackNamePattern") is string runtimePackNamePattern && runtimePackNamePattern != string.Empty)
{
var targetIlcPackName = packNamePattern.Replace("**RID**", targetRuntimeIdentifier);
targetPackNamePattern = runtimePackNamePattern;
useRuntimePackForAllTargets = true;
}

if (useRuntimePackForAllTargets || !hostRuntimeIdentifier.Equals(targetRuntimeIdentifier))
{
var targetIlcPackName = targetPackNamePattern.Replace("**RID**", targetRuntimeIdentifier);
var targetIlcPack = new TaskItem(targetIlcPackName);
targetIlcPack.SetMetadata(MetadataKeys.NuGetPackageId, targetIlcPackName);
targetIlcPack.SetMetadata(MetadataKeys.NuGetPackageVersion, packVersion);
TargetILCompilerPacks = new[] { targetIlcPack };

string targetILCompilerPackPath = GetPackPath(targetIlcPackName, packVersion);
if (targetILCompilerPackPath != null)
{
targetIlcPack.SetMetadata(MetadataKeys.PackageDirectory, targetILCompilerPackPath);
}
else if (EnableRuntimePackDownload)
{
// We need to download the runtime pack
var targetIlcPackToDownload = new TaskItem(targetIlcPackName);
targetIlcPackToDownload.SetMetadata(MetadataKeys.Version, packVersion);
packagesToDownload.Add(targetIlcPackToDownload);
}
}
}

Expand Down
Loading