feat: decouple vstest and mtp workflows. See #229

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.5.10",
+      "version": "5.5.11",
       "commands": [
         "reportgenerator"
       ]

.github/workflows/dotnet.yml

@@ -71,9 +71,10 @@ jobs:
         run: dotnet pack -c Release -p:PackageVersion=${{ env.APP_BUILD_VERSION }}
       - name: Unit test
         run: |
-          dotnet test -p:PackageVersion=${{ env.APP_BUILD_VERSION }} test/TestLogger.UnitTests/TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
-          dotnet test -p:PackageVersion=${{ env.APP_BUILD_VERSION }} test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
-          dotnet test -p:PackageVersion=${{ env.APP_BUILD_VERSION }} test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
+          dotnet run -p:PackageVersion=${{ env.APP_BUILD_VERSION }} --project test/TestLogger.VSTest.UnitTests/TestLogger.VSTest.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*"
+          dotnet run -p:PackageVersion=${{ env.APP_BUILD_VERSION }} --project test/TestLogger.Mtp.UnitTests/TestLogger.Mtp.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*"
+          dotnet run -p:PackageVersion=${{ env.APP_BUILD_VERSION }} --project test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*"
+          dotnet run -p:PackageVersion=${{ env.APP_BUILD_VERSION }} --project test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*"
       - name: Acceptance test
         run: |
           echo "Running acceptance tests with verbose output..."
@@ -93,16 +94,16 @@ jobs:
             **/test-results-*.xml
             **/test-results-*.json
             **/*.log
-            test/assets/**/bin/Debug/net8.0/
-            test/assets/**/bin/Debug/net10.0/
+            test/assets/**/bin/Debug/mtp/
+            test/assets/**/bin/Debug/vstest/
       - name: Codecov
         uses: codecov/codecov-action@v3.1.0
         with:
-          files: test/TestLogger.UnitTests/coverage.opencover.xml
+          files: test/TestLogger.VSTest.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml,test/TestLogger.Mtp.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml,test/NUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml,test/JUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml
       - name: Publish packages
         if: ${{ github.event_name == 'push' && matrix.os != 'windows-latest' }}
         run: |
-          dotnet nuget push 'src/TestLogger/bin/Release/*.nupkg' --api-key ${{ secrets.SPEKT_MYGET_KEY }} --source https://www.myget.org/F/spekt/api/v3/index.json
+          dotnet nuget push 'src/TestLogger/bin/Release/*/*.nupkg' --api-key ${{ secrets.SPEKT_MYGET_KEY }} --source https://www.myget.org/F/spekt/api/v3/index.json
           dotnet nuget push 'src/Xunit.Xml.Package/bin/Release/*.nupkg' --api-key ${{ secrets.SPEKT_MYGET_KEY }} --source https://www.myget.org/F/spekt/api/v3/index.json
           dotnet nuget push 'src/NUnit.Xml.Package/bin/Release/*.nupkg' --api-key ${{ secrets.SPEKT_MYGET_KEY }} --source https://www.myget.org/F/spekt/api/v3/index.json
           dotnet nuget push 'src/JUnit.Xml.Package/bin/Release/*.nupkg' --api-key ${{ secrets.SPEKT_MYGET_KEY }} --source https://www.myget.org/F/spekt/api/v3/index.json

.gitignore

@@ -141,6 +141,7 @@ _TeamCity*
 *.coveragexml
 coverage.json
 coverage.opencover.xml
+coveragereport/
 
 # NCrunch
 _NCrunch_*
@@ -344,4 +345,4 @@ site
 .vscode/settings.json
 
 *.received.txt
-global.json
+global.json

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <SourceRoot Condition="$(SourceRoot) == ''">$(MSBuildThisFileDirectory)</SourceRoot>
-    <SourcePrefix>8.0.0</SourcePrefix>
+    <SourcePrefix>8.1.0</SourcePrefix>
   </PropertyGroup>
 
   <PropertyGroup>

Directory.Packages.props

@@ -18,6 +18,7 @@
         <PackageVersion Include="Moq" Version="4.20.72" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
         <PackageVersion Include="Verify.MSTest" Version="24.1.0" />
-        <PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
+        <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+        <PackageVersion Include="coverlet.MTP" Version="8.0.0" />
     </ItemGroup>
 </Project>

