initial commit

Bertk · Bertk · commit 94f609f2c2ca · 2024-11-21T12:27:41.000+01:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -45,10 +45,11 @@
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
-    <PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
-    <PackageVersion Include="xunit.assert" Version="2.6.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageVersion Include="xunit.v3.core" Version="0.6.0-pre.7" />
+    <PackageVersion Include="xunit.v3.assert" Version="0.6.0-pre.7" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="0.6.0-pre.7" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
     <PackageVersion Include="System.Buffers" Version="4.5.1" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
diff --git a/Documentation/Examples/MSBuild/DeterministicBuild/HowTo.md b/Documentation/Examples/MSBuild/DeterministicBuild/HowTo.md
@@ -45,8 +45,8 @@ Add msbuild package version generated to `"..\Documentation\Examples\MSBuild\Det
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.5" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj b/Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj b/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj
@@ -12,11 +12,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="2.6.6" />
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-</PackageReference>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj b/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj
@@ -12,8 +12,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/XUnitTestProject3.csproj b/Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/XUnitTestProject3.csproj
@@ -12,8 +12,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/VSTest/DeterministicBuild/HowTo.md b/Documentation/Examples/VSTest/DeterministicBuild/HowTo.md
@@ -45,8 +45,8 @@ Add collectors package version generated to `"..\Documentation\Examples\VSTest\D
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.5" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/VSTest/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj b/Documentation/Examples/VSTest/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/XUnitTestProject1.csproj b/Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/XUnitTestProject1.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/Documentation/Troubleshooting.md b/Documentation/Troubleshooting.md
@@ -178,8 +178,11 @@ To use/debug local collectors build we need to tell to our project to restore an
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.5" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
         <PackageReference Include="coverlet.collector" Version="6.0.0" /> <-- My local package version -->
     </ItemGroup>
 
diff --git a/coverlet.sln b/coverlet.sln
@@ -149,7 +149,6 @@ Global
 		{5FF404AD-7C0B-465A-A1E9-558CDC642B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FF404AD-7C0B-465A-A1E9-558CDC642B0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8199E19-FA9A-4559-9101-CAD7028121B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8199E19-FA9A-4559-9101-CAD7028121B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8199E19-FA9A-4559-9101-CAD7028121B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8199E19-FA9A-4559-9101-CAD7028121B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CBF6966-2A67-4D2C-8598-D174B83072F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/test/coverlet.collector.tests/coverlet.collector.tests.csproj b/test/coverlet.collector.tests/coverlet.collector.tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj b/test/coverlet.core.performancetest/coverlet.core.performancetest.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/coverlet.core.tests/Coverage/CoverageTests.ExcludeFromCoverageAttribute.cs b/test/coverlet.core.tests/Coverage/CoverageTests.ExcludeFromCoverageAttribute.cs
@@ -19,9 +19,9 @@ namespace Coverlet.Core.Tests
   public partial class CoverageTests
   {
 
-    [ConditionalFact]
-    [SkipOnOS(OS.MacOS, "Windows path format only - Simplified output paths issue")]
-    [SkipOnOS(OS.Linux, "Windows path format only - Simplified output paths issue")]
+    [Fact]
+    [SupportedOS(SupportedOS.Windows)]
+
     public void TestCoverageSkipModule__AssemblyMarkedAsExcludeFromCodeCoverage()
     {
       var partialMockFileSystem = new Mock<FileSystem>();
@@ -210,13 +210,13 @@ public void ExcludeFromCodeCoverage_Issue809()
 
         // public async Task<bool> EditTask(Tasks_Issue809 tasks, int val)
         .AssertNonInstrumentedLines(BuildConfiguration.Debug, 153, 162)
-        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 167, 170) -> Shoud be not covered, issue with lambda
+        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 167, 170) -> Should be not covered, issue with lambda
         .AssertNonInstrumentedLines(BuildConfiguration.Debug, 167, 197)
 
         // public List<Tasks_Issue809> GetAllTasks()
-        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 263, 266) -> Shoud be not covered, issue with lambda
+        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 263, 266) -> Should be not covered, issue with lambda
         .AssertNonInstrumentedLines(BuildConfiguration.Debug, 263, 264);
