Update NuGet packages

Tyrrrz · Nov 21, 2023 · 4b43ca3 · 4b43ca3
1 parent ed0093f
commit 4b43ca3
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 73 deletions.
diff --git a/CliWrap.Benchmarks/BufferingBenchmarks.cs b/CliWrap.Benchmarks/BufferingBenchmarks.cs
@@ -42,10 +42,10 @@ public class BufferingBenchmarks
     [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.7" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" 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.Magic/Contexts/EnvironmentVariablesContext.cs b/CliWrap.Magic/Contexts/EnvironmentVariablesContext.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Contextual;
+
+namespace CliWrap.Magic.Contexts;
+
+internal class EnvironmentVariablesContext : Context
+{
+    public IReadOnlyDictionary<string, string?> Variables { get; }
+
+    public EnvironmentVariablesContext(IReadOnlyDictionary<string, string?> variables) =>
+        Variables = variables;
+
+    public EnvironmentVariablesContext()
+        : this(new Dictionary<string, string?>()) { }
+}
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.25.0" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj b/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.3.4" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.7.0" PrivateAssets="all" />
+    <PackageReference Include="CliFx" Version="2.3.5" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.8.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.25.0" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="PolyShim" Version="1.7.0" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" 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="System.Reactive" Version="6.0.0" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 

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

diff --git a/CliWrap.Tests/EnvironmentSpecs.cs b/CliWrap.Tests/EnvironmentSpecs.cs
@@ -67,12 +67,14 @@ public async Task I_can_execute_a_command_with_some_environment_variables_overwr
             var result = await cmd.ExecuteBufferedAsync();
 
             // Assert
-            result.StandardOutput
+            result
+                .StandardOutput
                 .Trim()
                 .Should()
                 .ContainAll($"[{variableToKeep}] = keep", $"[{variableToOverwrite}] = overwritten");
 
-            result.StandardOutput
+            result
+                .StandardOutput
                 .Trim()
                 .Should()
                 .NotContainAny(

diff --git a/CliWrap.Tests/PipingSpecs.cs b/CliWrap.Tests/PipingSpecs.cs
@@ -612,10 +612,9 @@ 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/CliWrap.csproj b/CliWrap/CliWrap.csproj
@@ -6,13 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Authors>$(Company)</Authors>
-    <Description>Library for interacting with external command-line interfaces</Description>
-    <PackageTags>shell pipe command line executable interface wrapper standard input output error arguments net core</PackageTags>
-    <PackageProjectUrl>https://github.com/Tyrrrz/CliWrap</PackageProjectUrl>
-    <PackageReleaseNotes>https://github.com/Tyrrrz/CliWrap/blob/master/Changelog.md</PackageReleaseNotes>
     <PackageIcon>favicon.png</PackageIcon>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -27,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.7.0" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" 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="System.Threading.Tasks.Extensions" Version="4.5.4" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'" />
-    <PackageReference Include="System.Management" Version="7.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'" />
+    <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'" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net462'" />
   </ItemGroup>

diff --git a/CliWrap/CommandTask.cs b/CliWrap/CommandTask.cs
@@ -58,7 +58,7 @@ public ConfiguredTaskAwaitable<TResult> ConfigureAwait(bool continueOnCapturedCo
 public partial class CommandTask<TResult>
 {
     /// <summary>
-    /// Casts the command task into a regular task.
+    /// Converts the command task into a regular task.
     /// </summary>
     public static implicit operator Task<TResult>(CommandTask<TResult> commandTask) =>
         commandTask.Task;

diff --git a/CliWrap/EventStream/PullEventStreamCommandExtensions.cs b/CliWrap/EventStream/PullEventStreamCommandExtensions.cs
@@ -70,15 +70,17 @@ 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
@@ -58,26 +58,28 @@ 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 =>
-                {
-                    // Canceled tasks don't have exceptions
-                    if (t.IsCanceled)
+            _ = commandTask
+                .Task
+                .ContinueWith(
+                    t =>
                     {
-                        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
-            );
+                        // 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
+                );
 
             return Disposable.Null;
         });

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

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,4 +16,13 @@
     <Nullable>annotations</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Authors>$(Company)</Authors>
+    <Description>Library for interacting with external command-line interfaces</Description>
+    <PackageTags>yshell pipe command line executable interface wrapper standard input output error arguments net core</PackageTags>
+    <PackageProjectUrl>https://github.com/Tyrrrz/CliWrap</PackageProjectUrl>
+    <PackageReleaseNotes>https://github.com/Tyrrrz/CliWrap/blob/master/Changelog.md</PackageReleaseNotes>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+
 </Project>