Update NuGet packages

Tyrrrz · Jan 11, 2024 · b305b60 · b305b60
1 parent 7c5feee
commit b305b60
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 70 deletions.
diff --git a/CliWrap.Benchmarks/BufferingBenchmarks.cs b/CliWrap.Benchmarks/BufferingBenchmarks.cs
@@ -42,10 +42,10 @@ public async Task<(string, string)> MedallionShell()
     [Benchmark]
     public async Task<(string, string)> ProcessX()
     {
-        var (_, stdOutStream, stdErrStream) = Cysharp
-            .Diagnostics
-            .ProcessX
-            .GetDualAsyncEnumerable(FilePath, arguments: Args);
+        var (_, stdOutStream, stdErrStream) = Cysharp.Diagnostics.ProcessX.GetDualAsyncEnumerable(
+            FilePath,
+            arguments: Args
+        );
 
         var stdOutTask = stdOutStream.ToTask();
         var stdErrTask = stdErrStream.ToTask();

diff --git a/CliWrap.Benchmarks/CliWrap.Benchmarks.csproj b/CliWrap.Benchmarks/CliWrap.Benchmarks.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
     <PackageReference Include="ProcessX" Version="1.5.5" />
     <PackageReference Include="RunProcessAsTask" Version="1.2.4" />
     <PackageReference Include="MedallionShell" Version="1.6.2" />

diff --git a/CliWrap.Benchmarks/PullEventStreamBenchmarks.cs b/CliWrap.Benchmarks/PullEventStreamBenchmarks.cs
@@ -38,10 +38,10 @@ public async Task<int> ProcessX()
     {
         var counter = 0;
 
-        var (_, stdOutStream, stdErrStream) = Cysharp
-            .Diagnostics
-            .ProcessX
-            .GetDualAsyncEnumerable(FilePath, arguments: Args);
+        var (_, stdOutStream, stdErrStream) = Cysharp.Diagnostics.ProcessX.GetDualAsyncEnumerable(
+            FilePath,
+            arguments: Args
+        );
 
         var consumeStdOutTask = Task.Run(async () =>
         {

diff --git a/CliWrap.Signaler/CliWrap.Signaler.csproj b/CliWrap.Signaler/CliWrap.Signaler.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj b/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="CliFx" Version="2.3.5" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.8.0" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.10.0" PrivateAssets="all" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 

diff --git a/CliWrap.Tests/CliWrap.Tests.csproj b/CliWrap.Tests/CliWrap.Tests.csproj
@@ -11,14 +11,14 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="PolyShim" Version="1.8.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.10.0" PrivateAssets="all" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
-    <PackageReference Include="xunit" Version="2.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5" PrivateAssets="all" />
+    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 

diff --git a/CliWrap.Tests/ConfigurationSpecs.cs b/CliWrap.Tests/ConfigurationSpecs.cs
@@ -91,8 +91,7 @@ public void I_can_configure_the_command_line_arguments_using_a_builder()
         original.Should().BeEquivalentTo(modified, o => o.Excluding(c => c.Arguments));
         original.Arguments.Should().NotBe(modified.Arguments);
         modified
-            .Arguments
-            .Should()
+            .Arguments.Should()
             .Be("-a \"foo bar\" \"\\\"foo\\\\bar\\\"\" 3.14 foo bar -5 89.13");
     }
 
@@ -126,8 +125,7 @@ public void I_can_configure_the_user_credentials()
         original.Should().BeEquivalentTo(modified, o => o.Excluding(c => c.Credentials));
         original.Credentials.Should().NotBe(modified.Credentials);
         modified
-            .Credentials
-            .Should()
+            .Credentials.Should()
             .BeEquivalentTo(new Credentials("domain", "username", "password", true));
     }
 
@@ -150,8 +148,7 @@ public void I_can_configure_the_user_credentials_using_a_builder()
         original.Should().BeEquivalentTo(modified, o => o.Excluding(c => c.Credentials));
         original.Credentials.Should().NotBe(modified.Credentials);
         modified
-            .Credentials
-            .Should()
+            .Credentials.Should()
             .BeEquivalentTo(new Credentials("domain", "username", "password", true));
     }
 
@@ -170,8 +167,7 @@ public void I_can_configure_the_environment_variables()
         original.Should().BeEquivalentTo(modified, o => o.Excluding(c => c.EnvironmentVariables));
         original.EnvironmentVariables.Should().NotBeEquivalentTo(modified.EnvironmentVariables);
         modified
-            .EnvironmentVariables
-            .Should()
+            .EnvironmentVariables.Should()
             .BeEquivalentTo(
                 new Dictionary<string, string?> { ["name"] = "value", ["key"] = "door" }
             );
@@ -195,8 +191,7 @@ public void I_can_configure_the_environment_variables_using_a_builder()
         original.Should().BeEquivalentTo(modified, o => o.Excluding(c => c.EnvironmentVariables));
         original.EnvironmentVariables.Should().NotBeEquivalentTo(modified.EnvironmentVariables);
         modified
-            .EnvironmentVariables
-            .Should()
+            .EnvironmentVariables.Should()
             .BeEquivalentTo(
                 new Dictionary<string, string?>
                 {

diff --git a/CliWrap.Tests/PipingSpecs.cs b/CliWrap.Tests/PipingSpecs.cs
@@ -608,9 +608,10 @@ public async Task I_can_execute_a_command_with_buffering_and_also_pipe_the_stdou
         delegateLines
             .Should()
             .Equal(
-                result
-                    .StandardOutput
-                    .Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries)
+                result.StandardOutput.Split(
+                    Environment.NewLine,
+                    StringSplitOptions.RemoveEmptyEntries
+                )
             );
     }
 

diff --git a/CliWrap.Tests/Utils/Extensions/AssertionExtensions.cs b/CliWrap.Tests/Utils/Extensions/AssertionExtensions.cs
@@ -12,8 +12,7 @@ internal static class AssertionExtensions
         IEnumerable<string> lines
     ) =>
         assertions
