Skip to content

[TrimmableTypeMap] Assembly-level manifest attribute scanning #11035

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.

Sign up for GitHub

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
simonrozsival wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[TrimmableTypeMap] Assembly-level manifest attribute scanning #11035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0496fbc
[TrimmableTypeMap] Add assembly-level manifest attribute scanning
simonrozsival Mar 27, 2026
bde5a24
[TrimmableTypeMap] Assembly-level attribute scanning + manifest model…
simonrozsival Mar 27, 2026
5072ced
Address review: fix attribute ordering bug, remove redundant #nullabl…
simonrozsival Mar 27, 2026
64fedb1
Fix ParseUsesFeatureAttribute to read constructor argument for featur…
simonrozsival Mar 27, 2026
8c00ee8
Add scanner-level tests for assembly-level manifest attribute parsing
simonrozsival Mar 27, 2026
67f6990
Address review: cleanup and reduce Parse*Attribute duplication
simonrozsival Mar 27, 2026
05818f8
Hoist ParseNameAndProperties, inline trivial Create methods, drop IO …
simonrozsival Mar 27, 2026
fd71439
Fix UsesLibrary 2-arg ctor losing Required flag
simonrozsival Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#nullable enable

Copy link
Copy Markdown
Member

@jonathanpeppers jonathanpeppers Mar 30, 2026

Choose a reason for hiding this comment

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

This looks implicit by $(Nullable)=enable in the .csproj anyway. 👍

using System;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -37,16 +35,16 @@ class ManifestGenerator
public string? ApplicationJavaClass { get; set; }

/// <summary>
/// Generates the merged manifest and writes it to <paramref name="outputPath"/>.
/// Generates the merged manifest from an optional pre-loaded template and writes it to <paramref name="outputPath"/>.
/// Returns the list of additional content provider names (for ApplicationRegistration.java).
/// </summary>
public IList<string> Generate (
string? manifestTemplatePath,
XDocument? manifestTemplate,
IReadOnlyList<JavaPeerInfo> allPeers,
AssemblyManifestInfo assemblyInfo,
string outputPath)
{
var doc = LoadOrCreateManifest (manifestTemplatePath);
var doc = manifestTemplate ?? CreateDefaultManifest ();
var manifest = doc.Root;
if (manifest is null) {
throw new InvalidOperationException ("Manifest document has no root element.");
Expand Down Expand Up @@ -134,12 +132,8 @@ public IList<string> Generate (
return providerNames;
}

XDocument LoadOrCreateManifest (string? templatePath)
XDocument CreateDefaultManifest ()
{
if (!string.IsNullOrEmpty (templatePath) && File.Exists (templatePath)) {
return XDocument.Load (templatePath);
}

return new XDocument (
new XDeclaration ("1.0", "utf-8", null),
new XElement ("manifest",
Expand Down
105 changes: 0 additions & 105 deletions src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ManifestModel.cs
View file
Open in desktop

This file was deleted.

Loading