[TrimmableTypeMap] Add ManifestGenerator by simonrozsival · Pull Request #10991 · dotnet/android

simonrozsival · 2026-03-21T22:14:10Z

Summary

Cecil-free Android manifest generation from component attributes captured by the SRM-based JavaPeerScanner. Closes #10807.

All code lives in the Microsoft.Android.Sdk.TrimmableTypeMap assembly (netstandard2.0) — no MSBuild dependency.

Depends on #10967. Used by #10980.

Features

Component attributes

[Activity], [Service], [BroadcastReceiver], [ContentProvider] with all named properties
MainLauncher → <intent-filter> with MAIN/LAUNCHER + android:exported="true"
[IntentFilter] → <intent-filter> with actions, categories, data elements
[MetaData] → <meta-data> with name/value/resource
[Application] → updates <application> element attributes
[Instrumentation] → <instrumentation> under <manifest>

Assembly-level attributes

[Permission], [PermissionGroup], [PermissionTree] → <permission> etc. with dedup
[UsesPermission] → <uses-permission> with maxSdkVersion
[UsesFeature] → <uses-feature> (named + GL ES version variants)
[UsesLibrary], [UsesConfiguration] → inside <application>
[assembly: Application] → merged into <application> attributes
[assembly: MetaData], [assembly: Property] → inside <application>

Build properties

ManifestPlaceholders — ${key} → value replacement
CheckedBuild → android:debuggable + android:extractNativeLibs
ApplicationJavaClass → <application android:name="...">
VersionCode defaults to "1", VersionName defaults to "1.0" (matching legacy)

Validation

XA4213: component types must have a public parameterless constructor
Duplicate Application type detection (assembly-level vs type-level)

Runtime provider

