[WIP][TrimmableTypeMap] Decompose _GenerateJavaStubs: shared tasks for trimmable path

Xamarin.Android.sln

@@ -59,6 +59,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ProjectTools", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Build.Tests", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.csproj", "{53E4ABF0-1085-45F9-B964-DCAE4B819998}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Android.Sdk.TrimmableTypeMap", "src\Microsoft.Android.Sdk.TrimmableTypeMap\Microsoft.Android.Sdk.TrimmableTypeMap.csproj", "{507759AE-93DF-411B-8645-31F680319F5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Android.Sdk.TrimmableTypeMap.Tests", "tests\Microsoft.Android.Sdk.TrimmableTypeMap.Tests\Microsoft.Android.Sdk.TrimmableTypeMap.Tests.csproj", "{F9CD012E-67AC-4A4E-B2A7-252387F91256}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFixtures", "tests\Microsoft.Android.Sdk.TrimmableTypeMap.Tests\TestFixtures\TestFixtures.csproj", "{C5A44686-3469-45A7-B6AB-2798BA0625BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests", "tests\Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests\Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests.csproj", "{A14CB0A1-7A05-4F27-88B2-383798CE1DEE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserTypesFixture", "tests\Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests\UserTypesFixture\UserTypesFixture.csproj", "{2498F8A0-AA04-40EF-8691-59BBD2396B4D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "class-parse", "external\Java.Interop\tools\class-parse\class-parse.csproj", "{38C762AB-8FD1-44DE-9855-26AAE7129DC3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "logcat-parse", "external\Java.Interop\tools\logcat-parse\logcat-parse.csproj", "{7387E151-48E3-4885-B2CA-A74434A34045}"
@@ -231,6 +241,26 @@ Global
 		{53E4ABF0-1085-45F9-B964-DCAE4B819998}.Debug|AnyCPU.Build.0 = Debug|Any CPU
 		{53E4ABF0-1085-45F9-B964-DCAE4B819998}.Release|AnyCPU.ActiveCfg = Release|Any CPU
 		{53E4ABF0-1085-45F9-B964-DCAE4B819998}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{507759AE-93DF-411B-8645-31F680319F5C}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{507759AE-93DF-411B-8645-31F680319F5C}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{507759AE-93DF-411B-8645-31F680319F5C}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{507759AE-93DF-411B-8645-31F680319F5C}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{F9CD012E-67AC-4A4E-B2A7-252387F91256}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{F9CD012E-67AC-4A4E-B2A7-252387F91256}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{F9CD012E-67AC-4A4E-B2A7-252387F91256}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{F9CD012E-67AC-4A4E-B2A7-252387F91256}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{C5A44686-3469-45A7-B6AB-2798BA0625BC}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{C5A44686-3469-45A7-B6AB-2798BA0625BC}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{C5A44686-3469-45A7-B6AB-2798BA0625BC}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{C5A44686-3469-45A7-B6AB-2798BA0625BC}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{A14CB0A1-7A05-4F27-88B2-383798CE1DEE}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{A14CB0A1-7A05-4F27-88B2-383798CE1DEE}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{A14CB0A1-7A05-4F27-88B2-383798CE1DEE}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{A14CB0A1-7A05-4F27-88B2-383798CE1DEE}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{2498F8A0-AA04-40EF-8691-59BBD2396B4D}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{2498F8A0-AA04-40EF-8691-59BBD2396B4D}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{2498F8A0-AA04-40EF-8691-59BBD2396B4D}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{2498F8A0-AA04-40EF-8691-59BBD2396B4D}.Release|AnyCPU.Build.0 = Release|Any CPU
 		{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
 		{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.Build.0 = Debug|Any CPU
 		{38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.ActiveCfg = Release|Any CPU
@@ -398,6 +428,10 @@ Global
 		{645E1718-C8C4-4C23-8A49-5A37E4ECF7ED} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
 		{2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
 		{53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
+		{F9CD012E-67AC-4A4E-B2A7-252387F91256} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
+		{C5A44686-3469-45A7-B6AB-2798BA0625BC} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
+		{A14CB0A1-7A05-4F27-88B2-383798CE1DEE} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
+		{2498F8A0-AA04-40EF-8691-59BBD2396B4D} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
 		{38C762AB-8FD1-44DE-9855-26AAE7129DC3} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{7387E151-48E3-4885-B2CA-A74434A34045} = {864062D3-A415-4A6F-9324-5820237BA058}
 		{8A6CB07C-E493-4A4F-AB94-038645A27118} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}

build-tools/automation/yaml-templates/build-windows-steps.yaml

@@ -77,6 +77,36 @@ steps:
     testRunTitle: Microsoft.Android.Sdk.Analysis.Tests
   continueOnError: true
 
+- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
+  parameters:
+    command: test
+    project: tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests.csproj
+    arguments: -c $(XA.Build.Configuration) --logger trx --results-directory $(Agent.TempDirectory)/trimmable-typemap-tests
+    displayName: Test Microsoft.Android.Sdk.TrimmableTypeMap.Tests $(XA.Build.Configuration)
+
+- task: PublishTestResults@2
+  displayName: publish Microsoft.Android.Sdk.TrimmableTypeMap.Tests results
+  condition: always()
+  inputs:
+    testResultsFormat: VSTest
+    testResultsFiles: "$(Agent.TempDirectory)/trimmable-typemap-tests/*.trx"
+    testRunTitle: Microsoft.Android.Sdk.TrimmableTypeMap.Tests
+
+- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
+  parameters:
+    command: test
+    project: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests.dll
+    arguments: --logger trx --results-directory $(Agent.TempDirectory)/trimmable-typemap-integration-tests
+    displayName: Test Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests $(XA.Build.Configuration)
+
+- task: PublishTestResults@2
+  displayName: publish Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests results
+  condition: always()
+  inputs:
+    testResultsFormat: VSTest
+    testResultsFiles: "$(Agent.TempDirectory)/trimmable-typemap-integration-tests/*.trx"
+    testRunTitle: Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests
+
 - task: BatchScript@1
   displayName: Test dotnet-local.cmd - create template
   inputs:

eng/Versions.props

@@ -16,6 +16,7 @@
     <MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.1.26076.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26076.102</MicrosoftDotNetCecilPackageVersion>
     <SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
+    <SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
     <!-- Previous .NET Android version -->
     <MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.30</MicrosoftNETSdkAndroidManifest100100PackageVersion>
     <AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest100100PackageVersion)</AndroidNetPreviousVersion>

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

@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.Android.Sdk.TrimmableTypeMap;
+
+/// <summary>
+/// Generates acw-map.txt from JavaPeerInfo scanner results.
+/// The acw-map is consumed by _ConvertCustomView to fix up custom view names in layout XML.
+///
+/// Each type produces 3 lines: PartialAssemblyQualifiedName;JavaKey, ManagedKey;JavaKey, CompatJniName;JavaKey.
+/// Types with DoNotGenerateAcw = true are excluded (MCW binding types).
+/// </summary>
+static class AcwMapWriter
+{
+	/// <summary>
+	/// Creates per-assembly acw-map entries for a single assembly's scan results.
+	/// </summary>
+	public static List<AcwMapEntry> CreateEntries (IReadOnlyList<JavaPeerInfo> peers, string assemblyName)
+	{
+		var entries = new List<AcwMapEntry> ();
+
+		foreach (var peer in peers) {
+			if (peer.DoNotGenerateAcw)
+				continue;
+
+			if (peer.AssemblyName != assemblyName)
+				continue;
+
+			var javaKey = peer.JavaName.Replace ('/', '.');
+			var managedKey = peer.ManagedTypeName;
+			var partialAssemblyQualifiedName = $"{peer.ManagedTypeName}, {peer.AssemblyName}";
+			// Compat JNI name uses the same format for now
+			var compatJniName = javaKey;
+
+			entries.Add (new AcwMapEntry {
+				JavaKey = javaKey,
+				ManagedKey = managedKey,
+				PartialAssemblyQualifiedName = partialAssemblyQualifiedName,
+				CompatJniName = compatJniName,
+				AssemblyName = peer.AssemblyName,
+			});
+		}
+
+		return entries;
+	}
+
+	/// <summary>
+	/// Writes acw-map.txt, detecting XA4214 (duplicate managed key) and XA4215 (duplicate Java key).
+	/// </summary>
+	public static AcwMapResult WriteMap (IReadOnlyList<AcwMapEntry> entries, TextWriter writer)
+	{
+		var managed = new Dictionary<string, AcwMapEntry> (entries.Count, StringComparer.Ordinal);
+		var java = new Dictionary<string, AcwMapEntry> (entries.Count, StringComparer.Ordinal);
+		var managedConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
+		var javaConflicts = new Dictionary<string, List<string>> (0, StringComparer.Ordinal);
+
+		foreach (var entry in entries.OrderBy (e => e.ManagedKey, StringComparer.Ordinal)) {
+			writer.Write (entry.PartialAssemblyQualifiedName);
+			writer.Write (';');
+			writer.WriteLine (entry.JavaKey);
+
+			bool hasConflict = false;
+
+			if (managed.TryGetValue (entry.ManagedKey, out var managedConflict)) {
+				if (!managedConflict.AssemblyName.Equals (entry.AssemblyName, StringComparison.Ordinal)) {
+					if (!managedConflicts.TryGetValue (entry.ManagedKey, out var list))
+						managedConflicts.Add (entry.ManagedKey, list = new List<string> { managedConflict.AssemblyName });
+					list.Add (entry.AssemblyName);
+				}
+				hasConflict = true;
+			}
+
+			if (java.TryGetValue (entry.JavaKey, out var javaConflict)) {
+				if (!javaConflict.AssemblyName.Equals (entry.AssemblyName, StringComparison.Ordinal)) {
+					if (!javaConflicts.TryGetValue (entry.JavaKey, out var list))
+						javaConflicts.Add (entry.JavaKey, list = new List<string> { javaConflict.PartialAssemblyQualifiedName });
+					list.Add (entry.PartialAssemblyQualifiedName);
+				}
+				hasConflict = true;
+			}
+
+			if (!hasConflict) {
+				managed.Add (entry.ManagedKey, entry);
+				java.Add (entry.JavaKey, entry);
+
+				writer.Write (entry.ManagedKey);
+				writer.Write (';');
+				writer.WriteLine (entry.JavaKey);
+
+				writer.Write (entry.CompatJniName);
+				writer.Write (';');
+				writer.WriteLine (entry.JavaKey);
+			}
+		}
+
+		return new AcwMapResult {
+			ManagedConflicts = managedConflicts,
+			JavaConflicts = javaConflicts,
+		};
+	}
+
+	/// <summary>
+	/// Writes acw-map.txt to a file, only if content changed.
+	/// </summary>
+	public static AcwMapResult WriteMapToFile (IReadOnlyList<AcwMapEntry> entries, string outputPath)
+	{
+		using var sw = new StringWriter ();
+		var result = WriteMap (entries, sw);
+
+		if (result.JavaConflicts.Count > 0)
+			return result;
+
+		var content = sw.ToString ();
+		WriteIfChanged (outputPath, content);
+		return result;
+	}
+
+	static void WriteIfChanged (string path, string content)
+	{
+		if (File.Exists (path)) {
+			var existing = File.ReadAllText (path);
+			if (string.Equals (existing, content, StringComparison.Ordinal))
+				return;
+		}
+
+		var dir = Path.GetDirectoryName (path);
+		if (!string.IsNullOrEmpty (dir) && !Directory.Exists (dir))
+			Directory.CreateDirectory (dir);
+
+		File.WriteAllText (path, content);
+	}
+}
+
+sealed class AcwMapEntry
+{
+	public string JavaKey { get; set; } = "";
+	public string ManagedKey { get; set; } = "";
+	public string PartialAssemblyQualifiedName { get; set; } = "";
+	public string CompatJniName { get; set; } = "";
+	public string AssemblyName { get; set; } = "";
+}
+
+sealed class AcwMapResult
+{
+	public Dictionary<string, List<string>> ManagedConflicts { get; set; } = new ();
+	public Dictionary<string, List<string>> JavaConflicts { get; set; } = new ();
+	public bool HasErrors => JavaConflicts.Count > 0;
+	public bool HasWarnings => ManagedConflicts.Count > 0;
+}

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

@@ -0,0 +1,23 @@
+// Polyfills for C# language features on netstandard2.0
+
+// Required for init-only setters
+namespace System.Runtime.CompilerServices
+{
+	static class IsExternalInit { }
+
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+	sealed class RequiredMemberAttribute : Attribute { }
+
+	[AttributeUsage (AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+	sealed class CompilerFeatureRequiredAttribute (string featureName) : Attribute
+	{
+		public string FeatureName { get; } = featureName;
+		public bool IsOptional { get; init; }
+	}
+}
+
+namespace System.Diagnostics.CodeAnalysis
+{
+	[AttributeUsage (AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
+	sealed class SetsRequiredMembersAttribute : Attribute { }
+}