-            .Subject
-            .Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
+            .Subject.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
             .Should()
             .Equal(lines);
 

diff --git a/CliWrap/CliWrap.csproj b/CliWrap/CliWrap.csproj
@@ -21,10 +21,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.8.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.10.0" PrivateAssets="all" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'" />
     <PackageReference Include="System.Management" Version="8.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'" />
     <PackageReference Include="System.Memory" Version="4.5.5" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'" />

diff --git a/CliWrap/Command.Execution.cs b/CliWrap/Command.Execution.cs
@@ -237,7 +237,7 @@ await StandardErrorPipe
             // and won't need it anymore.
             // If the pipe has already been exhausted (most likely), this won't do anything.
             // If the pipe is still trying to transfer data, this will cause it to abort.
-            stdInCts.Cancel();
+            await stdInCts.CancelAsync();
 
             // Wait until piping is done and propagate exceptions
             await pipingTask.ConfigureAwait(false);

diff --git a/CliWrap/EventStream/PullEventStreamCommandExtensions.cs b/CliWrap/EventStream/PullEventStreamCommandExtensions.cs
@@ -70,17 +70,15 @@ await channel
         yield return new StartedCommandEvent(commandTask.ProcessId);
 
         // Close the channel once the command completes, so that ReceiveAsync() can finish
-        _ = commandTask
-            .Task
-            .ContinueWith(
-                async _ =>
-                    // ReSharper disable once AccessToDisposedClosure
-                    await channel
-                        .ReportCompletionAsync(forcefulCancellationToken)
-                        .ConfigureAwait(false),
-                // Run the continuation even if the parent task failed
-                TaskContinuationOptions.None
-            );
+        _ = commandTask.Task.ContinueWith(
+            async _ =>
+                // ReSharper disable once AccessToDisposedClosure
+                await channel
+                    .ReportCompletionAsync(forcefulCancellationToken)
+                    .ConfigureAwait(false),
+            // Run the continuation even if the parent task failed
+            TaskContinuationOptions.None
+        );
 
         await foreach (
             var cmdEvent in channel.ReceiveAsync(forcefulCancellationToken).ConfigureAwait(false)

diff --git a/CliWrap/EventStream/PushEventStreamCommandExtensions.cs b/CliWrap/EventStream/PushEventStreamCommandExtensions.cs
@@ -59,28 +59,26 @@ CancellationToken gracefulCancellationToken
 
             // Don't pass cancellation token to the continuation because we need it to
             // trigger regardless of how the task completed.
-            _ = commandTask
-                .Task
-                .ContinueWith(
-                    t =>
+            _ = commandTask.Task.ContinueWith(
+                t =>
+                {
+                    // Canceled tasks don't have exceptions
+                    if (t.IsCanceled)
                     {
-                        // Canceled tasks don't have exceptions
-                        if (t.IsCanceled)
-                        {
-                            observer.OnError(new TaskCanceledException(t));
-                        }
-                        else if (t.Exception is not null)
-                        {
-                            observer.OnError(t.Exception.TryGetSingle() ?? t.Exception);
-                        }
-                        else
-                        {
-                            observer.OnNext(new ExitedCommandEvent(t.Result.ExitCode));
-                            observer.OnCompleted();
-                        }
-                    },
-                    TaskContinuationOptions.None
-                );
+                        observer.OnError(new TaskCanceledException(t));
+                    }
+                    else if (t.Exception is not null)
+                    {
+                        observer.OnError(t.Exception.TryGetSingle() ?? t.Exception);
+                    }
+                    else
+                    {
+                        observer.OnNext(new ExitedCommandEvent(t.Result.ExitCode));
+                        observer.OnCompleted();
+                    }
+                },
+                TaskContinuationOptions.None
+            );
 
             return Disposable.Null;
         });

diff --git a/CliWrap/PipeTarget.cs b/CliWrap/PipeTarget.cs
@@ -71,7 +71,7 @@ private class AggregatePipeTarget(IReadOnlyList<PipeTarget> targets) : PipeTarge
                         {
                             // Abort the operation if any of the targets fail
                             // ReSharper disable once AccessToDisposedClosure
-                            cts.Cancel();
+                            await cts.CancelAsync();
 
                             throw;
                         }

diff --git a/CliWrap/Utils/SimplexStream.cs b/CliWrap/Utils/SimplexStream.cs
@@ -67,8 +67,7 @@ CancellationToken cancellationToken
         var length = Math.Min(count, _sharedBufferBytes - _sharedBufferBytesRead);
 
         _sharedBuffer
-            .Memory
-            .Slice(_sharedBufferBytesRead, length)
+            .Memory.Slice(_sharedBufferBytesRead, length)
             .CopyTo(buffer.AsMemory(offset, length));
 
         _sharedBufferBytesRead += length;