use WaitForExitAsync instead of Exited event to ensure process output…

… is read (#3275) * use WaitForExitAsync instead of Exited event to ensure process output is read
dotnet · Apr 8, 2024 · 3d82b0f · davidfowl · Apr 8, 2024 · 3d82b0f
1 parent e5605b8
commit 3d82b0f
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/Aspire.Hosting/Dcp/Process/ProcessUtil.cs b/src/Aspire.Hosting/Dcp/Process/ProcessUtil.cs
@@ -83,21 +83,6 @@ public static (Task<ProcessResult>, IAsyncDisposable) Run(ProcessSpec processSpe
 
         var processLifetimeTcs = new TaskCompletionSource<ProcessResult>();
 
-        process.Exited += (_, e) =>
-        {
-            startupComplete.Wait();
-
-            if (processSpec.ThrowOnNonZeroReturnCode && process.ExitCode != 0)
-            {
-                processLifetimeTcs.TrySetException(new InvalidOperationException(
-                    $"Command {processSpec.ExecutablePath} {processSpec.Arguments} returned non-zero exit code {process.ExitCode}"));
-            }
-            else
-            {
-                processLifetimeTcs.TrySetResult(new ProcessResult(process.ExitCode));
-            }
-        };
-
         try
         {
 #if ASPIRE_EVENTSOURCE
@@ -108,6 +93,21 @@ public static (Task<ProcessResult>, IAsyncDisposable) Run(ProcessSpec processSpe
             process.BeginOutputReadLine();
             process.BeginErrorReadLine();
             processSpec.OnStart?.Invoke(process.Id);
+
+            process.WaitForExitAsync().ContinueWith(t =>
+            {
+                startupComplete.Wait();
+
+                if (processSpec.ThrowOnNonZeroReturnCode && process.ExitCode != 0)
+                {
+                    processLifetimeTcs.TrySetException(new InvalidOperationException(
+                        $"Command {processSpec.ExecutablePath} {processSpec.Arguments} returned non-zero exit code {process.ExitCode}"));
+                }
+                else
+                {
+                    processLifetimeTcs.TrySetResult(new ProcessResult(process.ExitCode));
+                }
+            }, TaskScheduler.Default);
         }
         finally
         {