Use MonoAndroidHelper.RunProcess

Author: grendello

src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs

@@ -52,7 +52,13 @@ void AppendLines (string prefix, List<string> lines, StringBuilder sb)
 			}
 		}
 
-		public static int RunProcess (string command, string arguments, TaskLoggingHelper log, DataReceivedEventHandler? onOutput = null, DataReceivedEventHandler? onError = null)
+		public static int RunProcess (string command, string arguments, TaskLoggingHelper log, DataReceivedEventHandler? onOutput = null, DataReceivedEventHandler? onError = null, CancellationToken? cancellationToken = null, Action? cancelTask = null, bool logWarningOnFailure = true)
+		{
+			return RunProcess ("Running process", command, arguments, log, onOutput, onError, cancellationToken, cancelTask, logWarningOnFailure);
+		}
+
+		public static int RunProcess (string logLabel, string command, string arguments, TaskLoggingHelper log, DataReceivedEventHandler? onOutput = null, DataReceivedEventHandler? onError = null,
+			CancellationToken? cancellationToken = null, Action? cancelTask = null, bool logWarningOnFailure = true)
 		{
 			var stdout_completed = new ManualResetEvent (false);
 			var stderr_completed = new ManualResetEvent (false);
@@ -69,7 +75,7 @@ public static int RunProcess (string command, string arguments, TaskLoggingHelpe
 			var stdoutLines = new List<string> ();
 			var stderrLines = new List<string> ();
 
-			log.LogDebugMessage ($"Running process: {psi.FileName} {psi.Arguments}");
+			log.LogDebugMessage ($"{logLabel}: {psi.FileName} {psi.Arguments}");
 			using var proc = new Process ();
 			proc.OutputDataReceived += (s, e) => {
 				if (e.Data != null) {
@@ -91,6 +97,7 @@ public static int RunProcess (string command, string arguments, TaskLoggingHelpe
 			proc.Start ();
 			proc.BeginOutputReadLine ();
 			proc.BeginErrorReadLine ();
+			cancellationToken?.Register (() => { try { proc.Kill (); } catch (Exception) { } });
 			proc.WaitForExit ();
 
 			if (psi.RedirectStandardError) {
@@ -101,9 +108,13 @@ public static int RunProcess (string command, string arguments, TaskLoggingHelpe
 				stdout_completed.WaitOne (TimeSpan.FromSeconds (30));
 			}
 
+			log.LogDebugMessage ($"{logLabel}: exit code == {proc.ExitCode}");
 			if (proc.ExitCode != 0) {
-				var sb = MergeStdoutAndStderrMessages (stdoutLines, stderrLines);
-				log.LogCodedError ("XA0142", Properties.Resources.XA0142, $"{psi.FileName} {psi.Arguments}", sb.ToString ());
+				if (logWarningOnFailure) {
+					var sb = MergeStdoutAndStderrMessages (stdoutLines, stderrLines);
+					log.LogCodedError ("XA0142", Properties.Resources.XA0142, $"{psi.FileName} {psi.Arguments}", sb.ToString ());
+				}
+				cancelTask?.Invoke ();
 			}
 
 			try {

src/Xamarin.Android.Build.Tasks/Utilities/NativeLinker.cs

@@ -356,62 +356,31 @@ bool RunLinker (List<string> args, ITaskItem outputSharedLibrary)
 
 	bool RunCommand (string label, string binaryPath, List<string> args, List<string> stdoutLines, List<string> stderrLines)
 	{
-		using var stdout_completed = new ManualResetEvent (false);
-		using var stderr_completed = new ManualResetEvent (false);
-		var psi = new ProcessStartInfo () {
-			FileName = binaryPath,
-			Arguments = String.Join (" ", args),
-			UseShellExecute = false,
-			RedirectStandardOutput = true,
-			RedirectStandardError = true,
-			CreateNoWindow = true,
-			WindowStyle = ProcessWindowStyle.Hidden,
-		};
-
 		string binaryName = Path.GetFileName (ld);
-		log.LogDebugMessage ($"[{label}] {psi.FileName} {psi.Arguments}");
-
-		using var proc = new Process ();
-		proc.OutputDataReceived += (s, e) => {
-			if (e.Data != null) {
+		return MonoAndroidHelper.RunProcess (
+			label,
+			binaryPath,
+			String.Join (" ", args),
+			log,
+			onOutput: (s, e) => {
+				if (e.Data == null) {
+					return;
+				}
 				OnOutputData (binaryName, s, e);
 				stdoutLines.Add (e.Data);
-			} else {
-				stdout_completed.Set ();
-			}
-		};
+			},
+			onError: (s, e) => {
+				if (e.Data != null) {
+					return;
+				}
 
-		proc.ErrorDataReceived += (s, e) => {
-			if (e.Data != null) {
 				OnErrorData (binaryName, s, e);
 				stderrLines.Add (e.Data);
-			} else {
-				stderr_completed.Set ();
-			}
-		};
-
-		proc.StartInfo = psi;
-		proc.Start ();
-		proc.BeginOutputReadLine ();
-		proc.BeginErrorReadLine ();
-		cancellationToken?.Register (() => { try { proc.Kill (); } catch (Exception) { } });
-		proc.WaitForExit ();
-
-		if (psi.RedirectStandardError) {
-			stderr_completed.WaitOne (TimeSpan.FromSeconds (30));
-		}
-
-		if (psi.RedirectStandardOutput) {
-			stdout_completed.WaitOne (TimeSpan.FromSeconds (30));
-		}
-
-		log.LogDebugMessage ($"[{label}] exit code == {proc.ExitCode}");
-		if (proc.ExitCode != 0) {
-			cancelTask?.Invoke ();
-			return false;
-		}
-
-		return true;
+			},
+			cancellationToken,
+			cancelTask,
+			logWarningOnFailure: false
+		) == 0;
 	}
 
 	void OnOutputData (string linkerName, object sender, DataReceivedEventArgs e)