Use .NET 9 Lock via PolyShim

Tyrrrz · Sep 6, 2024 · 68bda90 · 68bda90
1 parent b5a2b38
commit 68bda90
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 25 deletions.
diff --git a/CliWrap.Benchmarks/PipeFromStreamBenchmarks.cs b/CliWrap.Benchmarks/PipeFromStreamBenchmarks.cs
@@ -14,7 +14,7 @@ public class PipeFromStreamBenchmarks
     [Benchmark(Baseline = true)]
     public async Task<Stream> ExecuteWithCliWrap_PipeToStream()
     {
-        await using var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
+        await using var stream = new MemoryStream([1, 2, 3, 4, 5]);
 
         var command = stream | Cli.Wrap(FilePath).WithArguments(Args);
         await command.ExecuteAsync();
@@ -25,7 +25,7 @@ public async Task<Stream> ExecuteWithCliWrap_PipeToStream()
     [Benchmark]
     public async Task<Stream> MedallionShell()
     {
-        await using var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
+        await using var stream = new MemoryStream([1, 2, 3, 4, 5]);
 
         var command = Medallion.Shell.Command.Run(FilePath, Args.Split(' ')) < stream;
         await command.Task;

diff --git a/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj b/CliWrap.Tests.Dummy/CliWrap.Tests.Dummy.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="CliFx" Version="2.3.5" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.29.1" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.12.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.13.0" PrivateAssets="all" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 

diff --git a/CliWrap.Tests.Dummy/Commands/EnvironmentCommand.cs b/CliWrap.Tests.Dummy/Commands/EnvironmentCommand.cs
@@ -11,7 +11,7 @@ namespace CliWrap.Tests.Dummy.Commands;
 public class EnvironmentCommand : ICommand
 {
     [CommandParameter(0)]
-    public IReadOnlyList<string> Names { get; init; } = Array.Empty<string>();
+    public IReadOnlyList<string> Names { get; init; } = [];
 
     public async ValueTask ExecuteAsync(IConsole console)
     {

diff --git a/CliWrap.Tests.Dummy/Commands/Shared/OutputTarget.cs b/CliWrap.Tests.Dummy/Commands/Shared/OutputTarget.cs
@@ -9,7 +9,7 @@ public enum OutputTarget
 {
     StdOut = 1,
     StdErr = 2,
-    All = StdOut | StdErr
+    All = StdOut | StdErr,
 }
 
 internal static class OutputTargetExtensions

diff --git a/CliWrap.Tests/CliWrap.Tests.csproj b/CliWrap.Tests/CliWrap.Tests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="PolyShim" Version="1.12.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.13.0" PrivateAssets="all" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />

diff --git a/CliWrap.Tests/ConfigurationSpecs.cs b/CliWrap.Tests/ConfigurationSpecs.cs
@@ -192,7 +192,7 @@ public void I_can_configure_the_environment_variables_using_a_builder()
                     ["name"] = "value",
                     ["key"] = "door",
                     ["zzz"] = "yyy",
-                    ["aaa"] = "bbb"
+                    ["aaa"] = "bbb",
                 }
             );
     }

diff --git a/CliWrap.Tests/PipingSpecs.cs b/CliWrap.Tests/PipingSpecs.cs
@@ -540,7 +540,7 @@ public async Task I_can_execute_a_command_and_pipe_the_stdout_into_multiple_stre
                     "1000000",
                     // Buffer needs to be >= BufferSizes.Stream to fail
                     "--buffer",
-                    "100000"
+                    "100000",
                 ]
             );
 

diff --git a/CliWrap/CliWrap.csproj b/CliWrap/CliWrap.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="CSharpier.MsBuild" Version="0.29.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.12.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="1.13.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
@@ -23,7 +23,9 @@ private string GetOptimallyQualifiedTargetFilePath()
         // Currently, we only need this workaround for script files on Windows, so short-circuit
         // if we are on a different platform.
         if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
             return TargetFilePath;
+        }
 
         // Don't do anything for fully qualified paths or paths that already have an extension specified.
         // System.Diagnostics.Process knows how to handle those without our help.
@@ -34,7 +36,9 @@ private string GetOptimallyQualifiedTargetFilePath()
             Path.IsPathRooted(TargetFilePath)
             || !string.IsNullOrWhiteSpace(Path.GetExtension(TargetFilePath))
         )
