[illink] consolidate & remove hardcoded assembly names #9662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Our codebase has various notions of "framework assembly", many of which are outdated and wrong! * `@(_SharedRuntimeAssemblies)` in `Xamarin.Android.Build.Tasks.targets` which generates... * `src\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs` * src\Xamarin.Android.Build.Tasks\Utilities\Profile.cs * `src\Microsoft.Android.Sdk.ILLink\Profile.cs` The new and *correct* way to identify a "framework assembly" is to check either: * `%(FrameworkReferenceName)` is `Microsoft.Android` or starts with `Microsoft.NETCore.` * `%(NuGetPackageId)` starts with `Microsoft.NETCore.App.Runtime.` or `Microsoft.Android.Runtime.` I moved the new logic into `MonoAndroidHelper.IsFrameworkAssembly()` and `MonoAndroidHelper.IsFromAKnownRuntimePack()` (useful for `.jar` and other files). I deleted all other instances of `Profile.cs`, which simplifies how trimmer steps are shared between the `<LinkAssembliesNoShrink/>` MSBuild task and the trimmer (illink). In these places, we were likely just checking against a stale list of assemblies *anyway*, so I simply removed all these checks.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
dellis1972
reviewed
Jan 9, 2025
src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/RemoveResourceDesignerStep.cs
Show resolved
Hide resolved
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
dellis1972
approved these changes
Jan 13, 2025
jonpryor
reviewed
Jan 13, 2025
jonpryor
reviewed
Jan 13, 2025
src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Linker.cs
Outdated
Show resolved
Hide resolved
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Our codebase has various notions of "framework assembly", many of which are outdated and wrong!
@(_SharedRuntimeAssemblies)inXamarin.Android.Build.Tasks.targetswhich generates...src\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cssrc\Xamarin.Android.Build.Tasks\Utilities\Profile.cssrc\Microsoft.Android.Sdk.ILLink\Profile.csThe new and correct way to identify a "framework assembly" is to check either:
%(FrameworkReferenceName)isMicrosoft.Androidor starts withMicrosoft.NETCore.%(NuGetPackageId)starts withMicrosoft.NETCore.App.Runtime.orMicrosoft.Android.Runtime.I moved the new logic into
MonoAndroidHelper.IsFrameworkAssembly()andMonoAndroidHelper.IsFromAKnownRuntimePack()(useful for.jarand other files).For trimmer steps, that won't have
ITaskItem, I left an implementation that just checks for:Mono.Android,Mono.Android.Export, andJava.Interop.I deleted all other instances of
Profile.cs, which simplifies how trimmer steps are shared between the<LinkAssembliesNoShrink/>MSBuild task and the trimmer (illink). In these places, we were likely just checking against a stale list of assemblies anyway, so I simply removed all these checks.