Fix 'conjure-xamarin-android-cecil'

Author: jpobst

Configuration.props

@@ -231,7 +231,7 @@
     <AndroidSupportedTargetAotAbisSplit>$(AndroidSupportedTargetAotAbis.Split(':'))</AndroidSupportedTargetAotAbisSplit>
   </PropertyGroup>
   <PropertyGroup>
-    <RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref\remap-assembly-ref.exe</RemapAssemblyRefToolExecutable>
+    <RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref\remap-assembly-ref.dll</RemapAssemblyRefToolExecutable>
     <RemapAssemblyRefTool>$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;$(RemapAssemblyRefToolExecutable)&quot;</RemapAssemblyRefTool>
   </PropertyGroup>
 

build-tools/xaprepare/xaprepare/Application/Utilities.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Reflection;
@@ -796,6 +797,25 @@ public static bool RunCommand (string command, string? workingDirectory, bool ec
 			return runner.Run ();
 		}
 
+		public static bool RunManagedCommand (string command, string workingDirectory, bool ignoreEmptyArguments, params string [] arguments)
+		{
+			return RunManagedCommand (command, workingDirectory, echoStderr: true, ignoreEmptyArguments: ignoreEmptyArguments, arguments: arguments);
+		}
+
+		// This is a managed assembly that needs to be run as 'dotnet foo.dll'
+		public static bool RunManagedCommand (string command, string? workingDirectory, bool echoStderr, bool ignoreEmptyArguments, params string [] arguments)
+		{
+			if (string.IsNullOrEmpty (command))
+				throw new ArgumentException ("must not be null or empty", nameof (command));
+
+			var runner = new ProcessRunner ("dotnet", ignoreEmptyArguments, new [] { command }.Concat (arguments).ToArray ()) {
+				EchoStandardError = echoStderr,
+				WorkingDirectory = workingDirectory,
+			};
+
+			return runner.Run ();
+		}
+
 		public static string GetStringFromStdout (string command, params string?[] arguments)
 		{
 			return GetStringFromStdout (command, throwOnErrors: false, trimTrailingWhitespace: true, arguments: arguments);

build-tools/xaprepare/xaprepare/Steps/Step_InstallMonoRuntimes.cs

@@ -106,17 +106,14 @@ async Task<bool> ConjureXamarinCecilAndRemapRef (Context context, bool haveManag
 			}
 
 			StatusStep (context, "Conjuring Xamarin.Android.Cecil and Xamari.Android.Cecil.Mdb");
-			string conjurer = Path.Combine (Configurables.Paths.BuildBinDir, "conjure-xamarin-android-cecil.exe");
-			string conjurerSourceDir = Configurables.Paths.MonoProfileToolsDir;
-			string conjurerDestDir = Configurables.Paths.BuildBinDir;
+			string conjurer = Path.Combine (Configurables.Paths.BuildBinDir, "conjure-xamarin-android-cecil.dll");
 
-			result = Utilities.RunCommand (
-				haveManagedRuntime ? managedRuntime : conjurer, // command
+			result = Utilities.RunManagedCommand (
+				conjurer, // command
 				BuildPaths.XamarinAndroidSourceRoot, // workingDirectory
 				true, // ignoreEmptyArguments
 
 				// arguments
-				haveManagedRuntime ? conjurer : String.Empty,
 				Configurables.Paths.MonoProfileToolsDir, // source dir
 				Configurables.Paths.BuildBinDir // destination dir
 			);
@@ -174,13 +171,12 @@ bool InstallUtilities (Context context, bool haveManagedRuntime, string managedR
 
 				string relDestFilePath = Utilities.GetRelativePath (BuildPaths.XamarinAndroidSourceRoot, destFilePath);
 				StatusSubStep (context, $"Remapping Cecil references for {relDestFilePath}");
-				bool result = Utilities.RunCommand (
-					haveManagedRuntime ? managedRuntime : remapper, // command
+				bool result = Utilities.RunManagedCommand (
+					remapper, // command
 					BuildPaths.XamarinAndroidSourceRoot, // workingDirectory
 					true, // ignoreEmptyArguments
 
 					// arguments
-					haveManagedRuntime ? remapper : String.Empty,
 					Utilities.GetRelativePath (BuildPaths.XamarinAndroidSourceRoot, muf.SourcePath),
 					relDestFilePath,
 					"Mono.Cecil",

build-tools/xaprepare/xaprepare/ToolRunners/ConjureXamarinAndroidCecil.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xamarin.Android.Prepare
+{
+	partial class ConjureXamarinAndroidCecilRunner : ToolRunner
+	{
+		protected override string DefaultToolExecutableName => "dotnet";
+		protected override string ToolName                  => "dotnet";
+
+		public List<string> StandardArguments { get; }
+
+		public ConjureXamarinAndroidCecilRunner (Context context, Log? log = null, string? msbuildPath = null)
+			: base (context, log, msbuildPath)
+		{
+			ProcessTimeout = TimeSpan.FromMinutes (1);
+
+			StandardArguments = new List<string> {
+				Path.Combine (Configurables.Paths.BuildBinDir, "conjure-xamarin-android-cecil.dll"),
+			};
+		}
+
+		public async Task<bool> Run (string logTag, List<string>? arguments = null, string? workingDirectory = null)
+		{
+			if (string.IsNullOrEmpty (logTag))
+				throw new ArgumentException ("must not be null or empty", nameof (logTag));
+
+			if (string.IsNullOrEmpty (workingDirectory))
+				workingDirectory = BuildPaths.XamarinAndroidSourceRoot;
+
+			ProcessRunner runner = CreateProcessRunner ();
+
+			AddArguments (runner, StandardArguments);
+			AddArguments (runner, arguments);
+
+			string message = GetLogMessage (runner);
+			Log.Info (message, CommandMessageColor);
+			Log.StatusLine ();
+
+			try {
+				return await RunTool (
+					() => {
+						using (var outputSink = (OutputSink)SetupOutputSink (runner, $"conjurer.{logTag}")) {
+							runner.WorkingDirectory = workingDirectory;
+							StartTwiddler ();
+							return runner.Run ();
+						}
+					}
+				);
+			} finally {
+				StopTwiddler ();
+			}
+		}
+
+		protected override TextWriter CreateLogSink (string? logFilePath)
+		{
+			return new OutputSink (Log, logFilePath);
+		}
+
+		class OutputSink : ToolRunner.ToolOutputSink
+		{
+			public override Encoding Encoding => Encoding.Default;
+
+			public OutputSink (Log log, string? logFilePath)
+				: base (log, logFilePath)
+			{
+			}
+		}
+	}
+}