+        {
             return TargetFilePath;
+        }
 
         static IEnumerable<string> GetProbeDirectoryPaths()
         {
@@ -86,7 +90,7 @@ private ProcessStartInfo CreateStartInfo()
             // We need this in order to be able to send signals to one specific child process,
             // without affecting any others that may also be running in parallel.
             // https://github.com/Tyrrrz/CliWrap/issues/47
-            CreateNoWindow = true
+            CreateNoWindow = true,
         };
 
         // Set credentials

diff --git a/CliWrap/CommandResultValidation.cs b/CliWrap/CommandResultValidation.cs
@@ -16,7 +16,7 @@ public enum CommandResultValidation
     /// <summary>
     /// Ensure that the command returned a zero exit code.
     /// </summary>
-    ZeroExitCode = 0b1
+    ZeroExitCode = 0b1,
 }
 
 internal static class CommandResultValidationExtensions

diff --git a/CliWrap/Utils/Observable.cs b/CliWrap/Utils/Observable.cs
@@ -12,8 +12,6 @@ internal static class Observable
     public static IObservable<T> Create<T>(Func<IObserver<T>, IDisposable> subscribe) =>
         new Observable<T>(subscribe);
 
-    public static IObservable<T> CreateSynchronized<T>(
-        Func<IObserver<T>, IDisposable> subscribe,
-        object? syncRoot = null
-    ) => Create<T>(observer => subscribe(new SynchronizedObserver<T>(observer, syncRoot)));
+    public static IObservable<T> CreateSynchronized<T>(Func<IObserver<T>, IDisposable> subscribe) =>
+        Create<T>(observer => subscribe(new SynchronizedObserver<T>(observer)));
 }
diff --git a/CliWrap/Utils/SimplexStream.cs b/CliWrap/Utils/SimplexStream.cs
@@ -90,7 +90,7 @@ CancellationToken cancellationToken
 
     public async Task ReportCompletionAsync(CancellationToken cancellationToken = default) =>
         // Write an empty buffer that will make ReadAsync(...) return 0, which signifies the end of stream
-        await WriteAsync(Array.Empty<byte>(), 0, 0, cancellationToken).ConfigureAwait(false);
+        await WriteAsync([], 0, 0, cancellationToken).ConfigureAwait(false);
 
     protected override void Dispose(bool disposing)
     {

diff --git a/CliWrap/Utils/SynchronizedObserver.cs b/CliWrap/Utils/SynchronizedObserver.cs
@@ -1,31 +1,31 @@
 using System;
+using System.Threading;
 
 namespace CliWrap.Utils;
 
-internal class SynchronizedObserver<T>(IObserver<T> observer, object? syncRoot = null)
-    : IObserver<T>
+internal class SynchronizedObserver<T>(IObserver<T> observer) : IObserver<T>
 {
-    private readonly object _syncRoot = syncRoot ?? new object();
+    private readonly Lock _lock = new();
 
     public void OnCompleted()
     {
-        lock (_syncRoot)
+        using (_lock.EnterScope())
         {
             observer.OnCompleted();
         }
     }
 
     public void OnError(Exception error)
     {
-        lock (_syncRoot)
+        using (_lock.EnterScope())
         {
             observer.OnError(error);
         }
     }
 
     public void OnNext(T value)
     {
-        lock (_syncRoot)
+        using (_lock.EnterScope())
         {
             observer.OnNext(value);
         }

diff --git a/CliWrap/Utils/WindowsSignaler.cs b/CliWrap/Utils/WindowsSignaler.cs
@@ -27,9 +27,9 @@ public bool TrySend(int processId, int signalId)
                     // This is a .NET 3.5 executable, so we need to configure framework rollover
                     // to allow it to also run against .NET 4.0 and higher.
                     // https://gist.github.com/MichalStrehovsky/d6bc5e4d459c23d0cf3bd17af9a1bcf5
-                    ["COMPLUS_OnlyUseLatestCLR"] = "1"
-                }
-            }
+                    ["COMPLUS_OnlyUseLatestCLR"] = "1",
+                },
+            },
         };
 
         if (!process.Start())