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

build-tools/automation/yaml-templates/stage-linux-tests.yaml

@@ -85,6 +85,7 @@ stages:
         args: >-
           build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
           -p:AndroidSdkDirectory="$(HOME)/android-toolchain/sdk"
+          -p:UseMonoRuntime=false
           -bl:$(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/build-helloworld.binlog
 
     - template: /build-tools/automation/yaml-templates/upload-results.yaml

build-tools/automation/yaml-templates/stage-package-tests.yaml

@@ -231,7 +231,7 @@ stages:
       displayName: Test dotnet-local.sh
       inputs:
         scriptPath: dotnet-local.sh
-        args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
+        args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj -p:UseMonoRuntime=false
 
     - ${{ if ne(parameters.macTestAgentsUseCleanImages, true) }}:
       - template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml

eng/Versions.props

@@ -15,6 +15,7 @@
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26171.106</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26171.106</MicrosoftDotNetCecilPackageVersion>
+    <MSBuildPackageReferenceVersion>17.14.28</MSBuildPackageReferenceVersion>
     <SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
     <SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
     <!-- Previous .NET Android version -->

samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>$(DotNetAndroidTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>HelloWorld</RootNamespace>
+    <_AndroidTypeMapImplementation>trimmable</_AndroidTypeMapImplementation>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\HelloLibrary\HelloLibrary.DotNet.csproj" />

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

@@ -163,11 +163,14 @@ internal static void ValidateJniName (string jniName)
 
 	/// <summary>
 	/// Converts a JNI type name to a Java source type name.
-	/// e.g., "android/app/Activity" \u2192 "android.app.Activity"
+	/// JNI uses '/' for packages and '$' for inner classes.
+	/// Java source uses '.' for both.
+	/// e.g., "android/app/Activity" → "android.app.Activity"
+	/// e.g., "android/drm/DrmManagerClient$OnEventListener" → "android.drm.DrmManagerClient.OnEventListener"
 	/// </summary>
 	internal static string JniNameToJavaName (string jniName)
 	{
-		return jniName.Replace ('/', '.');
+		return jniName.Replace ('/', '.').Replace ('$', '.');
 	}
 
 	/// <summary>

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

@@ -40,13 +40,30 @@ class ManifestGenerator
 	/// Generates the merged manifest and writes it to <paramref name="outputPath"/>.
 	/// Returns the list of additional content provider names (for ApplicationRegistration.java).
 	/// </summary>
-	public IList<string> Generate (
+	public IReadOnlyList<string> Generate (
 		string? manifestTemplatePath,
 		IReadOnlyList<JavaPeerInfo> allPeers,
 		AssemblyManifestInfo assemblyInfo,
 		string outputPath)
 	{
-		var doc = LoadOrCreateManifest (manifestTemplatePath);
+		XDocument? template = null;
+		if (!manifestTemplatePath.IsNullOrEmpty () && File.Exists (manifestTemplatePath)) {
+			template = XDocument.Load (manifestTemplatePath);
+		}
+		return Generate (template, allPeers, assemblyInfo, outputPath);
+	}
+
+	/// <summary>
+	/// 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 IReadOnlyList<string> Generate (
+		XDocument? manifestTemplate,
+		IReadOnlyList<JavaPeerInfo> allPeers,
+		AssemblyManifestInfo assemblyInfo,
+		string outputPath)
+	{
+		var doc = manifestTemplate ?? CreateDefaultManifest ();
 		var manifest = doc.Root;
 		if (manifest is null) {
 			throw new InvalidOperationException ("Manifest document has no root element.");
@@ -98,7 +115,7 @@ public IList<string> Generate (
 		var providerNames = AddRuntimeProviders (app);
 
 		// Set ApplicationJavaClass
-		if (!string.IsNullOrEmpty (ApplicationJavaClass) && app.Attribute (AttName) is null) {
+		if (!ApplicationJavaClass.IsNullOrEmpty () && app.Attribute (AttName) is null) {
 			app.SetAttributeValue (AttName, ApplicationJavaClass);
 		}
 
@@ -134,12 +151,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",
@@ -151,18 +164,18 @@ void EnsureManifestAttributes (XElement manifest)
 	{
 		manifest.SetAttributeValue (XNamespace.Xmlns + "android", AndroidNs.NamespaceName);
 
-		if (string.IsNullOrEmpty ((string?)manifest.Attribute ("package"))) {
+		if (((string?)manifest.Attribute ("package")).IsNullOrEmpty ()) {
 			manifest.SetAttributeValue ("package", PackageName);
 		}
 
 		if (manifest.Attribute (AndroidNs + "versionCode") is null) {
 			manifest.SetAttributeValue (AndroidNs + "versionCode",
-				string.IsNullOrEmpty (VersionCode) ? "1" : VersionCode);
+				VersionCode.IsNullOrEmpty () ? "1" : VersionCode);
 		}
 
 		if (manifest.Attribute (AndroidNs + "versionName") is null) {
 			manifest.SetAttributeValue (AndroidNs + "versionName",
-				string.IsNullOrEmpty (VersionName) ? "1.0" : VersionName);
+				VersionName.IsNullOrEmpty () ? "1.0" : VersionName);
 		}
 
 		// Add <uses-sdk>
@@ -181,14 +194,14 @@ XElement EnsureApplicationElement (XElement manifest)
 			manifest.Add (app);
 		}
 
-		if (app.Attribute (AndroidNs + "label") is null && !string.IsNullOrEmpty (ApplicationLabel)) {
+		if (app.Attribute (AndroidNs + "label") is null && !ApplicationLabel.IsNullOrEmpty ()) {
 			app.SetAttributeValue (AndroidNs + "label", ApplicationLabel);
 		}
 
 		return app;
 	}
 
-	IList<string> AddRuntimeProviders (XElement app)
+	List<string> AddRuntimeProviders (XElement app)
 	{
 		string packageName = "mono";
 		string className = "MonoRuntimeProvider";

src/Microsoft.Android.Sdk.TrimmableTypeMap/Microsoft.Android.Sdk.TrimmableTypeMap.csproj

@@ -11,12 +11,22 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MSBuildPackageReferenceVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageReferenceVersion)" />
     <PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
     <InternalsVisibleTo Include="Microsoft.Android.Sdk.TrimmableTypeMap.Tests" Key="0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="..\..\src-ThirdParty\System.Runtime.CompilerServices\CompilerFeaturePolyfills.cs" Link="CompilerFeaturePolyfills.cs" />
   </ItemGroup>
 

src/Microsoft.Android.Sdk.TrimmableTypeMap/NullableExtensions.cs

@@ -0,0 +1,19 @@
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Android.Sdk.TrimmableTypeMap;
+
+// The static methods in System.String are not NRT annotated in netstandard2.0,
+// so we need our own extension methods to make them nullable aware.
+static class NullableExtensions
+{
+	public static bool IsNullOrEmpty ([NotNullWhen (false)] this string? str)
+	{
+		return string.IsNullOrEmpty (str);
+	}
+
+	public static bool IsNullOrWhiteSpace ([NotNullWhen (false)] this string? str)
+	{
+		return string.IsNullOrWhiteSpace (str);
+	}
+}