-
Notifications
You must be signed in to change notification settings - Fork 566
Move FixLegacyResourceDesignerStep to post-trim pipeline #11059
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
Open
sbomer
wants to merge
1
commit into
main
Choose a base branch
from
dev/sbomer/fix-resource-designer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| using Microsoft.Android.Build.Tasks; | ||
| using Microsoft.Build.Framework; | ||
| using Mono.Cecil; | ||
| using Mono.Linker; | ||
| using MonoDroid.Tuner; | ||
|
|
||
| namespace Xamarin.Android.Tasks; | ||
|
|
@@ -34,6 +35,8 @@ public class PostTrimmingPipeline : AndroidTask | |
|
|
||
| public bool Deterministic { get; set; } | ||
|
|
||
| public bool UseDesignerAssembly { get; set; } | ||
|
|
||
| public override bool RunTask () | ||
| { | ||
| using var resolver = new DirectoryAssemblyResolver ( | ||
|
|
@@ -70,6 +73,15 @@ public override bool RunTask () | |
| }, | ||
| (msg) => Log.LogDebugMessage (msg))); | ||
| } | ||
| if (UseDesignerAssembly) { | ||
| // Create an MSBuildLinkContext so FixLegacyResourceDesignerStep can resolve assemblies | ||
| // and log messages. The resolver is owned by the outer 'using' block, so we intentionally | ||
| // do not dispose this context (LinkContext.Dispose would double-dispose the resolver). | ||
| var linkContext = new MSBuildLinkContext (resolver, Log); | ||
| var fixLegacyStep = new FixLegacyResourceDesignerStep (); | ||
| fixLegacyStep.Initialize (linkContext); | ||
| steps.Add (new PostTrimmingFixLegacyResourceDesignerStep (fixLegacyStep)); | ||
| } | ||
|
Comment on lines
+76
to
+84
|
||
| if (AndroidLinkResources) { | ||
| var allAssemblies = new List<AssemblyDefinition> (Assemblies.Length); | ||
| foreach (var item in Assemblies) { | ||
|
|
@@ -96,3 +108,24 @@ public override bool RunTask () | |
| return !Log.HasLoggedErrors; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Thin wrapper around <see cref="FixLegacyResourceDesignerStep"/> for the post-trimming pipeline. | ||
| /// Calls <see cref="FixLegacyResourceDesignerStep.ProcessAssemblyDesigner"/> directly, matching the | ||
| /// behavior of the former ILLink path which processed all assemblies without StepContext flag filtering. | ||
| /// Assemblies without a resource designer are skipped internally by ProcessAssemblyDesigner. | ||
| /// </summary> | ||
| class PostTrimmingFixLegacyResourceDesignerStep : IAssemblyModifierPipelineStep | ||
| { | ||
| readonly FixLegacyResourceDesignerStep _inner; | ||
|
|
||
| public PostTrimmingFixLegacyResourceDesignerStep (FixLegacyResourceDesignerStep inner) | ||
| { | ||
| _inner = inner; | ||
| } | ||
|
|
||
| public void ProcessAssembly (AssemblyDefinition assembly, StepContext context) | ||
| { | ||
| context.IsAssemblyModified |= _inner.ProcessAssemblyDesigner (assembly); | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
using Mono.Linker;appears to be unused in this file (the only Mono.Linker types used are referenced indirectly viaMSBuildLinkContext, which is inXamarin.Android.Tasks). With analyzers enabled, this can surface as IDE0005; consider removing the unused using to keep the file warning-clean.