Skip to content
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

Jump to bottom

[release/9.0-staging] ILC: Allow OOB reference to upgrade framework assembly #110058

Open
wants to merge 2 commits into
base: release/9.0-staging
Choose a base branch
from
+28 −4
Open

[release/9.0-staging] ILC: Allow OOB reference to upgrade framework assembly #110058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e8852
ILC: Allow OOB reference to upgrade framework assembly
sbomer Nov 19, 2024
2d507cc
Log error for SPC
sbomer Nov 20, 2024
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
32 changes: 28 additions & 4 deletions src/coreclr/tools/aot/ILCompiler.Build.Tasks/ComputeManagedAssembliesToCompileToNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Microsoft.Build.Utilities;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
Expand Down Expand Up @@ -99,16 +100,20 @@ public override bool Execute()
var list = new List<ITaskItem>();
var assembliesToSkipPublish = new List<ITaskItem>();
var satelliteAssemblies = new List<ITaskItem>();
var nativeAotFrameworkAssembliesToUse = new HashSet<string>();
var nativeAotFrameworkAssembliesToUse = new Dictionary<string, ITaskItem>();

foreach (ITaskItem taskItem in SdkAssemblies)
{
nativeAotFrameworkAssembliesToUse.Add(Path.GetFileName(taskItem.ItemSpec));
var fileName = Path.GetFileName(taskItem.ItemSpec);
if (!nativeAotFrameworkAssembliesToUse.ContainsKey(fileName))
nativeAotFrameworkAssembliesToUse.Add(fileName, taskItem);
}

foreach (ITaskItem taskItem in FrameworkAssemblies)
{
nativeAotFrameworkAssembliesToUse.Add(Path.GetFileName(taskItem.ItemSpec));
var fileName = Path.GetFileName(taskItem.ItemSpec);
if (!nativeAotFrameworkAssembliesToUse.ContainsKey(fileName))
nativeAotFrameworkAssembliesToUse.Add(fileName, taskItem);
}

foreach (ITaskItem taskItem in Assemblies)
Expand Down Expand Up @@ -153,8 +158,21 @@ public override bool Execute()

// Remove any assemblies whose implementation we want to come from NativeAOT's package.
// Currently that's System.Private.* SDK assemblies and a bunch of framework assemblies.
if (nativeAotFrameworkAssembliesToUse.Contains(assemblyFileName))
if (nativeAotFrameworkAssembliesToUse.TryGetValue(assemblyFileName, out ITaskItem frameworkItem))
{
if (GetFileVersion(itemSpec).CompareTo(GetFileVersion(frameworkItem.ItemSpec)) > 0)
{
if (assemblyFileName == "System.Private.CoreLib.dll")
{
Log.LogError($"Overriding System.Private.CoreLib.dll with a newer version is not supported. Attempted to use {itemSpec} instead of {frameworkItem.ItemSpec}.");
}
else
{
// Allow OOB references with higher version to take precedence over the framework assemblies.
list.Add(taskItem);
}
}

assembliesToSkipPublish.Add(taskItem);
continue;
}
Expand Down Expand Up @@ -196,6 +214,12 @@ public override bool Execute()
SatelliteAssemblies = satelliteAssemblies.ToArray();

return true;

static Version GetFileVersion(string path)
{
var versionInfo = FileVersionInfo.GetVersionInfo(path);
return new Version(versionInfo.FileMajorPart, versionInfo.FileMinorPart, versionInfo.FileBuildPart, versionInfo.FilePrivatePart);
}
}
}
}
Loading