Use the assemblies instaed of api-info (#160)

* Updated the logic to use the assembly and not the api-info
* Now using the merged dll from CI

Author: mattleibow

build.cake

@@ -36,6 +36,10 @@ var REF_DOCS_URL = "https://bosstoragemirror.blob.core.windows.net/android-docs-
 // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff
 var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/28.0.0.1/api-info.xml";
 
+// In order to create the type mapping, we need to get the AndroidSupport.Merged.dll
+var SUPPORT_MERGED_DLL_BUILD_ID = EnvironmentVariable("SUPPORT_MERGED_DLL_BUILD_ID") ?? "652";
+var SUPPORT_MERGED_DLL_ZIP_URL = EnvironmentVariable("SUPPORT_MERGED_DLL_ZIP_URL") ?? $"https://dev.azure.com/xamarin/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/build/builds/{SUPPORT_MERGED_DLL_BUILD_ID}/artifacts?artifactName=nuget&%24format=zip&api-version=5.0";
+
 var MONODROID_BASE_PATH = (DirectoryPath)"/Library/Frameworks/Xamarin.Android.framework/Versions/Current/lib/xbuild-frameworks/MonoAndroid/";
 if (IsRunningOnWindows ()) {
 	var vsInstallPath = VSWhereLatest (new VSWhereLatestSettings { Requires = "Component.Xamarin" });
@@ -239,16 +243,22 @@ Task ("diff")
 Task ("generate-mapping")
 	.IsDependentOn ("androidxmapper")
 	.IsDependentOn ("merge")
-	.IsDependentOn ("diff")
 	.Does (() =>
 {
-	EnsureDirectoryExists("./output/");
-	DownloadFile (BASE_API_INFO_URL, "./output/api-info.previous.xml");
+	// download the AndroidSupport.Merged.dll from a past build
+	if (!FileExists ("./output/AndroidSupport.Merged.dll")) {
+		EnsureDirectoryExists ("./output/temp/");
+		CleanDirectories ("./output/temp");
+		DownloadFile (SUPPORT_MERGED_DLL_ZIP_URL, "./output/temp/AndroidSupport.NuGet.zip");
+		Unzip ("./output/temp/AndroidSupport.NuGet.zip", "./output/temp/");
+		CopyFileToDirectory ("./output/temp/nuget/AndroidSupport.Merged.dll", "./output/");
+		DeleteDirectory ("./output/temp", true);
+	}
 
 	var result = StartProcess(ANDROIDX_MAPPER_EXE,
 		$"generate -v " +
-		$" -s " + MakeAbsolute((FilePath)"./output/api-info.previous.xml") +
-		$" -x " + MakeAbsolute((FilePath)"./output/api-info.xml") +
+		$" -s " + MakeAbsolute((FilePath)"./output/AndroidSupport.Merged.dll") +
+		$" -x " + MakeAbsolute((FilePath)"./output/AndroidX.Merged.dll") +
 		$" -j " + MakeAbsolute((FilePath)"./util/AndroidXMapper/Resources/androidx-class-mapping.csv") +
 		$" -m " + MakeAbsolute((FilePath)"./util/AndroidXMapper/Resources/override-mapping.csv") +
 		$" -o " + MakeAbsolute((FilePath)"./output/androidx-mapping.csv"));

util/AndroidXMapper/AndroidXMapper/GenerateCommand.cs

@@ -16,8 +16,8 @@ public GenerateCommand()
 				"",
 				Help,
 				"",
-				{ "s|support=", "The path to the merged Android.Support api-info.xml", v => AndroidSupportApi = v },
-				{ "x|androidx=", "The path to the merged AndroidX api-info.xml", v => AndroidXApi = v },
+				{ "s|support=", "The path to the merged Android.Support assembly", v => AndroidSupportAssembly = v },
+				{ "x|androidx=", "The path to the merged AndroidX assembly", v => AndroidXAssembly = v },
 				{ "j|java=", "The path to the Java mapping csv", v => JavaTypeMapping = v },
 				{ "m|override=", "The path to the mapping overides csv", v => OverrideMapping = v },
 				{ "o|output=", "The output path to use for the generated mapping", v => SetOutputPath(v) },
@@ -45,9 +45,9 @@ private void SetOutputPath(string path)
 
 		public bool ExcludeWarnings { get; private set; }
 
-		public string AndroidSupportApi { get; private set; }
+		public string AndroidSupportAssembly { get; private set; }
 
-		public string AndroidXApi { get; private set; }
+		public string AndroidXAssembly { get; private set; }
 
 		public string JavaTypeMapping { get; private set; }
 
@@ -76,7 +76,7 @@ public override int Invoke(IEnumerable<string> args)
 					? Console.Out
 					: (writer = new StreamWriter(OutputPath));
 
-				var generator = new MappingGenerator(AndroidSupportApi, AndroidXApi, OverrideMapping, JavaTypeMapping);
+				var generator = new MappingGenerator(AndroidSupportAssembly, AndroidXAssembly, OverrideMapping, JavaTypeMapping);
 				generator.Generate(outputWriter, !ExcludeWarnings);
 
 				return 0;
@@ -98,25 +98,25 @@ private bool ValidateArguments()
 		{
 			var hasError = false;
 
-			if (string.IsNullOrEmpty(AndroidSupportApi))
+			if (string.IsNullOrEmpty(AndroidSupportAssembly))
 			{
 				Console.Error.WriteLine($"{Program.Name}: Missing required argument `--support=PATH`.");
 				hasError = true;
 			}
-			else if (!File.Exists(AndroidSupportApi))
+			else if (!File.Exists(AndroidSupportAssembly))
 			{
-				Console.Error.WriteLine($"{Program.Name}: File does not exist: `{AndroidSupportApi}`.");
+				Console.Error.WriteLine($"{Program.Name}: File does not exist: `{AndroidSupportAssembly}`.");
 				hasError = true;
 			}
 
-			if (string.IsNullOrEmpty(AndroidXApi))
+			if (string.IsNullOrEmpty(AndroidXAssembly))
 			{
 				Console.Error.WriteLine($"{Program.Name}: Missing required argument `--androidx=PATH`.");
 				hasError = true;
 			}
-			else if (!File.Exists(AndroidXApi))
+			else if (!File.Exists(AndroidXAssembly))
 			{
-				Console.Error.WriteLine($"{Program.Name}: File does not exist: `{AndroidXApi}`.");
+				Console.Error.WriteLine($"{Program.Name}: File does not exist: `{AndroidXAssembly}`.");
 				hasError = true;
 			}