build.ps1

@@ -1,20 +1,15 @@
-$locals = dotnet nuget locals all -l
-ForEach ($local in $($locals -split "`r`n"))
-{
-    $local = $local.Substring($local.IndexOf(":") + 2)
-    "Deleting from $local"
-    dotnet nuget delete Json.TestLogger 4.0.0-dev --force-english-output --non-interactive -s $local
-}
-
-Remove-Item .\test\package\bin\ -Recurse
-Remove-Item .\test\package\obj\ -Recurse
-
 dotnet pack
 
 if ($?) {
-    dotnet test test/TestLogger.UnitTests/TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
-    dotnet test test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
-    dotnet test test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover
+    dotnet run --project test/TestLogger.VSTest.UnitTests/TestLogger.VSTest.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*"
+    dotnet run --project test/TestLogger.Mtp.UnitTests/TestLogger.Mtp.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*"
+    dotnet run --project test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*"
+    dotnet run --project test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*"
+}
+if ($?) {
+    dotnet tool restore
+    dotnet reportgenerator -reports:"test/TestLogger.VSTest.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/TestLogger.Mtp.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/NUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/JUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml" -targetdir:coveragereport -reporttypes:"TextSummary;Html"
+    Get-Content coveragereport/Summary.txt
 }
 if ($?) {
     dotnet test test/TestLogger.AcceptanceTests/TestLogger.AcceptanceTests.csproj

build.sh

@@ -2,9 +2,13 @@
 # vi: set tw=0
 
 dotnet pack &&\
-dotnet test test/TestLogger.UnitTests/TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover &&\
-dotnet test test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover &&\
-dotnet test test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -p:CollectCoverage=true -p:CoverletOutputFormat=opencover &&\
+dotnet run --project test/TestLogger.VSTest.UnitTests/TestLogger.VSTest.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" &&\
+dotnet run --project test/TestLogger.Mtp.UnitTests/TestLogger.Mtp.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" &&\
+dotnet run --project test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*" &&\
+dotnet run --project test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj -- --coverlet --coverlet-output-format cobertura --coverlet-include "[Spekt*]*" --coverlet-include "[Microsoft.VisualStudio.TestPlatform.Extension*]*" &&\
+dotnet tool restore &&\
+dotnet reportgenerator -reports:"test/TestLogger.VSTest.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/TestLogger.Mtp.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/NUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml;test/JUnit.Xml.TestLogger.UnitTests/bin/Debug/net10.0/TestResults/coverage.cobertura.xml" -targetdir:coveragereport -reporttypes:"TextSummary;Html" &&\
+cat coveragereport/Summary.txt &&\
 dotnet test test/TestLogger.AcceptanceTests/TestLogger.AcceptanceTests.csproj &&\
 dotnet test test/TestLogger.PackageTests/TestLogger.PackageTests.csproj &&\
 dotnet test test/Xunit.Xml.TestLogger.AcceptanceTests/Xunit.Xml.TestLogger.AcceptanceTests.csproj &&\

src/Directory.Build.props

@@ -1,4 +1,30 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
+
+  <!-- Default Configuration before composing paths below: Directory.Build.props is
+       evaluated before the SDK applies its own Debug default, so $(Configuration)
+       would otherwise freeze empty (explicit -c values arrive as global properties
+       and are unaffected by this default). -->
+  <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+  </PropertyGroup>
+
+  <!-- MTP adapter projects: split obj. Only the auto-generated target framework
+       attribute is disabled (it conflicts with Microsoft.Testing.Platform); the
+       remaining assembly info (including versions) must stay enabled. -->
+  <PropertyGroup Condition="$(MSBuildProjectName.Contains('MTP')) and !$(MSBuildProjectName.Contains('MTPv1')) and !$(MSBuildProjectName.Contains('Package'))">
+    <OutputPath>bin\$(Configuration)\mtp\</OutputPath>
+    <BaseIntermediateOutputPath>obj\mtp\</BaseIntermediateOutputPath>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <DefaultItemExcludes>$(DefaultItemExcludes);obj\vstest\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <!-- VSTest projects: split obj -->
+  <PropertyGroup Condition="!$(MSBuildProjectName.Contains('MTP')) and !$(MSBuildProjectName.Contains('Package'))">
+    <OutputPath>bin\$(Configuration)\vstest\</OutputPath>
+    <BaseIntermediateOutputPath>obj\vstest\</BaseIntermediateOutputPath>
+    <DefaultItemExcludes>$(DefaultItemExcludes);obj\mtp\**</DefaultItemExcludes>
+  </PropertyGroup>
 </Project>
-<!-- vim: set ft=xml : -->
+<!-- vim: set ft=xml : -->

src/JUnit.Xml.Package/JUnit.Xml.Package.csproj

@@ -38,9 +38,13 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\JUnit.Xml.TestLogger\JUnit.Xml.TestLogger.csproj" />
-  </ItemGroup>
+  <!-- Format projects are built separately; Package just copies their outputs -->
+  <Target Name="BuildFormatProjects" BeforeTargets="CopyOutputs">
+    <MSBuild Projects="..\JUnit.Xml.TestLogger\JUnit.Xml.TestLogger.VSTest.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="..\JUnit.Xml.TestLogger\JUnit.Xml.TestLogger.MTP.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="..\TestLogger\TestLogger.VSTest.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="..\TestLogger\TestLogger.MTP.csproj" Targets="Restore;Build" Properties="Configuration=$(Configuration)" />
+  </Target>
 
   <ItemGroup>
     <Content Include="JUnitXml.TestLogger.props">
@@ -63,10 +67,14 @@
     </None>
   </ItemGroup>
 
-  <!--<Target Name="AfterBuild">-->
-    <!--<Copy SourceFiles="JUnitXml.TestLogger.props" DestinationFolder="build\netstandard1.0" SkipUnchangedFiles="true" />-->
-    <!--<Copy SourceFiles="JUnitXml.TestLogger.props" DestinationFolder="build\net45" SkipUnchangedFiles="true" />-->
-  <!--</Target>-->
+  <Target Name="CopyOutputs" AfterTargets="Build">
+    <MakeDir Directories="$(OutputPath)_common\vstest" />
+    <MakeDir Directories="$(OutputPath)_common\mtp" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)/../TestLogger/bin/$(Configuration)/vstest/netstandard2.0/Spekt.TestLogger.VSTest.dll" DestinationFolder="$(OutputPath)_common\vstest" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)/../TestLogger/bin/$(Configuration)/mtp/netstandard2.0/Spekt.TestLogger.Mtp.dll" DestinationFolder="$(OutputPath)_common\mtp" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)/../JUnit.Xml.TestLogger/bin/$(Configuration)/vstest/netstandard2.0/Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" DestinationFolder="$(OutputPath)_common\vstest" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildProjectDirectory)/../JUnit.Xml.TestLogger/bin/$(Configuration)/mtp/netstandard2.0/Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" DestinationFolder="$(OutputPath)_common\mtp" SkipUnchangedFiles="true" />
+  </Target>
 
   <!-- Prevent Csc from being called -->
   <Target Name="CoreCompile" />

