Merge adb-runner + emulator-runner + avdmanager-runner into integration

Resolves merge conflicts: keeps canonical AdbRunner from #283, adds shell
methods and virtual ListDevicesAsync for EmulatorRunner BootAndWait, keeps
updated AvdManagerRunner with resolved-path constructor from #282.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: rmarinho

src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs

@@ -225,7 +225,7 @@ internal static void ThrowIfFailed (int exitCode, string command, string? stderr
 		/// <summary>
 		/// Overload that accepts <see cref="StringWriter"/> directly so callers don't need to call ToString().
 		/// </summary>
-		internal static void ThrowIfFailed (int exitCode, string command, StringWriter? stderr = null, StringWriter? stdout = null)
+		internal static void ThrowIfFailed (int exitCode, string command, StringWriter? stderr, StringWriter? stdout = null)
 		{
 			ThrowIfFailed (exitCode, command, stderr?.ToString (), stdout?.ToString ());
 		}
@@ -262,6 +262,7 @@ internal static void ValidateNotNullOrEmpty (string? value, string paramName)
 				}
 				subdirs.Sort ((a, b) => b.version!.CompareTo (a.version));
 
+				// Check versioned directories first (highest version first), then "latest"
 				foreach (var (name, _) in subdirs) {
 					var toolPath = Path.Combine (cmdlineToolsDir, name, "bin", toolName + extension);
 					if (File.Exists (toolPath))
@@ -272,6 +273,7 @@ internal static void ValidateNotNullOrEmpty (string? value, string paramName)
 					return latestPath;
 			}
 
+			// Legacy fallback: tools/bin/<tool>
 			var legacyPath = Path.Combine (sdkPath, "tools", "bin", toolName + extension);
 			return File.Exists (legacyPath) ? legacyPath : null;
 		}

src/Xamarin.Android.Tools.AndroidSdk/Runners/AdbRunner.cs

