[Xamarin.Android.Build.Tasks] Use class-parse.exe out of MSBuild process.

Author: jpobst

build-tools/create-packs/Microsoft.Android.Sdk.proj

@@ -69,6 +69,9 @@ core workload SDK packs imported by WorkloadManifest.targets.
       <_PackageFiles Include="$(XAInstallPrefix)xbuild\Xamarin\Android\Microsoft.Android.Sdk.ILLink.pdb" PackagePath="tools" />
       <_PackageFiles Include="$(XAInstallPrefix)xbuild\Xamarin\Android\%(_LocalizationLanguages.Identity)\Microsoft.Android.Sdk.ILLink.resources.dll" PackagePath="tools\%(_LocalizationLanguages.Identity)" />
       <_PackageFiles Include="$(ToolsSourceDir)**" PackagePath="tools" />
+      <_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.dll" PackagePath="tools" />
+      <_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.pdb" PackagePath="tools" />
+      <_PackageFiles Include="$(NetCoreAppToolsSourceDir)class-parse.runtimeconfig.json" PackagePath="tools" />
       <_PackageFiles Include="$(NetCoreAppToolsSourceDir)generator.dll" PackagePath="tools" />
       <_PackageFiles Include="$(NetCoreAppToolsSourceDir)generator.pdb" PackagePath="tools" />
       <_PackageFiles Include="$(NetCoreAppToolsSourceDir)generator.runtimeconfig.json" PackagePath="tools" />

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets

@@ -31,6 +31,7 @@ This file is only used by binding projects.
         OutputFile="$(ApiOutputFile).class-parse"
         SourceJars="@(EmbeddedJar);@(InputJar)"
         DocumentationPaths="@(_AndroidDocumentationPath)"
+        ToolPath="$(MonoAndroidToolsDirectory)"
     />
     <BindingsGenerator
         OnlyRunXmlAdjuster="true"
@@ -45,6 +46,13 @@ This file is only used by binding projects.
         Nullable="$(Nullable)"
         UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"
     />
+
+    <ItemGroup>
+      <!-- Created by <ClassParse /> -->
+      <FileWrites Include="$(IntermediateOutputPath)class-parse.rsp" />
+      <!-- Created by <BindingGenerator /> -->
+      <FileWrites Condition="Exists ('$(IntermediateOutputPath)java-resolution-report.log')" Include="$(IntermediateOutputPath)java-resolution-report.log" />
+    </ItemGroup>    
   </Target>
 
   <Target Name="_GetJavaSourceJarJavadocFiles"

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

@@ -1,23 +1,17 @@
 // Copyright (C) 2012 Xamarin, Inc. All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.IO;
-using System.Reflection;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.Text;
-using Bytecode = Xamarin.Android.Tools.Bytecode;
-using System.Diagnostics;
 using Microsoft.Android.Build.Tasks;
+using Microsoft.Build.Framework;
 
 namespace Xamarin.Android.Tasks
 {
-	public class ClassParse : AndroidTask
+	public class ClassParse : AndroidDotnetToolTask
 	{
 		public override string TaskPrefix => "CLP";
 
+		protected override string BaseToolName => "class-parse";
+
 		[Required]
 		public string OutputFile { get; set; }
 
@@ -26,43 +20,33 @@ public class ClassParse : AndroidTask
 
 		public ITaskItem [] DocumentationPaths { get; set; }
 
-		public override bool RunTask ()
+		protected override string GenerateCommandLineCommands ()
 		{
-			using (var output = new StreamWriter (OutputFile, append: false, 
-						encoding: Files.UTF8withoutBOM)) {
-				Bytecode.Log.OnLog = LogEventHandler;
-				var classPath = new Bytecode.ClassPath () {
-					ApiSource = "class-parse",
-					DocumentationPaths = (DocumentationPaths ?? Enumerable.Empty<ITaskItem> ()).Select(x => x.ItemSpec)
-				};
-				foreach (var jar in SourceJars) {
-					if (Bytecode.ClassPath.IsJarFile (jar.ItemSpec)) {
-						classPath.Load (jar.ItemSpec);
-					}
-				}
-				classPath.SaveXmlDescription (output);
+			var cmd = GetCommandLineBuilder ();
+
+			var responseFile = Path.Combine (Path.GetDirectoryName (OutputFile), "class-parse.rsp");
+			Log.LogDebugMessage ("[class-parse] response file: {0}", responseFile);
+
+			using (var sw = new StreamWriter (responseFile, append: false, encoding: Files.UTF8withoutBOM)) {
+				WriteLine (sw, $"--o=\"{OutputFile}\"");
+
+				if (DocumentationPaths != null)
+					foreach (var doc in DocumentationPaths)
+						WriteLine (sw, $"--docspath=\"{doc}\"");
+
+				foreach (var doc in SourceJars)
+					WriteLine (sw, $"\"{doc}\"");
 			}
-			return true;
+
+			cmd.AppendSwitch ($"@{responseFile}");
+
+			return cmd.ToString ();
 		}
 
-		void LogEventHandler (TraceLevel type, int verbosity, string message, params object[] args)
+		void WriteLine (StreamWriter sw, string line)
 		{
-			switch (type) {
-			case TraceLevel.Error:
-				Log.LogError (message, args);
-				break;
-			case TraceLevel.Warning:
-				Log.LogWarning (message, args);
-				break;
-			case TraceLevel.Info:
-				Log.LogMessage ((MessageImportance)verbosity, message, args);
-				break;
-			default:
-				Log.LogDebugMessage (message, args);
-				break;
-
-			}
+			sw.WriteLine (line);
+			Log.LogDebugMessage (line);
 		}
 	}
 }
-

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

@@ -415,7 +415,6 @@
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj" />
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj" />
-    <ProjectReference Include="..\..\external\Java.Interop\src\Xamarin.Android.Tools.Bytecode\Xamarin.Android.Tools.Bytecode.csproj" />
     <!--
       Mono.Android.csproj needs to be built first because this project
       references files *generated* and contained within the Mono.Android project.