Add PowerKit (prerelease), update PolyShim and CSharpier, remove duplicate utilities

Directory.Packages.props

@@ -5,13 +5,14 @@
 
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="8.0.1" />
-    <PackageVersion Include="CSharpier.MsBuild" Version="1.2.1" />
+    <PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" />
     <PackageVersion Include="FluentAssertions" Version="8.9.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="18.3.0" />
     <PackageVersion Include="Microsoft.Testing.Platform" Version="2.1.0" />
     <PackageVersion Include="MSTest" Version="4.1.0" />
-    <PackageVersion Include="PolyShim" Version="2.7.0" />
+    <PackageVersion Include="PolyShim" Version="2.9.0" />
+    <PackageVersion Include="PowerKit" Version="0.0.0-a.4" />
     <PackageVersion Include="RazorBlade" Version="0.11.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

GitHubActionsTestLogger.Tests/GitHubActionsTestLogger.Tests.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Testing.Platform" />
+    <PackageReference Include="PowerKit" PrivateAssets="all" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
   </ItemGroup>

GitHubActionsTestLogger.Tests/MtpAnnotationSpecs.cs

@@ -3,8 +3,8 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using GitHubActionsTestLogger.Tests.Mtp;
-using GitHubActionsTestLogger.Tests.Utils;
 using Microsoft.Testing.Platform.Builder;
+using PowerKit;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -16,7 +16,7 @@ public class MtpAnnotationSpecs(ITestOutputHelper testOutput)
     public async Task I_can_use_the_logger_to_produce_annotations_for_failed_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -58,7 +58,7 @@ public async Task I_can_use_the_logger_to_produce_annotations_for_failed_tests()
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_source_information_extracted_from_exceptions()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -112,7 +112,7 @@ at CliWrap.Tests.CancellationSpecs.I_can_execute_a_command_with_buffering_and_ca
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_source_information_extracted_from_async_exceptions()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -170,7 +170,7 @@ at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotifi
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_test_name()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -206,7 +206,7 @@ public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_t
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_error_message()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -246,7 +246,7 @@ public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_e
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_error_stacktrace()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -287,7 +287,7 @@ public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_e
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_target_framework_version()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -326,7 +326,7 @@ public async Task I_can_use_the_logger_to_produce_annotations_that_include_the_t
     public async Task I_can_use_the_logger_to_produce_annotations_that_include_line_breaks()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var commandWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([

GitHubActionsTestLogger.Tests/MtpInitializationSpecs.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using GitHubActionsTestLogger.Tests.Mtp;
-using GitHubActionsTestLogger.Tests.Utils;
 using Microsoft.Testing.Platform.Builder;
+using PowerKit;
 using Xunit;
 
 namespace GitHubActionsTestLogger.Tests;
@@ -12,7 +12,7 @@ public class MtpInitializationSpecs
     public async Task I_can_use_the_logger_with_the_default_configuration()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
 
         var builder = await TestApplication.CreateBuilderAsync([
             "--results-directory",

GitHubActionsTestLogger.Tests/MtpSummarySpecs.cs

@@ -4,9 +4,10 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using GitHubActionsTestLogger.Tests.Mtp;
-using GitHubActionsTestLogger.Tests.Utils;
 using GitHubActionsTestLogger.Tests.Utils.Extensions;
 using Microsoft.Testing.Platform.Builder;
+using PowerKit;
+using PowerKit.Extensions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -18,7 +19,7 @@ public class MtpSummarySpecs(ITestOutputHelper testOutput)
     public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_test_suite_name()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -47,7 +48,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_te
     public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_failed_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -99,7 +100,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_li
     public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_passed_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -141,7 +142,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_li
     public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_include_the_list_of_passed_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -184,7 +185,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_includ
     public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_skipped_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -226,7 +227,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_the_li
     public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_include_the_list_of_skipped_tests()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -269,7 +270,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_includ
     public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_empty_test_runs()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -297,7 +298,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_includes_empty_
     public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_include_empty_test_runs()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         await using var summaryWriter = new StringWriter();
 
         var builder = await TestApplication.CreateBuilderAsync([
@@ -326,7 +327,7 @@ public async Task I_can_use_the_logger_to_produce_a_summary_that_does_not_includ
     public async Task I_can_try_to_use_the_logger_to_produce_a_summary_when_the_output_file_is_nearly_full_and_get_a_truncated_summary()
     {
         // Arrange
-        using var testResultsDir = TempDir.Create();
+        using var testResultsDir = TempDirectory.Create();
         using var summaryFile = TempFile.Create();
 
         const int prefillSize = 1024 * 1024 - 250;

GitHubActionsTestLogger.Tests/VsTestSummarySpecs.cs

@@ -3,9 +3,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
-using GitHubActionsTestLogger.Tests.Utils;
 using GitHubActionsTestLogger.Tests.Utils.Extensions;
 using GitHubActionsTestLogger.Tests.VsTest;
+using PowerKit;
+using PowerKit.Extensions;
 using Xunit;
 using Xunit.Abstractions;
 using TestOutcome = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome;

GitHubActionsTestLogger/GitHub/GitHubEnvironment.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using GitHubActionsTestLogger.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace GitHubActionsTestLogger.GitHub;
 

GitHubActionsTestLogger/GitHub/GitHubWorkflow.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using GitHubActionsTestLogger.Utils;
-using GitHubActionsTestLogger.Utils.Extensions;
+using PowerKit.Extensions;
 
 namespace GitHubActionsTestLogger.GitHub;
 
@@ -171,5 +171,6 @@ internal partial class GitHubWorkflow
         // and employs retry logic to handle potential race conditions.
         GitHubEnvironment
             .SummaryFilePath?.Pipe(f => new ContentionTolerantWriteFileStream(f, FileMode.Append))
-            .Pipe(s => new StreamWriter(s)) ?? TextWriter.Null;
+            .Pipe(s => new StreamWriter(s))
+        ?? TextWriter.Null;
 }

GitHubActionsTestLogger/GitHubActionsTestLogger.csproj

@@ -39,6 +39,7 @@
     />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" PrivateAssets="all" />
     <PackageReference Include="PolyShim" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" PrivateAssets="all" />
     <PackageReference Include="RazorBlade" ExcludeAssets="compile;runtime" PrivateAssets="all" />
   </ItemGroup>
 </Project>

GitHubActionsTestLogger/MtpLogger.cs

@@ -13,6 +13,7 @@
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Extensions.TestHost;
 using Microsoft.Testing.Platform.Services;
+using PowerKit.Extensions;
 
 namespace GitHubActionsTestLogger;
 

GitHubActionsTestLogger/MtpLoggerOptionsProvider.cs

@@ -8,6 +8,7 @@
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Extensions;
 using Microsoft.Testing.Platform.Extensions.CommandLine;
+using PowerKit.Extensions;
 
 namespace GitHubActionsTestLogger;