Skip to content

Migrate GenerateProguardConfiguration from ILLink step to MSBuild task - #10694

Merged
jonathanpeppers merged 8 commits into
mainfrom
dev/sbomer/proguard-step
Feb 13, 2026
Merged

Migrate GenerateProguardConfiguration from ILLink step to MSBuild task#10694
jonathanpeppers merged 8 commits into
mainfrom
dev/sbomer/proguard-step

Conversation

@sbomer

@sbomersbomer commented Jan 14, 2026

Copy link
Copy Markdown
Member

The new task runs AfterTargets="ILLink" and uses System.Reflection.Metadata instead of Mono.Cecil to scan linked assemblies.

@sbomer
Migrate GenerateProguardConfiguration from ILLink step to MSBuild task
d42b163
The new task runs AfterTargets="ILLink" and uses System.Reflection.Metadata
instead of Mono.Cecil to scan linked assemblies.
@sbomer
Make _GenerateProguardConfiguration target incremental
5dded3d
@sbomersbomer mentioned this pull request Jan 14, 2026
Closed
grendello
grendello reviewed Jan 15, 2026
View reviewed changes
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
@jonathanpeppers

jonathanpeppers commented Jan 16, 2026

Copy link
Copy Markdown
Member

Looking at the test failures, I think this might have broken Proguard rules on NativeAOT:

image

I'll rerun to verify.

CopilotAI review requested due to automatic review settings February 3, 2026 23:25
CopilotAI reviewed Feb 3, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR migrates the GenerateProguardConfiguration functionality from an ILLink custom step (using Mono.Cecil) to an MSBuild task (using System.Reflection.Metadata). The task runs after the ILLink target and scans linked assemblies to generate ProGuard configuration rules for Android callable wrapper (ACW) types.

Changes:

  • Added new MSBuild task GenerateProguardConfiguration using System.Reflection.Metadata for assembly inspection
  • Updated MSBuild targets to invoke the new task after ILLink instead of as a linker custom step
  • Removed the old ILLink step implementation that used Mono.Cecil

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

FileDescription
src/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.csNew MSBuild task that scans linked assemblies for RegisterAttribute and generates ProGuard keep rules
src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targetsAdded targets to prepare linked assemblies and invoke the new task; removed old linker custom step configuration
src/Microsoft.Android.Sdk.ILLink/GenerateProguardConfiguration.csDeleted old ILLink step implementation

Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs Outdated
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs Outdated
@sbomersbomer closed this Feb 8, 2026
@sbomersbomer reopened this Feb 8, 2026
@sbomer

sbomer commented Feb 8, 2026

Copy link
Copy Markdown
MemberAuthor

/azp run

@azure-pipelines

azure-pipelinesBot commented Feb 8, 2026

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

sbomerand others added 4 commits February 11, 2026 17:22
@sbomer
Fix proguard generation for NativeAOT by using ResolvedFileToPublish
553ec86
In NativeAOT builds, ResolvedFileToPublish is not populated until
_AndroidComputeIlcCompileInputs runs (after ILLink), so the proguard
generation targets were reading an empty assembly list and missing the
entry-point assembly. This caused R8 to strip Java classes needed at
runtime, resulting in ClassNotFoundException.
Use a property-based AfterTargets approach: _GenerateProguardAfterTargets
defaults to ILLink for the standard path, and NativeAOT.targets overrides
it to _AndroidComputeIlcCompileInputs. Also switch from ManagedAssemblyToLink
(which never includes the entry-point assembly) to ResolvedFileToPublish
filtered to .dll, which correctly includes all assemblies in both paths.
@sbomer
Merge remote-tracking branch 'origin/main' into proguard-step
a918512
# Conflicts:
#	src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
@sbomer
Update src/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfigur…
bf4a7cd
…ation.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@sbomer
Update src/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfigur…
de433d0
…ation.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@sbomer

sbomer commented Feb 13, 2026

Copy link
Copy Markdown
MemberAuthor

@jonathanpeppers I think this is ready to go, PTAL!

CopilotAI reviewed Feb 13, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
Comment threadsrc/Xamarin.Android.Build.Tasks/Tasks/GenerateProguardConfiguration.cs
@jonathanpeppers
jonathanpeppers merged commit 4eecaa7 into mainFeb 13, 2026
12 checks passed
@jonathanpeppers
jonathanpeppers deleted the dev/sbomer/proguard-step branch February 13, 2026 22:45
@jonathanpeppersjonathanpeppers added the copilot `copilot-cli` or other AIs were used to author this label Feb 13, 2026
@sbomersbomer mentioned this pull request Feb 19, 2026
Open
9 tasks
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Mar 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jonathanpeppersjonathanpeppersjonathanpeppers approved these changes
@simonrozsivalsimonrozsivalAwaiting requested review from simonrozsivalsimonrozsival is a code owner
+1 more reviewer
@grendellogrendellogrendello left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

copilot`copilot-cli` or other AIs were used to author this

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sbomer@jonathanpeppers@grendello