Skip to content

Commit 8a58f4f

Browse files
Merge pull request #362 from dotnet/op-fix-runner-throwiffailed-stdout
Pass stdout to ThrowIfFailed in three runner list methods
1 parent 60d477e commit 8a58f4f

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public virtual async Task<IReadOnlyList<AdbDeviceInfo>> ListDevicesAsync (Cancel
5858
var psi = ProcessUtils.CreateProcessStartInfo (adbPath, "devices", "-l");
5959
var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
6060

61-
ProcessUtils.ThrowIfFailed (exitCode, "adb devices -l", stderr);
61+
ProcessUtils.ThrowIfFailed (exitCode, "adb devices -l", stderr, stdout);
6262

6363
var devices = ParseAdbDevicesOutput (stdout.ToString ().Split ('\n'));
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public async Task<IReadOnlyList<AvdInfo>> ListAvdsAsync (CancellationToken cance
4343
logger.Invoke (TraceLevel.Verbose, "Running: avdmanager list avd");
4444
var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
4545

46-
ProcessUtils.ThrowIfFailed (exitCode, "avdmanager list avd", stderr);
46+
ProcessUtils.ThrowIfFailed (exitCode, "avdmanager list avd", stderr, stdout);
4747

4848
return ParseAvdListOutput (stdout.ToString ());
4949
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public async Task<IReadOnlyList<string>> ListAvdNamesAsync (CancellationToken ca
105105

106106
logger.Invoke (TraceLevel.Verbose, "Running: emulator -list-avds");
107107
var exitCode = await ProcessUtils.StartProcess (psi, stdout, stderr, cancellationToken, environmentVariables).ConfigureAwait (false);
108-
ProcessUtils.ThrowIfFailed (exitCode, "emulator -list-avds", stderr);
108+
ProcessUtils.ThrowIfFailed (exitCode, "emulator -list-avds", stderr, stdout);
109109

110110
return ParseListAvdsOutput (stdout.ToString ());
111111
}

0 commit comments

Comments
 (0)