Add CancellationToken parameter to CancelDueToProcessExitAsync and pass from callers

Copilot · adamsitnik · Copilot · commit 2d9fec379502 · 2026-03-19T13:41:02.000Z
Co-authored-by: adamsitnik &lt;6011991+adamsitnik@users.noreply.github.com&gt;
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/AsyncStreamReader.cs
@@ -268,12 +268,12 @@ internal void CancelDueToProcessExit()
             }
         }
 
-        internal async Task CancelDueToProcessExitAsync()
+        internal async Task CancelDueToProcessExitAsync(CancellationToken cancellationToken)
         {
             Task? task = _readToBufferTask;
             if (task is not null)
             {
-                Task completed = await Task.WhenAny(task, Task.Delay(StreamDrainDefaultTimeoutMs)).ConfigureAwait(false);
+                Task completed = await Task.WhenAny(task, Task.Delay(StreamDrainDefaultTimeoutMs, cancellationToken)).ConfigureAwait(false);
                 if (completed != task)
                 {
                     _cts.Cancel();
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
@@ -1566,12 +1566,12 @@ async Task CancelStreamReadersDueToProcessExitAsync()
             {
                 if (_output is not null)
                 {
-                    await _output.CancelDueToProcessExitAsync().ConfigureAwait(false);
+                    await _output.CancelDueToProcessExitAsync(cancellationToken).ConfigureAwait(false);
                 }
 
                 if (_error is not null)
                 {
-                    await _error.CancelDueToProcessExitAsync().ConfigureAwait(false);
+                    await _error.CancelDueToProcessExitAsync(cancellationToken).ConfigureAwait(false);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -268,12 +268,12 @@ internal void CancelDueToProcessExit()`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`271`		`- internal async Task CancelDueToProcessExitAsync()`
	`271`	`+ internal async Task CancelDueToProcessExitAsync(CancellationToken cancellationToken)`
`272`	`272`	`{`
`273`	`273`	`Task? task = _readToBufferTask;`
`274`	`274`	`if (task is not null)`
`275`	`275`	`{`
`276`		`- Task completed = await Task.WhenAny(task, Task.Delay(StreamDrainDefaultTimeoutMs)).ConfigureAwait(false);`
	`276`	`+ Task completed = await Task.WhenAny(task, Task.Delay(StreamDrainDefaultTimeoutMs, cancellationToken)).ConfigureAwait(false);`
`277`	`277`	`if (completed != task)`
`278`	`278`	`{`
`279`	`279`	`_cts.Cancel();`
Original file line number	Diff line number	Diff line change
`@@ -1566,12 +1566,12 @@ async Task CancelStreamReadersDueToProcessExitAsync()`
`1566`	`1566`	`{`
`1567`	`1567`	`if (_output is not null)`
`1568`	`1568`	`{`
`1569`		`- await _output.CancelDueToProcessExitAsync().ConfigureAwait(false);`
	`1569`	`+ await _output.CancelDueToProcessExitAsync(cancellationToken).ConfigureAwait(false);`
`1570`	`1570`	`}`
`1571`	`1571`
`1572`	`1572`	`if (_error is not null)`
`1573`	`1573`	`{`
`1574`		`- await _error.CancelDueToProcessExitAsync().ConfigureAwait(false);`
	`1574`	`+ await _error.CancelDueToProcessExitAsync(cancellationToken).ConfigureAwait(false);`
`1575`	`1575`	`}`
`1576`	`1576`	`}`
`1577`	`1577`	`}`