Add support for Microsoft.Testing.Platform

GitHubActionsTestLogger.Tests/AnnotationSpecs.cs

@@ -16,9 +16,9 @@ public void I_can_use_the_logger_to_produce_annotations_for_failed_tests()
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -54,9 +54,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_source_info
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -104,9 +104,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_source_info
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -155,9 +155,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_test_na
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions
+            new TestReporterOptions
             {
                 AnnotationTitleFormat = "<@test>",
                 AnnotationMessageFormat = "[@test]",
@@ -184,9 +184,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_test_traits
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions
+            new TestReporterOptions
             {
                 AnnotationTitleFormat = "<@traits.Category -> @test>",
                 AnnotationMessageFormat = "[@traits.Category -> @test]",
@@ -218,9 +218,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_error_m
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions
+            new TestReporterOptions
             {
                 AnnotationTitleFormat = "<@test: @error>",
                 AnnotationMessageFormat = "[@test: @error]",
@@ -251,9 +251,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_error_s
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions
+            new TestReporterOptions
             {
                 AnnotationTitleFormat = "<@test: @trace>",
                 AnnotationMessageFormat = "[@test: @trace]",
@@ -284,9 +284,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_target_
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions
+            new TestReporterOptions
             {
                 AnnotationTitleFormat = "<@test (@framework)>",
                 AnnotationMessageFormat = "[@test (@framework)]",
@@ -319,9 +319,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_line_breaks
         // Arrange
         using var commandWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(commandWriter, TextWriter.Null),
-            new TestLoggerOptions { AnnotationMessageFormat = "foo\\nbar" }
+            new TestReporterOptions { AnnotationMessageFormat = "foo\\nbar" }
         );
 
         // Act

GitHubActionsTestLogger.Tests/InitializationSpecs.cs

@@ -20,7 +20,7 @@ public void I_can_use_the_logger_with_the_default_configuration()
 
         // Assert
         logger.Context.Should().NotBeNull();
-        logger.Context?.Options.Should().BeEquivalentTo(TestLoggerOptions.Default);
+        logger.Context?.Options.Should().BeEquivalentTo(TestReporterOptions.Default);
     }
 
     [Fact]
@@ -35,7 +35,7 @@ public void I_can_use_the_logger_with_an_empty_configuration()
 
         // Assert
         logger.Context.Should().NotBeNull();
-        logger.Context?.Options.Should().BeEquivalentTo(TestLoggerOptions.Default);
+        logger.Context?.Options.Should().BeEquivalentTo(TestReporterOptions.Default);
     }
 
     [Fact]

GitHubActionsTestLogger.Tests/SummarySpecs.cs

@@ -16,9 +16,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_test_sui
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -38,9 +38,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            new TestLoggerOptions { SummaryIncludePassedTests = true }
+            new TestReporterOptions { SummaryIncludePassedTests = true }
         );
 
         // Act
@@ -85,9 +85,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -144,9 +144,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            new TestLoggerOptions { SummaryIncludeSkippedTests = true }
+            new TestReporterOptions { SummaryIncludeSkippedTests = true }
         );
 
         // Act
@@ -191,9 +191,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_empty_test_s
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            TestLoggerOptions.Default
+            TestReporterOptions.Default
         );
 
         // Act
@@ -212,9 +212,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_does_not_include_empt
         // Arrange
         using var summaryWriter = new StringWriter();
 
-        var context = new TestLoggerContext(
+        var context = new TestReporterContext(
             new GitHubWorkflow(TextWriter.Null, summaryWriter),
-            new TestLoggerOptions { SummaryIncludeNotFoundTests = false }
+            new TestReporterOptions { SummaryIncludeNotFoundTests = false }
         );
 
         // Act

GitHubActionsTestLogger.Tests/Utils/Extensions/TestLoggerContextExtensions.cs

@@ -11,7 +11,7 @@ namespace GitHubActionsTestLogger.Tests.Utils.Extensions;
 internal static class TestLoggerContextExtensions
 {
     public static void SimulateTestRun(
-        this TestLoggerContext context,
+        this TestReporterContext context,
         string testSuiteFilePath,
         string targetFrameworkName,
         params IReadOnlyList<TestResult> testResults
@@ -65,13 +65,13 @@ params IReadOnlyList<TestResult> testResults
     }
 
     public static void SimulateTestRun(
-        this TestLoggerContext context,
+        this TestReporterContext context,
         string testSuiteName,
         params IReadOnlyList<TestResult> testResults
     ) => context.SimulateTestRun(testSuiteName, "FakeTargetFramework", testResults);
 
     public static void SimulateTestRun(
-        this TestLoggerContext context,
+        this TestReporterContext context,
         params IReadOnlyList<TestResult> testResults
     ) => context.SimulateTestRun("FakeTests.dll", testResults);
 }

GitHubActionsTestLogger/GitHubActionsTestLogger.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
@@ -26,7 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CSharpier.MsBuild" Version="1.1.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.14.1" />
+    <PackageReference Include="Microsoft.Testing.Platform" Version="1.6.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
     <PackageReference

GitHubActionsTestLogger/GitHubReportExtensions.cs

@@ -0,0 +1,26 @@
+using Microsoft.Testing.Platform.Builder;
+using Microsoft.Testing.Platform.Extensions;
+using Microsoft.Testing.Platform.Services;
+
+namespace GitHubActionsTestLogger;
+
+public static class GitHubReportExtensions
+{
+    /// <summary>
+    /// Adds GitHub Actions reporting support to the Testing Platform Builder.
+    /// </summary>
+    public static void AddGitHubReportProvider(this ITestApplicationBuilder testApplicationBuilder)
+    {
+        var extension = new TestReporterExtension();
+
+        var compositeExtension = new CompositeExtensionFactory<TestReporter>(
+            serviceProvider => new TestReporter(extension, serviceProvider.GetCommandLineOptions())
+        );
+        testApplicationBuilder.TestHost.AddDataConsumer(compositeExtension);
+        testApplicationBuilder.TestHost.AddTestSessionLifetimeHandle(compositeExtension);
+
+        testApplicationBuilder.CommandLine.AddProvider(() =>
+            new TestReporterOptionsProvider(extension)
+        );
+    }
+}

GitHubActionsTestLogger/GitHubWorkflow.cs

@@ -8,7 +8,7 @@
 namespace GitHubActionsTestLogger;
 
 // https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions
-public partial class GitHubWorkflow(TextWriter commandWriter, TextWriter summaryWriter)
+internal partial class GitHubWorkflow(TextWriter commandWriter, TextWriter summaryWriter)
 {
     private void InvokeCommand(
         string command,
@@ -78,7 +78,7 @@ public void CreateSummary(string content)
     }
 }
 
-public partial class GitHubWorkflow
+internal partial class GitHubWorkflow
 {
     public static GitHubWorkflow Default { get; } =
         new(

GitHubActionsTestLogger/TestDefinition.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace GitHubActionsTestLogger;
+
+internal record TestDefinition(
+    string Id,
+    string DisplayName,
+    IReadOnlyDictionary<string, string> Properties
+);