Skip to content
This repository was archived by the owner on Jul 13, 2026. It is now read-only.

Commit 2dac552

Browse files
rmarinhoCopilot
rmarinho
and
Copilot
committed
Add AdbRunner for adb CLI operations
Port adb device parsing, formatting, and merging logic from dotnet/android GetAvailableAndroidDevices MSBuild task into a shared AdbRunner class. New files: - AdbRunner.cs — ListDevicesAsync, WaitForDeviceAsync, StopEmulatorAsync, ParseAdbDevicesOutput, BuildDeviceDescription, FormatDisplayName, MapAdbStateToStatus, MergeDevicesAndEmulators - AdbDeviceInfo/AdbDeviceType/AdbDeviceStatus — device models - AndroidEnvironmentHelper — shared env var builder for all runners - ProcessUtils.ThrowIfFailed — shared exit code validation Modified files: - EnvironmentVariableNames — add ANDROID_USER_HOME, ANDROID_AVD_HOME - SdkManager.Process.cs — deduplicate env var logic via AndroidEnvironmentHelper Tests: - 43 unit tests (parsing, formatting, merging, path discovery, timeout) - 5 integration tests (CI-only, real SDK tools) Co-authored-by: Copilot <[email protected]>
1 parent f4d2f2d commit 2dac552

10 files changed

Lines changed: 1285 additions & 12 deletions

File tree

‎src/Xamarin.Android.Tools.AndroidSdk/EnvironmentVariableNames.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,17 @@ internal static class EnvironmentVariableNames
4040
/// Executable file extensions (Windows).
4141
/// </summary>
4242
public const string PathExt = "PATHEXT";
43+
44+
/// <summary>
45+
/// Overrides the default location for Android user-specific data
46+
/// (AVDs, preferences, etc.). Defaults to $HOME/.android.
47+
/// </summary>
48+
public const string AndroidUserHome = "ANDROID_USER_HOME";
49+
50+
/// <summary>
51+
/// Overrides the AVD storage directory. Takes precedence over
52+
/// <see cref="AndroidUserHome"/>/avd.
53+
/// </summary>
54+
public const string AndroidAvdHome = "ANDROID_AVD_HOME";
4355
}
4456
}

‎src/Xamarin.Android.Tools.AndroidSdk/Models/AdbDeviceInfo.cs‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Xamarin.Android.Tools;
5+
6+
/// <summary>
7+
/// Represents an Android device or emulator from 'adb devices -l' output.
8+
/// Mirrors the metadata produced by dotnet/android's GetAvailableAndroidDevices task.
9+
/// </summary>
10+
public class AdbDeviceInfo
11+
{
12+
/// <summary>
13+
/// Serial number of the device (e.g., "emulator-5554", "0A041FDD400327").
14+
/// For non-running emulators, this is the AVD name.
15+
/// </summary>
16+
public string Serial { get; set; } = string.Empty;
17+
18+
/// <summary>
19+
/// Human-friendly description of the device (e.g., "Pixel 7 API 35", "Pixel 6 Pro").
20+
/// </summary>
21+
public string Description { get; set; } = string.Empty;
22+
23+
/// <summary>
24+
/// Device type: Device or Emulator.
25+
/// </summary>
26+
public AdbDeviceType Type { get; set; }
27+
28+
/// <summary>
29+
/// Device status: Online, Offline, Unauthorized, NoPermissions, NotRunning, Unknown.
30+
/// </summary>
31+
public AdbDeviceStatus Status { get; set; }
32+
33+
/// <summary>
34+
/// AVD name for emulators (e.g., "pixel_7_api_35"). Null for physical devices.
35+
/// </summary>
36+
public string? AvdName { get; set; }
37+
38+
/// <summary>
39+
/// Device model from adb properties (e.g., "Pixel_6_Pro").
40+
/// </summary>
41+
public string? Model { get; set; }
42+
43+
/// <summary>
44+
/// Product name from adb properties (e.g., "raven").
45+
/// </summary>
46+
public string? Product { get; set; }
47+
48+
/// <summary>
49+
/// Device code name from adb properties (e.g., "raven").
50+
/// </summary>
51+
public string? Device { get; set; }
52+
53+
/// <summary>
54+
/// Transport ID from adb properties.
55+
/// </summary>
56+
public string? TransportId { get; set; }
57+
58+
/// <summary>
59+
/// Whether this device is an emulator.
60+
/// </summary>
61+
public bool IsEmulator => Type == AdbDeviceType.Emulator;
62+
}

‎src/Xamarin.Android.Tools.AndroidSdk/Models/AdbDeviceStatus.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Xamarin.Android.Tools;
5+
6+
/// <summary>
7+
/// Represents the status of an Android device.
8+
/// </summary>
9+
public enum AdbDeviceStatus
10+
{
11+
Online,
12+
Offline,
13+
Unauthorized,
14+
NoPermissions,
15+
NotRunning,
16+
Unknown
17+
}

‎src/Xamarin.Android.Tools.AndroidSdk/Models/AdbDeviceType.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Xamarin.Android.Tools;
5+
6+
/// <summary>
7+
/// Represents the type of an Android device.
8+
/// </summary>
9+
public enum AdbDeviceType
10+
{
11+
Device,
12+
Emulator
13+
}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,25 @@ static string JoinArguments (string[] args)
203203
}
204204
#endif
205205

206+
/// <summary>
207+
/// Throws <see cref="InvalidOperationException"/> when <paramref name="exitCode"/> is non-zero.
208+
/// Includes stderr/stdout context in the message when available.
209+
/// </summary>
210+
public static void ThrowIfFailed (int exitCode, string command, string? stderr = null, string? stdout = null)
211+
{
212+
if (exitCode == 0)
213+
return;
214+
215+
var message = $"'{command}' failed with exit code {exitCode}.";
216+
217+
if (!string.IsNullOrEmpty (stderr))
218+
message += $" stderr:{Environment.NewLine}{stderr!.Trim ()}";
219+
if (!string.IsNullOrEmpty (stdout))
220+
message += $" stdout:{Environment.NewLine}{stdout!.Trim ()}";
221+
222+
throw new InvalidOperationException (message);
223+
}
224+
206225
internal static IEnumerable<string> FindExecutablesInPath (string executable)
207226
{
208227
var path = Environment.GetEnvironmentVariable (EnvironmentVariableNames.Path) ?? "";

0 commit comments

Comments
 (0)