# This is a combination of 3 commits.

# This is the 1st commit message:
Initial Stable Id stuff

# The commit message #2 will be skipped:

#	rework code a bit

# The commit message #3 will be skipped:

#	FileWrites

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs

@@ -72,6 +72,10 @@ public class Aapt2Link : Aapt2 {
 
 		public bool ProtobufFormat { get; set; }
 
+		public string EmitIdsFile { get; set; }
+
+		public string StableIdsFile { get; set; }
+
 		AssemblyIdentityMap assemblyMap = new AssemblyIdentityMap ();
 		List<string> tempFiles = new List<string> ();
 
@@ -184,6 +188,10 @@ string GenerateCommandLineCommands (string ManifestFile, string currentAbi, stri
 				if (!string.IsNullOrWhiteSpace (assetDir) && Directory.Exists (assetDir))
 					cmd.AppendSwitchIfNotNull ("-A ", assetDir);
 			}
+			if (!string.IsNullOrEmpty (StableIdsFile) && File.Exists (StableIdsFile)) {
+				cmd.AppendSwitchIfNotNull ("--stable-ids ", StableIdsFile);
+			}
+			cmd.AppendSwitchIfNotNull ("--emit-ids ", EmitIdsFile);
 			cmd.AppendSwitchIfNotNull ("-o ", currentResourceOutputFile);
 			return cmd.ToString ();
 		}

src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesigner.cs

@@ -44,6 +44,10 @@ public class GenerateResourceDesigner : Task
 		[Required]
 		public bool DesignTimeBuild { get; set; }
 
+		public string StableIdsFile { get; set; }
+
+		public string ApplicationName { get; set; }
+
 		private Dictionary<string, string> resource_fixup = new Dictionary<string, string> (StringComparer.OrdinalIgnoreCase);
 
 		public override bool Execute ()
@@ -87,7 +91,11 @@ public override bool Execute ()
 			// Parse out the resources from the R.java file
 			CodeTypeDeclaration resources;
 			if (UseManagedResourceGenerator) {
-				var parser = new ManagedResourceParser () { Log = Log };
+				var parser = new ManagedResourceParser () {
+					Log = Log,
+					StableIdsFile = StableIdsFile,
+					ApplicationName = ApplicationName,
+				};
 				resources = parser.Parse (ResourceDirectory, AdditionalResourceDirectories?.Select (x => x.ItemSpec), IsApplication, resource_fixup);
 			} else {
 				var parser = new JavaResourceParser () { Log = Log };

src/Xamarin.Android.Build.Tasks/Tasks/GetExtraPackages.cs

@@ -11,7 +11,7 @@ namespace Xamarin.Android.Tasks
 	public class GetExtraPackages : Task
 	{
 		[Required]
-		public string IntermediateOutputPath { get; set; }
+		public string LibraryProjectIntermediatePath { get; set; }
 
 		[Output]
 		public string ExtraPackages { get; set; }
@@ -22,9 +22,8 @@ public class GetExtraPackages : Task
 		public override bool Execute ()
 		{
 			var extraPackages = new List<string> ();
-			var libProjects = Path.Combine (IntermediateOutputPath, "__library_projects__");
-			if (Directory.Exists (libProjects)) {
-				foreach (var assemblyDir in Directory.GetDirectories (libProjects)) {
+			if (Directory.Exists (LibraryProjectIntermediatePath)) {
+				foreach (var assemblyDir in Directory.GetDirectories (LibraryProjectIntermediatePath)) {
 					foreach (var importBaseDir in new string [] { LibraryProjectImportsDirectoryName, "library_project_imports", }) {
 						string importsDir = Path.Combine (assemblyDir, importBaseDir);
 						string libpkg = GetPackageNameForLibrary (importsDir, Path.GetDirectoryName (assemblyDir));

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ManagedResourceParserTests.cs

@@ -124,12 +124,46 @@ public void GenerateDesignerFileWithÜmläüts ()
 				new TaskItem (Path.Combine (Root, path, "lp", "res")),
 			};
 			task.IsApplication = true;
+			task.StableIdsFile = Path.Combine (Root, path, "stableids.txt");
+			task.ApplicationName = "com.foo.testapp";
 			Assert.IsTrue (task.Execute (), "Task should have executed successfully.");
 			Assert.IsTrue (File.Exists (task.NetResgenOutputFile), $"{task.NetResgenOutputFile} should have been created.");
+			Assert.IsTrue (File.Exists (task.StableIdsFile), $"{task.StableIdsFile} should have been created.");
 			var expected = Path.Combine (Root, "Expected", "GenerateDesignerFileExpected.cs");
 			Assert.IsTrue (FileCompare (task.NetResgenOutputFile, expected), 
 			 	$"{task.NetResgenOutputFile} and {expected} do not match.");
 			Directory.Delete (Path.Combine (Root, path), recursive: true);
 		}
+
+		[Test]
+		public void DebugGenerator ()
+		{
+			string path = "/Users/dean/Documents/Sandbox/Xamarin/xaspeed/tests/Xamarin.Forms-Performance-Integration/Droid";
+			IBuildEngine engine = new MockBuildEngine (TestContext.Out);
+			var task = new GenerateResourceDesigner {
+				BuildEngine = engine
+			};
+			task.UseManagedResourceGenerator = true;
+			task.DesignTimeBuild = true;
+			task.Namespace = "Xamarin.Forms.Performance.Integration.Droid";
+			task.NetResgenOutputFile = Path.Combine (path, "Resource.designer.cs");
+			task.ProjectDir = Path.Combine (path);
+			task.ResourceDirectory = Path.Combine (path, "obj", "Debug", "res") + Path.DirectorySeparatorChar;
+			var files = Directory.EnumerateFiles (task.ResourceDirectory, "*.*", SearchOption.AllDirectories);
+			List<TaskItem> items = new List<TaskItem> ();
+			foreach (var f in files) {
+				items.Add (new TaskItem (f, new Dictionary<string, string> {
+					{ "LogicalName", f.Replace (task.ResourceDirectory, string.Empty) }
+				}));
+			}
+			task.Resources = items.ToArray ();
+			task.AdditionalResourceDirectories = new TaskItem [] {
+				new TaskItem (Path.Combine (path, "obj", "Debug", "lp", "res")),
+			};
+			task.IsApplication = true;
+			task.StableIdsFile = Path.Combine (path, "stableid-test.txt");
+			task.ApplicationName = "Xamarin.Forms_Performance_Integration";
+			task.Execute ();
+		}
 	}
 }