src/JUnit.Xml.Package/JUnitXml.TestLogger.nuspec

@@ -13,10 +13,12 @@
     <icon>packageIcon.png</icon>
   </metadata>
   <files>
-    <file src="Microsoft.VisualStudio.TestPlatform.Extension.Junit.Xml.TestLogger.dll" target="build\_common\" />
-    <file src="Spekt.TestLogger.dll" target="build\_common\" />
+    <file src="_common\vstest\Spekt.TestLogger.VSTest.dll" target="build\_common\vstest\" />
+    <file src="_common\vstest\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" target="build\_common\vstest\" />
+    <file src="_common\mtp\Spekt.TestLogger.Mtp.dll" target="build\_common\mtp\" />
+    <file src="_common\mtp\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" target="build\_common\mtp\" />
 
-    <file src="JunitXml.TestLogger.props" target="build\netstandard2.0\" />
+    <file src="JunitXml.TestLogger.props" target="build\" />
 
     <file src="README.md" target="docs\" />
     <file src="CHANGELOG.md" target="docs\" />

src/JUnit.Xml.Package/JUnitXml.TestLogger.props

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(IsTestingPlatformApplication)'!='true'">
-    <Content Include="$(MSBuildThisFileDirectory)..\_common\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll">
-      <Link>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll</Link>
+    <Content Include="$(MSBuildThisFileDirectory)_common\vstest\Spekt.TestLogger.VSTest.dll">
+      <Link>Spekt.TestLogger.VSTest.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\_common\Spekt.TestLogger.dll">
-      <Link>Spekt.TestLogger.dll</Link>
+    <Content Include="$(MSBuildThisFileDirectory)_common\vstest\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll">
+      <Link>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </Content>
   </ItemGroup>
   <ItemGroup Condition="'$(IsTestingPlatformApplication)'=='true'">
