Track AndroidManifestOverlay changes in _ManifestMerger#11007
Merged
jonathanpeppers merged 6 commits intodotnet:mainfrom Mar 24, 2026
Merged
Track AndroidManifestOverlay changes in _ManifestMerger#11007jonathanpeppers merged 6 commits intodotnet:mainfrom
jonathanpeppers merged 6 commits intodotnet:mainfrom
Conversation
Ensure AndroidManifestOverlay items participate in _ManifestMerger incremental checks and add regression coverage for overlay-only manifest updates. Also track the built-in timing overlay by recording _AndroidFastTiming in the build properties cache and including Timing.xml in the target inputs. Fixes dotnet#11006 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Redth
requested review from
grendello,
jonathanpeppers and
simonrozsival
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an incremental-build gap in the Android manifest merge pipeline by ensuring _ManifestMerger’s declared incremental inputs include manifest overlay files (including the built-in timing overlay), and adds a regression test to validate the behavior.
Changes:
- Add
@(AndroidManifestOverlay)(and the built-in timing overlay path) to_ManifestMergerincrementalInputs. - Track
_AndroidFastTimingin the properties cache so toggling timing mode invalidates incremental state appropriately. - Add a test intended to verify
_ManifestMergerreruns when only an overlay file changes.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets | Updates _ManifestMerger incremental inputs to include overlay files + timing overlay path; adds _AndroidFastTiming to property cache. |
| src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs | Adds a regression test for incremental behavior when an AndroidManifestOverlay file changes. |
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
Outdated
Show resolved
Hide resolved
Use a builder configuration that preserves the project between successful builds so OverlayManifestIncrementalBuildTest actually exercises incremental behavior. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Restore the existing single-build manifest overlay test and set cleanupAfterSuccessfulBuild=false on OverlayManifestIncrementalBuildTest, where preserving the project between successful builds is required. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
Outdated
Show resolved
Hide resolved
- Remove hallucinated _ManifestMergerTimingOverlay PropertyGroup - Simplify _ManifestMerger Inputs to just include @(AndroidManifestOverlay) - Use proj.Touch() instead of overlay.Timestamp = null Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Removed the inclusion of the '_AndroidFastTiming' property from the property cache items.
jonathanpeppers
approved these changes
Mar 24, 2026
Member
jonathanpeppers
left a comment
jonathanpeppers
left a comment
There was a problem hiding this comment.
We can ignore the one failed test lane.
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
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.
Summary
@(AndroidManifestOverlay)in_ManifestMergerincremental inputs_ManifestMergerrerunsTesting
dotnet test src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj --filter "OverlayManifestTest|OverlayManifestIncrementalBuildTest" --logger "console;verbosity=minimal"(fails locally before build because this checkout was not prepared and the host SDK cannot evaluate the repo's .NET 11 graph)make prepare(builtxaprepare, but local bootstrap stopped because required host tools were missing:ccache,cmake,ninja,p7zip, and the repo's expectedmakedetection)Fixes #11006