Update to xunit.v3.mtp-v2 and MTP 2.0.2, make MTP opt-in

Switch all test projects to xunit.v3.mtp-v2 for Microsoft Testing Platform (MTP) integration. Bump Microsoft.Testing.Platform to 2.0.2 and manage Moq version via property. Make Coverlet MTP extension opt-in by default and register as TestingPlatformExtension. Minor formatting and encoding adjustments included.

Author: Bertk

Directory.Packages.props

@@ -15,7 +15,8 @@
     <MicrosoftNETTestSdkVersion>18.0.1</MicrosoftNETTestSdkVersion>
     <XunitV3Version>3.2.1</XunitV3Version>
     <XunitRunnerVisualstudioVersion>3.1.5</XunitRunnerVisualstudioVersion>
-    <MicrosoftTestingPlatformVersion>1.9.1</MicrosoftTestingPlatformVersion>
+    <MicrosoftTestingPlatformVersion>2.0.2</MicrosoftTestingPlatformVersion>
+    <MoqVersion>4.20.72</MoqVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="DotNetConfig" Version="1.2.0" />
@@ -48,7 +49,7 @@
     <PackageVersion Include="NuGet.Packaging" Version="$(NugetPackageVersion)" />
     <PackageVersion Include="NuGet.Versioning" Version="$(NugetPackageVersion)" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.6" />
-    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="Moq" Version="$(MoqVersion)" />
     <PackageVersion Include="ReportGenerator.Core" Version="5.3.11" />
     <!--For test issue 809 https://github.com/coverlet-coverage/coverlet/issues/809-->
     <PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.8" />
@@ -57,7 +58,7 @@
     <!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
     <PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
     <!-- <PackageVersion Include="xunit" Version="2.9.3" /> -->
-    <PackageVersion Include="xunit.v3" Version="$(XunitV3Version)" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="$(XunitV3Version)" />
     <PackageVersion Include="xunit.v3.runner.msbuild" Version="$(XunitV3Version)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" />
     <PackageVersion Include="System.Buffers" Version="4.6.1" />

src/coverlet.MTP/buildTransitive/coverlet.MTP.props

@@ -1,4 +1,15 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.MTP.props"
-        Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.MTP.props')" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.MTP.props" 
+          Condition="Exists('$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.MTP.props')" />
+
+  <PropertyGroup>
+    <!-- Coverlet is now opt-in via '- -coverage' command line argument -->
+    <!-- No automatic instrumentation without explicit user request -->
+    <CoverletMTPEnabled Condition="'$(CoverletMTPEnabled)' == ''">false</CoverletMTPEnabled>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Register the extension assembly for MTP to discover -->
+    <TestingPlatformExtension Include="$(MSBuildThisFileDirectory)..\..\lib\$(TargetFramework)\coverlet.MTP.dll" />
+  </ItemGroup>
 </Project>

test/coverlet.MTP.unit.tests/coverlet.MTP.unit.tests.csproj

@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit.v3" />
-    <PackageReference Include="xunit.runner.visualstudio">
+    <PackageReference Include="xunit.v3.mtp-v2" />
+    <PackageReference Include="xunit.runner.visualstudio" >
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

test/coverlet.MTP.validation.tests/TestProjects/BasicTestProject/BasicTestProject.csproj

@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <!-- XUnit v3 for Microsoft Testing Platform -->
-    <PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitV3Version)" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)"/>
 
 		<!-- Coverlet MTP Extension - version will be provided by local NuGet.config -->

test/coverlet.MTP.validation.tests/TestProjects/CalculateTestProject/CalculateTestProject.csproj

@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.MTP" Version="8.0.0-preview.28" />
-    <PackageReference Include="xunit.v3" Version="3.2.1" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

test/coverlet.MTP.validation.tests/coverlet.MTP.validation.tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- This test project does NOT need MTP runner itself -->
   <!-- It tests a SEPARATE BasicTestProject that uses MTP -->
   <PropertyGroup>
@@ -20,7 +20,8 @@
     </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitV3Version)"/>
+    <PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NugetPackageVersion)" />
   </ItemGroup>
 

test/coverlet.collector.tests/coverlet.collector.tests.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

test/coverlet.core.coverage.tests/coverlet.core.coverage.tests.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Moq" />
     <PackageReference Include="Tmds.ExecFunction" />
     <PackageReference Include="ReportGenerator.Core" />
-    <PackageReference Include="xunit.v3" VersionOverride="2.0.0"/>
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

test/coverlet.core.performancetest/coverlet.core.performancetest.csproj

@@ -12,7 +12,7 @@
 		<!-- Microsoft.TestPlatform.TestHost (v18.0.1) dependens of Newtonsoft.Json -->
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <!--<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />-->
-    <PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitV3Version)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/coverlet.core.tests/coverlet.core.tests.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="ReportGenerator.Core" />
     <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="System.Reflection.Metadata" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>