@@ -47,7 +47,7 @@ public AdbRunner (string adbPath, IDictionary<string, string>? environmentVariab
 	/// Lists connected devices using 'adb devices -l'.
 	/// For emulators, queries the AVD name using 'adb -s &lt;serial&gt; emu avd name'.
 	/// </summary>
-	public async Task<IReadOnlyList<AdbDeviceInfo>> ListDevicesAsync (CancellationToken cancellationToken = default)
+	public virtual async Task<IReadOnlyList<AdbDeviceInfo>> ListDevicesAsync (CancellationToken cancellationToken = default)
 	{
 		using var stdout = new StringWriter ();
 		using var stderr = new StringWriter ();
@@ -135,6 +135,40 @@ public async Task StopEmulatorAsync (string serial, CancellationToken cancellati
 		ProcessUtils.ThrowIfFailed (exitCode, $"adb -s {serial} emu kill", stderr);
 	}
 
+	/// <summary>
+	/// Runs 'adb -s &lt;serial&gt; shell getprop &lt;property&gt;' and returns the first non-empty line.
+	/// </summary>
+	public virtual async Task<string?> GetShellPropertyAsync (string serial, string property, CancellationToken cancellationToken = default)
+	{
+		using var stdout = new StringWriter ();
+		using var stderr = new StringWriter ();
+		var psi = ProcessUtils.CreateProcessStartInfo (adbPath, "-s", serial, "shell", "getprop", property);
+		await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
+		return FirstNonEmptyLine (stdout.ToString ());
+	}
+
+	/// <summary>
+	/// Runs 'adb -s &lt;serial&gt; shell &lt;command&gt;' and returns the first non-empty line.
+	/// </summary>
+	public virtual async Task<string?> RunShellCommandAsync (string serial, string command, CancellationToken cancellationToken = default)
+	{
+		using var stdout = new StringWriter ();
+		using var stderr = new StringWriter ();
+		var psi = ProcessUtils.CreateProcessStartInfo (adbPath, "-s", serial, "shell", command);
+		await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
+		return FirstNonEmptyLine (stdout.ToString ());
+	}
+
+	internal static string? FirstNonEmptyLine (string output)
+	{
+		foreach (var line in output.Split (new [] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)) {
+			var trimmed = line.Trim ();
+			if (trimmed.Length > 0)
+				return trimmed;
+		}
+		return null;
+	}
+
 	/// <summary>
 	/// Parses the output lines from 'adb devices -l'.
 	/// Accepts an <see cref="IEnumerable{T}"/> to avoid allocating a joined string.

src/Xamarin.Android.Tools.AndroidSdk/Runners/AndroidEnvironmentHelper.cs

@@ -37,4 +37,15 @@ internal static Dictionary<string, string> GetEnvironmentVariables (string? sdkP
 
 		return env;
 	}
+
+	/// <summary>
+	/// Applies Android SDK environment variables directly to a <see cref="System.Diagnostics.ProcessStartInfo"/>.
+	/// Used by runners that manage their own process lifecycle (e.g., EmulatorRunner).
+	/// </summary>
+	internal static void ConfigureEnvironment (System.Diagnostics.ProcessStartInfo psi, string? sdkPath, string? jdkPath)
+	{
+		var env = GetEnvironmentVariables (sdkPath, jdkPath);
+		foreach (var kvp in env)
+			psi.Environment [kvp.Key] = kvp.Value;
+	}
 }

src/Xamarin.Android.Tools.AndroidSdk/Runners/AvdManagerRunner.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -16,91 +15,39 @@ namespace Xamarin.Android.Tools;
 /// </summary>
 public class AvdManagerRunner
 {
-	readonly Func<string?> getSdkPath;
-	readonly Func<string?>? getJdkPath;
+	readonly string avdManagerPath;
+	readonly IDictionary<string, string>? environmentVariables;
 
-	public AvdManagerRunner (Func<string?> getSdkPath)
-		: this (getSdkPath, null)
-	{
-	}
-
-	public AvdManagerRunner (Func<string?> getSdkPath, Func<string?>? getJdkPath)
-	{
-		this.getSdkPath = getSdkPath ?? throw new ArgumentNullException (nameof (getSdkPath));
-		this.getJdkPath = getJdkPath;
-	}
-
-	public string? AvdManagerPath {
-		get {
-			var sdkPath = getSdkPath ();
-			if (string.IsNullOrEmpty (sdkPath))
-				return null;
-
-			var ext = OS.IsWindows ? ".bat" : "";
-			var cmdlineToolsDir = Path.Combine (sdkPath, "cmdline-tools");
-
-			if (Directory.Exists (cmdlineToolsDir)) {
-				// Versioned dirs sorted descending, then "latest" as fallback
-				var searchDirs = Directory.GetDirectories (cmdlineToolsDir)
-					.Select (Path.GetFileName)
-					.Where (n => n != "latest" && !string.IsNullOrEmpty (n))
-					.OrderByDescending (n => Version.TryParse (n, out var v) ? v : new Version (0, 0))
-					.Append ("latest");
-
-				foreach (var dir in searchDirs) {
-					var toolPath = Path.Combine (cmdlineToolsDir, dir!, "bin", "avdmanager" + ext);
-					if (File.Exists (toolPath))
-						return toolPath;
-				}
-			}
-
-			// Legacy fallback: tools/bin/avdmanager
-			var legacyPath = Path.Combine (sdkPath, "tools", "bin", "avdmanager" + ext);
-			return File.Exists (legacyPath) ? legacyPath : null;
-		}
-	}
-
-	public bool IsAvailable => !string.IsNullOrEmpty (AvdManagerPath);
-
-	string RequireAvdManagerPath ()
-	{
-		return AvdManagerPath ?? throw new InvalidOperationException ("AVD Manager not found.");
-	}
-
-	void ConfigureEnvironment (ProcessStartInfo psi)
+	/// <summary>
+	/// Creates a new AvdManagerRunner with the full path to the avdmanager executable.
+	/// </summary>
+	/// <param name="avdManagerPath">Full path to avdmanager (e.g., "/path/to/sdk/cmdline-tools/latest/bin/avdmanager").</param>
+	/// <param name="environmentVariables">Optional environment variables to pass to avdmanager processes.</param>
+	public AvdManagerRunner (string avdManagerPath, IDictionary<string, string>? environmentVariables = null)
 	{
-		AndroidEnvironmentHelper.ConfigureEnvironment (psi, getSdkPath (), getJdkPath?.Invoke ());
+		if (string.IsNullOrWhiteSpace (avdManagerPath))
+			throw new ArgumentException ("Path to avdmanager must not be empty.", nameof (avdManagerPath));
+		this.avdManagerPath = avdManagerPath;
+		this.environmentVariables = environmentVariables;
 	}
 
 	public async Task<IReadOnlyList<AvdInfo>> ListAvdsAsync (CancellationToken cancellationToken = default)
 	{
-		var avdManagerPath = RequireAvdManagerPath ();
-
 		using var stdout = new StringWriter ();
 		using var stderr = new StringWriter ();
 		var psi = ProcessUtils.CreateProcessStartInfo (avdManagerPath, "list", "avd");
-		ConfigureEnvironment (psi);
-		var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken).ConfigureAwait (false);
+		var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
 
-		if (exitCode != 0)
-			throw new InvalidOperationException ($"avdmanager list avd failed (exit code {exitCode}): {stderr.ToString ().Trim ()}");
+		ProcessUtils.ThrowIfFailed (exitCode, "avdmanager list avd", stderr);
 
 		return ParseAvdListOutput (stdout.ToString ());
 	}
 
 	public async Task<AvdInfo> CreateAvdAsync (string name, string systemImage, string? deviceProfile = null,
 		bool force = false, CancellationToken cancellationToken = default)
 	{
-		if (name is null)
-			throw new ArgumentNullException (nameof (name));
-		if (name.Length == 0)
-			throw new ArgumentException ("Value cannot be an empty string.", nameof (name));
-		if (systemImage is null)
-			throw new ArgumentNullException (nameof (systemImage));
-		if (systemImage.Length == 0)
-			throw new ArgumentException ("Value cannot be an empty string.", nameof (systemImage));
-
-		var avdManagerPath = RequireAvdManagerPath ();
+		ProcessUtils.ValidateNotNullOrEmpty (name, nameof (name));
+		ProcessUtils.ValidateNotNullOrEmpty (systemImage, nameof (systemImage));
 
 		// Check if AVD already exists — return it instead of failing
 		if (!force) {
@@ -116,7 +63,7 @@ public async Task<AvdInfo> CreateAvdAsync (string name, string systemImage, stri
 			force = true;
 
 		var args = new List<string> { "create", "avd", "-n", name, "-k", systemImage };
-		if (!string.IsNullOrEmpty (deviceProfile))
+		if (deviceProfile is { Length: > 0 })
 			args.AddRange (new [] { "-d", deviceProfile });
 		if (force)
 			args.Add ("--force");
@@ -125,10 +72,9 @@ public async Task<AvdInfo> CreateAvdAsync (string name, string systemImage, stri
 		using var stderr = new StringWriter ();
 		var psi = ProcessUtils.CreateProcessStartInfo (avdManagerPath, args.ToArray ());
 		psi.RedirectStandardInput = true;
-		ConfigureEnvironment (psi);
 
 		// avdmanager prompts "Do you wish to create a custom hardware profile?" — answer "no"
-		var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken,
+		var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables,
 			onStarted: p => {
 				try {
 					p.StandardInput.WriteLine ("no");
@@ -138,12 +84,7 @@ public async Task<AvdInfo> CreateAvdAsync (string name, string systemImage, stri
 				}
 			}).ConfigureAwait (false);
 
-		if (exitCode != 0) {
-			var errorOutput = stderr.ToString ().Trim ();
-			if (string.IsNullOrEmpty (errorOutput))
-				errorOutput = stdout.ToString ().Trim ();
-			throw new InvalidOperationException ($"Failed to create AVD '{name}': {errorOutput}");
-		}
+		ProcessUtils.ThrowIfFailed (exitCode, $"avdmanager create avd -n {name}", stderr, stdout);
 
 		// Re-list to get the actual path from avdmanager (respects ANDROID_USER_HOME/ANDROID_AVD_HOME)
 		var avds = await ListAvdsAsync (cancellationToken).ConfigureAwait (false);
@@ -161,20 +102,13 @@ public async Task<AvdInfo> CreateAvdAsync (string name, string systemImage, stri
 
 	public async Task DeleteAvdAsync (string name, CancellationToken cancellationToken = default)
 	{
-		if (name is null)
-			throw new ArgumentNullException (nameof (name));
-		if (name.Length == 0)
-			throw new ArgumentException ("Value cannot be an empty string.", nameof (name));
-
-		var avdManagerPath = RequireAvdManagerPath ();
+		ProcessUtils.ValidateNotNullOrEmpty (name, nameof (name));
 
 		using var stderr = new StringWriter ();
 		var psi = ProcessUtils.CreateProcessStartInfo (avdManagerPath, "delete", "avd", "--name", name);
-		ConfigureEnvironment (psi);
-		var exitCode = await ProcessUtils.StartProcess (psi, null, stderr, cancellationToken).ConfigureAwait (false);
+		var exitCode = await ProcessUtils.StartProcess (psi, null, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
 
-		if (exitCode != 0)
-			throw new InvalidOperationException ($"Failed to delete AVD '{name}': {stderr.ToString ().Trim ()}");
+		ProcessUtils.ThrowIfFailed (exitCode, $"avdmanager delete avd --name {name}", stderr);
 	}
 
 	internal static List<AvdInfo> ParseAvdListOutput (string output)
@@ -208,13 +142,13 @@ internal static List<AvdInfo> ParseAvdListOutput (string output)
 	static string GetAvdRootDirectory ()
 	{
 		// ANDROID_AVD_HOME takes highest priority
-		var avdHome = Environment.GetEnvironmentVariable ("ANDROID_AVD_HOME");
-		if (!string.IsNullOrEmpty (avdHome))
+		var avdHome = Environment.GetEnvironmentVariable (EnvironmentVariableNames.AndroidAvdHome);
+		if (avdHome is { Length: > 0 })
 			return avdHome;
 
 		// ANDROID_USER_HOME/avd is the next option
 		var userHome = Environment.GetEnvironmentVariable (EnvironmentVariableNames.AndroidUserHome);
-		if (!string.IsNullOrEmpty (userHome))
+		if (userHome is { Length: > 0 })
 			return Path.Combine (userHome, "avd");
 
 		// Default: ~/.android/avd