-        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 269, 275) -> Shoud be not covered, issue with lambda
+        // .AssertNonInstrumentedLines(BuildConfiguration.Debug, 269, 275) -> Should be not covered, issue with lambda
       }
       finally
       {
diff --git a/test/coverlet.core.tests/Helpers/SourceRootTranslatorTests.cs b/test/coverlet.core.tests/Helpers/SourceRootTranslatorTests.cs
@@ -11,9 +11,8 @@ namespace Coverlet.Core.Helpers.Tests
 {
   public class SourceRootTranslatorTests
   {
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux, "Windows path format only")]
-    [SkipOnOS(OS.MacOS, "Windows path format only")]
+    [Fact]
+    [SupportedOS(SupportedOS.Windows)]
     public void Translate_Success()
     {
       string fileToTranslate = "/_/src/coverlet.core/obj/Debug/netstandard2.0/coverlet.core.pdb";
@@ -32,9 +31,8 @@ public void Translate_Success()
       Assert.Equal(@"C:\git\coverlet\src\coverlet.core\obj\Debug\netstandard2.0\coverlet.core.pdb", translator.ResolveFilePath(fileToTranslate));
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux, "Windows path format only")]
-    [SkipOnOS(OS.MacOS, "Windows path format only")]
+    [Fact]
+    [SupportedOS(SupportedOS.Windows)]
     public void TranslatePathRoot_Success()
     {
       var logger = new Mock<ILogger>();
@@ -51,9 +49,8 @@ public void TranslatePathRoot_Success()
       Assert.Equal(@"C:\git\coverlet\", translator.ResolvePathRoot("/_/")[0].OriginalPath);
     }
 
-    [ConditionalFact]
-    [SkipOnOS(OS.Linux, "Windows path format only")]
-    [SkipOnOS(OS.MacOS, "Windows path format only")]
+    [Fact]
+    [SupportedOS(SupportedOS.Windows)]
     public void TranslateWithDirectFile_Success()
     {
       var logger = new Mock<ILogger>();
diff --git a/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs b/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs
@@ -292,14 +292,14 @@ public void TestInstrument_NetStandardAwareAssemblyResolver_FromFolder()
       // We create dummy netstandard.dll
       var compilation = CSharpCompilation.Create(
           "netstandard",
-          new[] { CSharpSyntaxTree.ParseText("") },
+          new[] { CSharpSyntaxTree.ParseText("", cancellationToken: TestContext.Current.CancellationToken) },
           new[] { MetadataReference.CreateFromFile(typeof(object).Assembly.Location) },
           new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
       Assembly newAssemlby;
       using (var dllStream = new MemoryStream())
       {
-        EmitResult emitResult = compilation.Emit(dllStream);
+        EmitResult emitResult = compilation.Emit(dllStream, cancellationToken: TestContext.Current.CancellationToken);
         Assert.True(emitResult.Success);
         newAssemlby = Assembly.Load(dllStream.ToArray());
         // remove if exists
@@ -551,7 +551,7 @@ public void TestInstrument_AssemblyMarkedAsExcludeFromCodeCoverage(string attrib
     {
       string EmitAssemblyToInstrument(string outputFolder)
       {
-        SyntaxTree attributeClassSyntaxTree = CSharpSyntaxTree.ParseText("[System.AttributeUsage(System.AttributeTargets.Assembly)]public class " + attributeName + ":System.Attribute{}");
+        SyntaxTree attributeClassSyntaxTree = CSharpSyntaxTree.ParseText("[System.AttributeUsage(System.AttributeTargets.Assembly)]public class " + attributeName + ":System.Attribute{}", cancellationToken: TestContext.Current.CancellationToken);
         SyntaxTree instrumentableClassSyntaxTree = CSharpSyntaxTree.ParseText($@"
 [assembly:{attributeName}]
 namespace coverlet.tests.projectsample.excludedbyattribute{{
@@ -564,7 +564,7 @@ public int SampleMethod()
 }}
 
 }}
-");
+", cancellationToken: TestContext.Current.CancellationToken);
         CSharpCompilation compilation = CSharpCompilation.Create(attributeName, new List<SyntaxTree>
                 {
                     attributeClassSyntaxTree,instrumentableClassSyntaxTree
@@ -580,7 +580,7 @@ public int SampleMethod()
         {
           bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
           var emitOptions = new EmitOptions(pdbFilePath: pdbPath);
-          EmitResult emitResult = compilation.Emit(outputStream, pdbStream, options: isWindows ? emitOptions : emitOptions.WithDebugInformationFormat(DebugInformationFormat.PortablePdb));
+          EmitResult emitResult = compilation.Emit(outputStream, pdbStream, options: isWindows ? emitOptions : emitOptions.WithDebugInformationFormat(DebugInformationFormat.PortablePdb), cancellationToken: TestContext.Current.CancellationToken);
           if (!emitResult.Success)
           {
             string message = "Failure to dynamically create dll";
@@ -658,7 +658,7 @@ public void TestReachabilityHelper()
                     140, 141, 142, 143, 144,
                     // WithLeave
                     147, 149, 150, 151, 152, 153, 154, 155, 156, 159, 161, 163, 166, 167, 168,
-                    // FiltersAndFinallies
+                    // FiltersAndFinally
                     171, 173, 174, 175, 176, 177, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197
           };
       int[] notReachableLines =
diff --git a/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs b/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs
@@ -127,16 +127,16 @@ public void MutexBlocksMultipleWriters()
         Assert.True(createdNew);
 
         ModuleTrackerTemplate.HitsArray = new[] { 0, 1, 2, 3 };
-        var unloadTask = Task.Run(() => ModuleTrackerTemplate.UnloadModule(null, null));
+        var unloadTask = Task.Run(() => ModuleTrackerTemplate.UnloadModule(null, null), TestContext.Current.CancellationToken);
 
 #pragma warning disable xUnit1031 // Do not use blocking task operations in test method
-        Assert.False(unloadTask.Wait(5));
+        Assert.False(unloadTask.Wait(5, cancellationToken: TestContext.Current.CancellationToken));
 #pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         WriteHitsFile(new[] { 0, 3, 2, 1 });
 
 #pragma warning disable xUnit1031 // Do not use blocking task operations in test method
-        Assert.False(unloadTask.Wait(5));
+        Assert.False(unloadTask.Wait(5, cancellationToken: TestContext.Current.CancellationToken));
 #pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         mutex.ReleaseMutex();
diff --git a/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs b/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 using Coverlet.Core.Abstractions;
@@ -28,9 +27,9 @@ public void TestReport()
       string report = reporter.Report(result, new Mock<ISourceRootTranslator>().Object);
       Assert.NotEmpty(report);
       var doc = XDocument.Load(new StringReader(report));
-      Assert.Empty(doc.Descendants().Attributes("sequenceCoverage").Where(v => v.Value != "33.33"));
-      Assert.Empty(doc.Descendants().Attributes("branchCoverage").Where(v => v.Value != "25"));
-      Assert.Empty(doc.Descendants().Attributes("nPathComplexity").Where(v => v.Value != "4"));
+      Assert.DoesNotContain(doc.Descendants().Attributes("sequenceCoverage"), v => v.Value != "33.33");
+      Assert.DoesNotContain(doc.Descendants().Attributes("branchCoverage"), v => v.Value != "25");
+      Assert.DoesNotContain(doc.Descendants().Attributes("nPathComplexity"), v => v.Value != "4");
     }
 
     [Fact]
diff --git a/test/coverlet.core.tests/coverlet.core.tests.csproj b/test/coverlet.core.tests/coverlet.core.tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
 
   <PropertyGroup>
@@ -21,8 +21,10 @@
     <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="System.Reflection.Metadata" />
     <PackageReference Include="Tmds.ExecFunction" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" >
+    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.core" />
+    <PackageReference Include="xunit.v3.extensibility.core" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/coverlet.integration.determisticbuild/coverlet.integration.determisticbuild.csproj b/test/coverlet.integration.determisticbuild/coverlet.integration.determisticbuild.csproj
@@ -24,8 +24,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
diff --git a/test/coverlet.integration.template/coverlet.integration.template.csproj b/test/coverlet.integration.template/coverlet.integration.template.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>coverletsamplelib.integration.template</AssemblyName>
     <IsTestProject>false</IsTestProject>
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.6.6"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
diff --git a/test/coverlet.integration.tests/DeterministicBuild.cs b/test/coverlet.integration.tests/DeterministicBuild.cs
@@ -10,7 +10,6 @@
 using Coverlet.Tests.Utils;
 using Newtonsoft.Json;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Coverlet.Integration.Tests
 {
diff --git a/test/coverlet.integration.tests/DotnetTool.cs b/test/coverlet.integration.tests/DotnetTool.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using Coverlet.Tests.Utils;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Coverlet.Integration.Tests
 {
diff --git a/test/coverlet.integration.tests/Msbuild.cs b/test/coverlet.integration.tests/Msbuild.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using Coverlet.Tests.Utils;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Coverlet.Integration.Tests
 {
diff --git a/test/coverlet.integration.tests/coverlet.integration.tests.csproj b/test/coverlet.integration.tests/coverlet.integration.tests.csproj
diff --git a/test/coverlet.msbuild.tasks.tests/CoverageResultTaskTests.cs b/test/coverlet.msbuild.tasks.tests/CoverageResultTaskTests.cs
diff --git a/test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj b/test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj
diff --git a/test/coverlet.tests.projectsample.aspmvcrazor.tests/coverlet.tests.projectsample.aspmvcrazor.tests.csproj b/test/coverlet.tests.projectsample.aspmvcrazor.tests/coverlet.tests.projectsample.aspmvcrazor.tests.csproj
diff --git a/test/coverlet.tests.projectsample.aspnet8.tests/coverlet.tests.projectsample.aspnet8.tests.csproj b/test/coverlet.tests.projectsample.aspnet8.tests/coverlet.tests.projectsample.aspnet8.tests.csproj
diff --git a/test/coverlet.tests.remoteexecutor/coverlet.tests.remoteexecutor.csproj b/test/coverlet.tests.remoteexecutor/coverlet.tests.remoteexecutor.csproj
diff --git a/test/coverlet.tests.xunit.extensions/ConditionalFact.cs b/test/coverlet.tests.xunit.extensions/ConditionalFact.cs
diff --git a/test/coverlet.tests.xunit.extensions/Extensions.cs b/test/coverlet.tests.xunit.extensions/Extensions.cs
diff --git a/test/coverlet.tests.xunit.extensions/ITestCondition.cs b/test/coverlet.tests.xunit.extensions/ITestCondition.cs
diff --git a/test/coverlet.tests.xunit.extensions/SkipOnOS.cs b/test/coverlet.tests.xunit.extensions/SkipOnOS.cs
diff --git a/test/coverlet.tests.xunit.extensions/SupportedOS.cs b/test/coverlet.tests.xunit.extensions/SupportedOS.cs
diff --git a/test/coverlet.tests.xunit.extensions/coverlet.tests.xunit.extensions.csproj b/test/coverlet.tests.xunit.extensions/coverlet.tests.xunit.extensions.csproj
