Use .NET 9 Lock via PolyShim

Tyrrrz · Tyrrrz · commit a6d65d4da152 · 2024-09-07T00:18:25.000+03:00
diff --git a/GitHubActionsTestLogger/GitHubActionsTestLogger.csproj b/GitHubActionsTestLogger/GitHubActionsTestLogger.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="CSharpier.MsBuild" Version="0.29.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" />
     <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="RazorBlade" Version="0.6.0" ExcludeAssets="compile;runtime" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/GitHubActionsTestLogger/TestLoggerContext.cs b/GitHubActionsTestLogger/TestLoggerContext.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using GitHubActionsTestLogger.Utils.Extensions;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
@@ -11,7 +12,7 @@ namespace GitHubActionsTestLogger;
 
 public class TestLoggerContext(GitHubWorkflow github, TestLoggerOptions options)
 {
-    private readonly object _lock = new();
+    private readonly Lock _lock = new();
     private TestRunCriteria? _testRunCriteria;
     private readonly List<TestResult> _testResults = [];
 
@@ -68,15 +69,15 @@ private string FormatAnnotationMessage(TestResult testResult) =>
 
     public void HandleTestRunStart(TestRunStartEventArgs args)
     {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
             _testRunCriteria = args.TestRunCriteria;
         }
     }
 
     public void HandleTestResult(TestResultEventArgs args)
     {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
             // Report failed test results to job annotations
             if (args.Result.Outcome == TestOutcome.Failed)
@@ -96,7 +97,7 @@ public void HandleTestResult(TestResultEventArgs args)
 
     public void HandleTestRunComplete(TestRunCompleteEventArgs args)
     {
-        lock (_lock)
+        using (_lock.EnterScope())
         {
             var testSuite =
                 _testRunCriteria?.Sources?.FirstOrDefault()?.Pipe(Path.GetFileNameWithoutExtension)

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
	`5`	`+using System.Threading;`
`5`	`6`	`using GitHubActionsTestLogger.Utils.Extensions;`
`6`	`7`	`using Microsoft.VisualStudio.TestPlatform.ObjectModel;`
`7`	`8`	`using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;`
`@@ -11,7 +12,7 @@ namespace GitHubActionsTestLogger;`
`11`	`12`
`12`	`13`	`public class TestLoggerContext(GitHubWorkflow github, TestLoggerOptions options)`
`13`	`14`	`{`
`14`		`- private readonly object _lock = new();`
	`15`	`+ private readonly Lock _lock = new();`
`15`	`16`	`private TestRunCriteria? _testRunCriteria;`
`16`	`17`	`private readonly List<TestResult> _testResults = [];`
`17`	`18`
`@@ -68,15 +69,15 @@ private string FormatAnnotationMessage(TestResult testResult) =>`
`68`	`69`
`69`	`70`	`public void HandleTestRunStart(TestRunStartEventArgs args)`
`70`	`71`	`{`
`71`		`- lock (_lock)`
	`72`	`+ using (_lock.EnterScope())`
`72`	`73`	`{`
`73`	`74`	`_testRunCriteria = args.TestRunCriteria;`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`public void HandleTestResult(TestResultEventArgs args)`
`78`	`79`	`{`
`79`		`- lock (_lock)`
	`80`	`+ using (_lock.EnterScope())`
`80`	`81`	`{`
`81`	`82`	`// Report failed test results to job annotations`
`82`	`83`	`if (args.Result.Outcome == TestOutcome.Failed)`
`@@ -96,7 +97,7 @@ public void HandleTestResult(TestResultEventArgs args)`
`96`	`97`
`97`	`98`	`public void HandleTestRunComplete(TestRunCompleteEventArgs args)`
`98`	`99`	`{`
`99`		`- lock (_lock)`
	`100`	`+ using (_lock.EnterScope())`
`100`	`101`	`{`
`101`	`102`	`var testSuite =`
`102`	`103`	`_testRunCriteria?.Sources?.FirstOrDefault()?.Pipe(Path.GetFileNameWithoutExtension)`