From aeb93a8dee7a9ac6b6def9dd2acb6e6645030ea3 Mon Sep 17 00:00:00 2001 From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com> Date: Sat, 16 Apr 2022 14:35:23 +0000 Subject: [PATCH] Keep standard stream names consistent --- CliWrap/Command.cs | 12 ++++++------ CliWrap/Utils/ProcessEx.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CliWrap/Command.cs b/CliWrap/Command.cs index 23c7da03..e24cf6c4 100644 --- a/CliWrap/Command.cs +++ b/CliWrap/Command.cs @@ -379,7 +379,7 @@ private async Task PipeStandardInputAsync( ProcessEx process, CancellationToken cancellationToken = default) { - await using (process.StdIn.WithAsyncDisposableAdapter()) + await using (process.StandardInput.WithAsyncDisposableAdapter()) { try { @@ -388,7 +388,7 @@ private async Task PipeStandardInputAsync( // This is important with stdin because the process might finish before // the pipe completes, and in case with infinite input stream it would // normally result in a deadlock. - await StandardInputPipe.CopyToAsync(process.StdIn, cancellationToken) + await StandardInputPipe.CopyToAsync(process.StandardInput, cancellationToken) .WithUncooperativeCancellation(cancellationToken) .ConfigureAwait(false); } @@ -406,9 +406,9 @@ private async Task PipeStandardOutputAsync( ProcessEx process, CancellationToken cancellationToken = default) { - await using (process.StdOut.WithAsyncDisposableAdapter()) + await using (process.StandardOutput.WithAsyncDisposableAdapter()) { - await StandardOutputPipe.CopyFromAsync(process.StdOut, cancellationToken) + await StandardOutputPipe.CopyFromAsync(process.StandardOutput, cancellationToken) .ConfigureAwait(false); } } @@ -417,9 +417,9 @@ private async Task PipeStandardErrorAsync( ProcessEx process, CancellationToken cancellationToken = default) { - await using (process.StdErr.WithAsyncDisposableAdapter()) + await using (process.StandardError.WithAsyncDisposableAdapter()) { - await StandardErrorPipe.CopyFromAsync(process.StdErr, cancellationToken) + await StandardErrorPipe.CopyFromAsync(process.StandardError, cancellationToken) .ConfigureAwait(false); } } diff --git a/CliWrap/Utils/ProcessEx.cs b/CliWrap/Utils/ProcessEx.cs index dae813ef..8d72b2c1 100644 --- a/CliWrap/Utils/ProcessEx.cs +++ b/CliWrap/Utils/ProcessEx.cs @@ -24,11 +24,11 @@ internal class ProcessEx : IDisposable // We are purposely using Stream instead of StreamWriter/StreamReader to push the concerns of // writing and reading to PipeSource/PipeTarget at the higher level. - public Stream StdIn { get; private set; } = Stream.Null; + public Stream StandardInput { get; private set; } = Stream.Null; - public Stream StdOut { get; private set; } = Stream.Null; + public Stream StandardOutput { get; private set; } = Stream.Null; - public Stream StdErr { get; private set; } = Stream.Null; + public Stream StandardError { get; private set; } = Stream.Null; public int ExitCode { get; private set; } @@ -92,9 +92,9 @@ public void Start() // Copy metadata Id = _nativeProcess.Id; - StdIn = _nativeProcess.StandardInput.BaseStream; - StdOut = _nativeProcess.StandardOutput.BaseStream; - StdErr = _nativeProcess.StandardError.BaseStream; + StandardInput = _nativeProcess.StandardInput.BaseStream; + StandardOutput = _nativeProcess.StandardOutput.BaseStream; + StandardError = _nativeProcess.StandardError.BaseStream; } public void Kill()