-    <Reference Include="$(MSBuildThisFileDirectory)..\_common\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" />
-    <Reference Include="$(MSBuildThisFileDirectory)..\_common\Spekt.TestLogger.dll" />
+    <Reference Include="$(MSBuildThisFileDirectory)_common\mtp\Spekt.TestLogger.Mtp.dll" />
+    <Reference Include="$(MSBuildThisFileDirectory)_common\mtp\Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger.dll" />
 
     <TestingPlatformBuilderHook Include="9D52251D-D1A2-42BC-AC7A-F44DEA2DAC63">
       <DisplayName>JUnitXml.TestLogger</DisplayName>

src/JUnit.Xml.TestLogger/Assembly.cs

@@ -7,6 +7,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+#if !DEBUG
 [assembly: ExcludeFromCodeCoverage]
 
 namespace System.Diagnostics.CodeAnalysis;
@@ -15,4 +16,5 @@ namespace System.Diagnostics.CodeAnalysis;
 internal sealed class ExcludeFromCodeCoverageAttribute : Attribute
 {
 	public ExcludeFromCodeCoverageAttribute() { }
-}
+}
+#endif

src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.MTP.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger</AssemblyName>
+    <IsPackable>false</IsPackable>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**/*.cs" Exclude="obj/**;bin/**;JUnitXmlTestLogger.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../TestLogger/TestLogger.MTP.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Testing.Platform" />
+  </ItemGroup>
+
+</Project>

src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj → src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.VSTest.csproj

@@ -4,17 +4,25 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger</AssemblyName>
     <IsPackable>false</IsPackable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../TestLogger/TestLogger.csproj" />
+    <Compile Remove="JUnitTestReporter.cs" />
+    <Compile Remove="JUnitTestReporterExtension.cs" />
+    <Compile Remove="JUnitTestReporterExtensions.cs" />
+    <Compile Remove="TestingPlatformBuilderHook.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
+    <ProjectReference Include="../TestLogger/TestLogger.VSTest.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" PrivateAssets="all" />
   </ItemGroup>
 </Project>

src/JUnit.Xml.TestLogger/JUnitTestReporter.cs

@@ -6,6 +6,7 @@ namespace Spekt.TestReporter.JUnit
     using System;
     using Microsoft.VisualStudio.TestPlatform.Extension.Junit.Xml.TestLogger;
     using Spekt.TestLogger.Core;
+    using Spekt.TestLogger.Mtp;
 
     internal sealed class JUnitTestReporter : TestReporter
     {

src/JUnit.Xml.TestLogger/JUnitTestReporterExtensions.cs

@@ -5,6 +5,7 @@ namespace Spekt.TestReporter.JUnit
 {
     using Microsoft.Testing.Platform.Builder;
     using Microsoft.Testing.Platform.Extensions;
+    using Spekt.TestLogger.Mtp;
 
     public static class JUnitTestReporterExtensions
     {

src/JUnit.Xml.TestLogger/JUnitXmlTestLogger.cs

@@ -4,7 +4,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.Extension.Junit.Xml.TestLogger
 {
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Spekt.TestLogger;
+    using Spekt.TestLogger.VSTest;
 
     [FriendlyName(FriendlyName)]
     [ExtensionUri(ExtensionUri)]

src/JUnit.Xml.TestLogger/JunitXmlSerializer.cs

@@ -10,8 +10,6 @@ namespace Microsoft.VisualStudio.TestPlatform.Extension.Junit.Xml.TestLogger
     using System.Linq;
     using System.Text;
     using System.Xml.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Spekt.TestLogger.Core;
     using Spekt.TestLogger.Utilities;