Skip to content

Change NativeAOT asset input resolution to explicitly replace only assemblies that come from the non-NativeAOT runtime package #111944

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.

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 1 commit into from
Jan 29, 2025

Conversation

jkoritzinsky
Copy link
Member

Rewrite how we swap assemblies out as part of NativeAOT to specifically check that they're coming from the runtime pack instead of checking file version numbers and using that as a heuristic for the same thing.

Validated locally that OOB packages are preferred over the in-box assembly, native assets from Microsoft.NETCore.App.Runtime are excluded, and that the WindowsBase.dll from WindowsDesktop is preferred over WindowsBase.dll from NativeAOT.

…ly check that they're coming from the runtime pack instead of checking file version numbers and using that as a heuristic for the same thing.
@jkoritzinsky jkoritzinsky requested a review from sbomer January 29, 2025 04:09
@jkoritzinsky jkoritzinsky changed the title Change NativeAOT asset input resolution to explicitly replace only assemblies that come from the NativeAOT runtime package Change NativeAOT asset input resolution to explicitly replace only assemblies that come from the non-NativeAOT runtime package Jan 29, 2025
Copy link
Contributor

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

@jkotas
Copy link
Member

jkotas commented Jan 29, 2025

Is this fixing an observable bug or is it a cleanup?

@jkoritzinsky
Copy link
Member Author

This is cleanup. Its not fixing a bug.

Its mainly focused on making the selection rule sound by-design and not trying to duplicate the work done by the many conflict-resolution algorithms in the SDK.

Copy link
Member

@sbomer sbomer left a comment

Choose a reason for hiding this comment

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

LGTM, thank you! Nice simplification.

@jkoritzinsky
Copy link
Member Author

/ba-g timeouts unrelated

@jkoritzinsky jkoritzinsky merged commit 6b47b53 into dotnet:main Jan 29, 2025
89 of 92 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Mar 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants