Add AvdManagerRunner for avdmanager CLI operations by rmarinho · Pull Request #282 · dotnet/android-tools

rmarinho · 2026-02-23T17:39:13Z

Summary

Wraps avdmanager CLI operations for programmatic AVD management. Addresses #277.

Changes

New constructor overload with JDK path

public AvdManagerRunner (Func<string?> getSdkPath, Func<string?>? getJdkPath)

Sets JAVA_HOME and ANDROID_HOME on all child process ProcessStartInfo via ConfigureEnvironment().
The existing 1-arg constructor remains backward compatible.

New: CreateAvdAsync

Duplicate detection: checks ListAvdsAsync first, returns existing AVD if name matches
Orphaned AVD handling: detects .avd directory without .ini registration and auto-applies --force
stdin handling: answers "no" to avdmanager hardware profile customization prompt
Error reporting: captures stdout/stderr and throws InvalidOperationException on failure

New: ParseAvdListOutput (internal static)

Extracted from ListAvdsAsync for testability.

Updated: ListAvdsAsync / DeleteAvdAsync

Now call ConfigureEnvironment(psi) before ProcessUtils.StartProcess to pass JAVA_HOME.

Why

avdmanager.bat requires JAVA_HOME to locate the JVM. Without it, operations fail silently on Windows when the system JAVA_HOME is stale or missing.

Copilot

Pull request overview

Adds a new “runner” layer to Xamarin.Android.Tools.AndroidSdk to execute Android SDK command-line tools programmatically, with an initial AvdManagerRunner implementation for creating/listing/deleting AVDs.

Changes:

Introduces AndroidToolRunner for running SDK tools with timeout/stdout/stderr capture (sync + async) and a background-start helper.
Adds AvdManagerRunner to locate and invoke avdmanager, parse list avd output, and enrich results from config.ini.
Adds supporting models (ToolRunnerResult, AvdInfo) and environment setup utilities (AndroidEnvironmentHelper).

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
src/Xamarin.Android.Tools.AndroidSdk/Runners/AvdManagerRunner.cs	Adds an `avdmanager` wrapper with list/create/delete and output parsing/enrichment.
src/Xamarin.Android.Tools.AndroidSdk/Runners/AndroidToolRunner.cs	Adds process execution utilities (sync/async + background start).
src/Xamarin.Android.Tools.AndroidSdk/Runners/AndroidEnvironmentHelper.cs	Provides JAVA_HOME / ANDROID_HOME setup plus ABI/API/tag mapping helpers.
src/Xamarin.Android.Tools.AndroidSdk/Models/ToolRunnerResult.cs	Introduces a result type for tool execution (typed + untyped).
src/Xamarin.Android.Tools.AndroidSdk/Models/AvdInfo.cs	Adds an AVD info model used by `AvdManagerRunner`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-23T17:42:24Z

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

+			return new AvdInfo {
+				Name = name,
+				DeviceProfile = device,
+				Path = path,
+				SystemImage = target,
+				Target = target
+			};


CreateAvdFromParsedData assigns SystemImage = target and Target = target. The parsed value here is the human-readable “Target:”/“Based on:” text, not the system image package path (e.g., system-images;android-33;...). This makes AvdInfo.SystemImage misleading for listed AVDs; consider leaving SystemImage null here or parsing the actual system image from config.ini (image.sysdir.1) and keeping Target as the display string.

Copilot · 2026-02-23T17:42:24Z

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

+				"google_apis_playstore" => "Google API's, Play Store",
+				"google_apis" => playStoreEnabled ? "Google API's, Play Store" : "Google API's",


MapTagIdToDisplayName uses "Google API's" (apostrophe) in user-facing strings; this is grammatically incorrect and inconsistent with common naming (“Google APIs”). Update the strings to “Google APIs” / “Google APIs, Play Store”.

Suggested change

"google_apis_playstore" => "Google API's, Play Store",

"google_apis" => playStoreEnabled ? "Google API's, Play Store" : "Google API's",

"google_apis_playstore" => "Google APIs, Play Store",

"google_apis" => playStoreEnabled ? "Google APIs, Play Store" : "Google APIs",

Copilot · 2026-02-23T17:42:25Z

src/Xamarin.Android.Tools.AndroidSdk/Models/AvdInfo.cs

+	public class AvdInfo
+	{
+		/// <summary>
+		/// AVD name (unique identifier).
+		/// </summary>
+		public string Name { get; set; } = string.Empty;
+
+		/// <summary>
+		/// Device profile (e.g., "pixel_6", "Nexus 5X").
+		/// </summary>
+		public string? DeviceProfile { get; set; }
+


AvdInfo is described in the PR as a record with a small fixed shape, but the implementation is a mutable class with different property names (DeviceProfile/SystemImage/etc.) and additional fields. This is a public API surface difference; either align the type/signature with the PR description or update the PR description so downstream consumers (and source compatibility expectations) match reality.

Copilot · 2026-02-23T17:42:25Z

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

+		List<AvdInfo> ParseAvdList (string output)
+		{
+			var avds = new List<AvdInfo> ();
+			var lines = output.Split ('\n');
+
+			string? currentName = null;
+			string? currentDevice = null;
+			string? currentPath = null;
+			string? currentTarget = null;
+
+			foreach (var line in lines) {
+				var trimmed = line.Trim ();
+
+				if (trimmed.StartsWith ("Name:")) {
+					// Save previous AVD if exists
+					if (currentName != null) {
+						var avd = CreateAvdFromParsedData (currentName, currentDevice, currentPath, currentTarget);
+						avds.Add (avd);
+					}
+					currentName = trimmed.Substring (5).Trim ();
+					currentDevice = null;
+					currentPath = null;
+					currentTarget = null;
+				} else if (trimmed.StartsWith ("Device:")) {
+					currentDevice = trimmed.Substring (7).Trim ();
+				} else if (trimmed.StartsWith ("Path:")) {
+					currentPath = trimmed.Substring (5).Trim ();
+				} else if (trimmed.StartsWith ("Target:")) {
+					currentTarget = trimmed.Substring (7).Trim ();
+				} else if (trimmed.StartsWith ("Based on:")) {
+					if (currentTarget == null)
+						currentTarget = trimmed.Substring (9).Trim ();
+				}
+			}
+
+			// Don't forget the last one
+			if (currentName != null) {
+				var avd = CreateAvdFromParsedData (currentName, currentDevice, currentPath, currentTarget);
+				avds.Add (avd);
+			}
+
+			// Enrich AVDs with config.ini data
+			for (int i = 0; i < avds.Count; i++) {
+				var avd = avds [i];
+				if (!string.IsNullOrEmpty (avd.Path)) {
+					var configPath = Path.Combine (avd.Path, "config.ini");
+					if (File.Exists (configPath)) {
+						avds [i] = EnrichAvdFromConfig (avd, configPath);
+					}
+				}
+			}
+
+			return avds;
+		}


ParseAvdList and EnrichAvdFromConfig implement non-trivial parsing logic of avdmanager output and config.ini. There are existing unit tests in this repo; adding focused tests for representative avdmanager outputs (including Windows/Unix newlines and multiple AVD entries) would help prevent regressions.

Copilot · 2026-02-23T17:42:25Z

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

+			process.StartInfo = new ProcessStartInfo {
+				FileName = fileName,
+				Arguments = arguments,
+				WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory,
+				UseShellExecute = false,
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+				CreateNoWindow = true
+			};


AndroidToolRunner sets UseShellExecute=false and executes the provided fileName directly. On Windows, avdmanager/sdkmanager are typically .bat scripts, which cannot be launched this way (CreateProcess will fail). Consider detecting .bat/.cmd and invoking via cmd.exe /c (while still capturing output), or otherwise adjusting execution so cmdline-tools work on Windows.

Copilot · 2026-02-23T17:42:25Z

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

+		public static ToolRunnerResult Run (
+			string fileName,
+			string arguments = "",
+			string? workingDirectory = null,
+			Dictionary<string, string>? environmentVariables = null,
+			TimeSpan? timeout = null,
+			CancellationToken cancellationToken = default)
+		{


Run(...) accepts a CancellationToken but never observes it (no registration / no early exit). This makes the API misleading and can leave callers unable to cancel long-running synchronous operations. Either honor cancellation (kill process on cancellation) or remove the parameter.

Copilot · 2026-02-23T17:42:26Z

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

+					RedirectStandardOutput = true,
+					RedirectStandardError = true,


StartBackground redirects stdout/stderr but never reads from them. This can cause the child process to block once OS pipe buffers fill (common for emulator output), effectively hanging the background process. For true background start, avoid redirection or actively drain the streams.

Suggested change

RedirectStandardOutput = true,

RedirectStandardError = true,

RedirectStandardOutput = false,

RedirectStandardError = false,

Copilot · 2026-02-23T17:42:26Z

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

+	public class AvdManagerRunner
+	{
+		readonly Func<string?> getSdkPath;
+		readonly Func<string?> getJdkPath;
+


PR description advertises additional APIs (e.g., ListDevicesAsync/ListTargetsAsync) and different return types, but AvdManagerRunner currently only implements list/create/delete and returns ToolRunnerResult-wrapped results. Either implement the missing APIs or update the PR description/new API section so consumers don’t code against an API that isn’t present.

jonathanpeppers · 2026-02-23T18:08:51Z

I'd like to get the System.Diagnostics.Process code unified like mentioned here:

Add base Android tool runner infrastructure #281 (comment)

Addresses PR #282 feedback to use existing ProcessUtils instead of the removed AndroidToolRunner. Simplifies API: - Methods now throw InvalidOperationException on failure instead of returning result types with error states - Uses ProcessUtils.RunToolAsync() for all tool invocations - Simplified AvdInfo model - Removed complex ToolRunnerResult<T> wrapper types Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

- ListAvdsAsync(): List configured AVDs - DeleteAvdAsync(): Delete an AVD Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

- Add XML documentation to all public members - Split AvdInfo into its own file (one type per file) - Use 'is not null' instead of '!= null' - Improve code formatting Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

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

- Add optional Func<string?> getJdkPath constructor parameter - ConfigureEnvironment() sets JAVA_HOME and ANDROID_HOME on all ProcessStartInfo - Add CreateAvdAsync with duplicate detection, orphaned AVD directory handling, stdin 'no' for hardware profile prompt - Extract ParseAvdListOutput as internal static for testability - Backward compatible: existing 1-arg constructor still works Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

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

Copilot AI review requested due to automatic review settings February 23, 2026 17:39

Copilot started reviewing on behalf of rmarinho February 23, 2026 17:39 View session

Copilot AI reviewed Feb 23, 2026

View reviewed changes

rmarinho added the copilot `copilot-cli` or other AIs were used to author this label Feb 23, 2026

rmarinho force-pushed the feature/avdmanager-runner branch 3 times, most recently from c9b6445 to 4f42441 Compare February 24, 2026 19:09

rmarinho and others added 5 commits February 26, 2026 17:31

Add AvdManagerRunner for avdmanager CLI operations

ce00dac

- ListAvdsAsync(): List configured AVDs - DeleteAvdAsync(): Delete an AVD Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Refactor AvdManagerRunner per copilot instructions

2d2bd8f

- Add XML documentation to all public members - Split AvdInfo into its own file (one type per file) - Use 'is not null' instead of '!= null' - Improve code formatting Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix indentation: add tab indentation per Mono coding guidelines

de552a2

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

Trim verbose XML docs, make AvdManagerPath internal

d71ca03

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

rmarinho force-pushed the feature/avdmanager-runner branch from cef13bb to d71ca03 Compare February 26, 2026 17:31

Make AvdManagerPath public for consumer access

0428515

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add AvdManagerRunner for avdmanager CLI operations#282

Add AvdManagerRunner for avdmanager CLI operations#282
rmarinho wants to merge 6 commits intomainfrom
feature/avdmanager-runner

rmarinho commented Feb 23, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

Copilot AI Feb 23, 2026

Uh oh!

jonathanpeppers commented Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		"google_apis_playstore" => "Google API's, Play Store",
		"google_apis" => playStoreEnabled ? "Google API's, Play Store" : "Google API's",

Conversation

rmarinho commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

New constructor overload with JDK path

New: CreateAvdAsync

New: ParseAvdListOutput (internal static)

Updated: ListAvdsAsync / DeleteAvdAsync

Why

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

jonathanpeppers commented Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rmarinho commented Feb 23, 2026 •

edited

Loading