MonoRuntimeProvider / NativeAotRuntimeProvider injection
Multi-process support (per-process providers)
Dedup check against template (won't duplicate existing providers)

Tests

30 test cases (xunit, [Fact]/[Theory]), ~130ms
Covers all component types, assembly-level attrs, template merging, dedup, placeholders, validation, enum conversion

ManifestGenerator in Microsoft.Android.Sdk.TrimmableTypeMap assembly. Converts ComponentInfo records from JavaPeerScanner into AndroidManifest.xml. - Data-driven property mapping (7 static arrays, 9 enum converters) - MainLauncher intent-filter, runtime provider, template merging, deduplication - Assembly-level: Permission, UsesPermission, UsesFeature, UsesLibrary, UsesConfiguration, Application, MetaData, Property - ManifestPlaceholders, debuggable/extractNativeLibs, ApplicationJavaClass - XA4213 constructor validation, duplicate Application detection - VersionCode defaults to '1' matching legacy 23 unit tests (xunit). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Adds a Cecil-free ManifestGenerator to the TrimmableTypeMap generator pipeline, producing AndroidManifest.xml from scanner-captured component/assembly attributes, plus a new unit test suite validating expected manifest output.

Changes:

Introduces ManifestGenerator to synthesize/merge manifest elements (components, permissions/features/libraries, runtime provider injection, placeholder replacement).
Adds xUnit tests covering activity/service/receiver/provider/application/instrumentation emission, template merging, placeholder replacement, and enum conversions.

Reviewed changes

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

File	Description
src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs	New manifest generation/merge implementation driven by scanned attribute metadata (no Cecil).
tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs	New unit tests validating generated manifest structure, merging, and attribute mapping behaviors.

Copilot · 2026-03-21T22:17:50Z

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs

+				int intValue = value switch { int i => i, long l => (int)l, short s => s, byte b => b, _ => 0 };
+				if (intValue != 0) {
+					var strValue = m.EnumConverter (intValue);
+					if (strValue is not null) {
+						element.SetAttributeValue (AndroidNs + m.XmlAttributeName, strValue);
+					}
+				}


Enum-valued properties with a valid underlying value of 0 will never be emitted. ApplyMappings treats intValue == 0 as "unset" and skips conversion, but Android enums like LaunchMode.Multiple ("standard") and ActivityPersistableMode.RootOnly ("persistRootOnly") can legitimately be 0 when explicitly set in the attribute.

Consider removing the intValue != 0 guard and instead always calling EnumConverter (only setting the XML attribute when it returns non-null). Also add missing 0 mappings such as LaunchMode=0 => "standard" and DocumentLaunchMode=0 => "none" to match existing ManifestDocumentElement behavior.

Suggested change

int intValue = value switch { int i => i, long l => (int)l, short s => s, byte b => b, _ => 0 };

if (intValue != 0) {

var strValue = m.EnumConverter (intValue);

if (strValue is not null) {

element.SetAttributeValue (AndroidNs + m.XmlAttributeName, strValue);

}

}

int intValue;

switch (value) {

case int i:

intValue = i;

break;

case long l:

intValue = (int)l;

break;

case short s2:

intValue = s2;

break;

case byte b2:

intValue = b2;

break;

default:

continue;

}

var strValue = m.EnumConverter (intValue);

if (strValue is not null) {

element.SetAttributeValue (AndroidNs + m.XmlAttributeName, strValue);

}

Fixed — removed intValue != 0 guard in ApplyMappings. Now always calls EnumConverter and only sets the attribute when it returns non-null.

Copilot · 2026-03-21T22:17:50Z

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs

+		int intValue = value switch {
+			int i => i,
+			long l => (int)l,
+			short s => s,
+			byte b => b,
+			_ => 0,
+		};
+		if (intValue != 0) {
+			var strValue = converter (intValue);
+			if (strValue is not null) {
+				element.SetAttributeValue (AndroidNs + xmlAttrName, strValue);
+			}
+		}


MapDictionaryEnumProperty skips writing enum values when the underlying integral value is 0. This prevents valid values like ProtectionLevel=normal (0) from being emitted even when explicitly set in [Permission] attributes.

Remove the intValue != 0 check and rely on the converter returning null for unsupported values instead.

Suggested change

int intValue = value switch {

int i => i,

long l => (int)l,

short s => s,

byte b => b,

_ => 0,

};

if (intValue != 0) {

var strValue = converter (intValue);

if (strValue is not null) {

element.SetAttributeValue (AndroidNs + xmlAttrName, strValue);

}

}

int? intValue = value switch {

int i => i,

long l => (int)l,

short s => s,

byte b => b,

_ => null,

};

if (intValue is null) {

return;

}

var strValue = converter (intValue.Value);

if (strValue is not null) {

element.SetAttributeValue (AndroidNs + xmlAttrName, strValue);

}

Fixed — same approach in MapDictionaryEnumProperty. Removed intValue != 0 guard.

Copilot · 2026-03-21T22:17:51Z

src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs

+	IList<string> AddRuntimeProviders (XElement app)
+	{
+		string packageName = "mono";
+		string className = "MonoRuntimeProvider";
+
+		if (string.Equals (AndroidRuntime, "nativeaot", StringComparison.OrdinalIgnoreCase)) {
+			packageName = "net.dot.jni.nativeaot";
+			className = "NativeAotRuntimeProvider";
+		}
+
+		app.Add (CreateRuntimeProvider ($"{packageName}.{className}", null, --appInitOrder));
+


AddRuntimeProviders unconditionally adds the base runtime provider to <application>. If the manifest template already contains the runtime provider (common in generated manifests), this will create duplicate <provider> entries with the same android:authorities, which can cause Android install/merge failures.

Before adding, check for an existing provider with matching android:name (or authorities ending in .__mono_init__) and skip/merge accordingly. Consider also handling per-process runtime providers similarly to avoid duplicates when the template already includes them.

Fixed — now checks for existing provider with matching android:name or .__mono_init__ authorities before adding.

Copilot · 2026-03-21T22:17:51Z

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs

+	[InlineData (ComponentKind.Service, "service")]
+	[InlineData (ComponentKind.BroadcastReceiver, "receiver")]
+	public void Component_BasicProperties (ComponentKind kind, string elementName)
+	{


This test uses [InlineData] but is missing the [Theory] attribute, so it won't be discovered/executed by xUnit.

Add [Theory] above the InlineData attributes (or convert to separate [Fact] tests) to ensure these cases run.

Fixed — added [Theory] attribute.

Copilot · 2026-03-21T22:17:51Z

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs

+	[InlineData ("", "", "1", "1.0")]
+	[InlineData ("42", "2.5", "42", "2.5")]
+	public void VersionDefaults (string versionCode, string versionName, string expectedCode, string expectedName)
+	{


This test uses [InlineData] but is missing the [Theory] attribute, so it won't be discovered/executed by xUnit.

Add [Theory] above the InlineData attributes (or convert to separate [Fact] tests) to ensure these cases run.

Fixed — added [Theory] attribute.

Copilot · 2026-03-21T22:17:51Z

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ManifestGeneratorTests.cs

+	[InlineData (true, false, false, "debuggable", "true")]
+	[InlineData (false, true, false, "debuggable", "true")]
+	[InlineData (false, false, true, "extractNativeLibs", "true")]
+	public void ApplicationFlags (bool debug, bool forceDebuggable, bool forceExtractNativeLibs, string attrName, string expected)
+	{


This test uses [InlineData] but is missing the [Theory] attribute, so it won't be discovered/executed by xUnit.

Add [Theory] above the InlineData attributes (or convert to separate [Fact] tests) to ensure these cases run.

Fixed — added [Theory] attribute.

Split into focused classes in Microsoft.Android.Sdk.TrimmableTypeMap: - ManifestGenerator: orchestration (load template, call builders, write output) - ManifestConstants: shared AndroidNs and AttName - PropertyMapper: data-driven property mapping (7 arrays, MappingKind enum) - AndroidEnumConverter: 9 enum-to-string converters - ComponentElementBuilder: Activity/Service/Receiver/Provider/Instrumentation XML - AssemblyLevelElementBuilder: permissions, uses-permissions, features, libraries Features: MainLauncher, runtime provider (with dedup), template merging, ManifestPlaceholders, debuggable/extractNativeLibs, XA4213 validation. 30 unit tests (xunit, 130ms). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

simonrozsival and others added 2 commits March 21, 2026 23:10

trigger PR creation

fb59a6d

simonrozsival requested a review from jonathanpeppers as a code owner March 21, 2026 22:14

Copilot AI review requested due to automatic review settings March 21, 2026 22:14

simonrozsival requested a review from grendello as a code owner March 21, 2026 22:14

Copilot started reviewing on behalf of simonrozsival March 21, 2026 22:14 View session

simonrozsival added copilot `copilot-cli` or other AIs were used to author this trimmable-type-map labels Mar 21, 2026

simonrozsival changed the title ~~[TrimmableTypeMap] Add ManifestGenerator (#10807)~~ [TrimmableTypeMap] Add ManifestGenerator Mar 21, 2026

Copilot AI reviewed Mar 21, 2026

View reviewed changes

This was referenced Mar 21, 2026

[TrimmableTypeMap] Build pipeline: targets, scanner, task, assembly store #10980

Open

[TrimmableTypeMap] Implement runtime TypeManager, ValueManager, and JavaConvert #10967

Open

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-manifest-generation branch from b686f08 to c4c214f Compare March 21, 2026 22:46

simonrozsival force-pushed the dev/simonrozsival/trimmable-typemap-runtime-pr branch from 71ed636 to 2b80737 Compare March 21, 2026 23:14

-				int intValue = value switch { int i => i, long l => (int)l, short s => s, byte b => b, _ => 0 };
-				if (intValue != 0) {
-					var strValue = m.EnumConverter (intValue);
-					if (strValue is not null) {
-						element.SetAttributeValue (AndroidNs + m.XmlAttributeName, strValue);
-					}
-				}
+				int intValue;
+				switch (value) {
+				case int i:
+					intValue = i;
+					break;
+				case long l:
+					intValue = (int)l;
+					break;
+				case short s2:
+					intValue = s2;
+					break;
+				case byte b2:
+					intValue = b2;
+					break;
+				default:
+					continue;
+				}
+				var strValue = m.EnumConverter (intValue);
+				if (strValue is not null) {
+					element.SetAttributeValue (AndroidNs + m.XmlAttributeName, strValue);
+				}

Conversation

simonrozsival commented Mar 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Features

Component attributes

Assembly-level attributes

Build properties

Validation

Runtime provider

Tests

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

simonrozsival Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

simonrozsival commented Mar 21, 2026 •

edited

Loading