Migrate to xunit.v3 and MTP 2

Directory.Packages.props

@@ -4,9 +4,9 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <MicrosoftTestingPlatformVersion>2.0.2</MicrosoftTestingPlatformVersion>
     <MicroBuildVersion>2.0.208</MicroBuildVersion>
     <CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
-    <CodeAnalysisVersionForTests>4.13.0</CodeAnalysisVersionForTests>
     <CodefixTestingVersion>1.1.2</CodefixTestingVersion>
     <CodeAnalysisAnalyzerVersion>3.11.0-beta1.25076.3</CodeAnalysisAnalyzerVersion>
   </PropertyGroup>
@@ -36,22 +36,17 @@
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
-    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
-    <PackageVersion Include="Xunit.StaFact" Version="1.2.69" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(IsTestProject)'=='true'">
-    <PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForTests)" />
-    <PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForTests)" />
-    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForTests)" />
-    <PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForTests)" />
+    <PackageVersion Include="xunit.v3.core.mtp-v2" Version="3.2.1" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
+    <PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
   </ItemGroup>
   <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="$(CodeAnalysisAnalyzerVersion)" />

azure-pipelines/Merge-CodeCoverage.ps1

@@ -28,6 +28,7 @@ try {
     if ($reports) {
         $reports |% { $_.FullName } |% {
             # In addition to replacing {reporoot}, we also normalize on one kind of slash so that the report aggregates data for a file whether data was collected on Windows or not.
+            Write-Verbose "Processing $_"
             $xml = [xml](Get-Content -LiteralPath $_)
             $xml.coverage.packages.package.classes.class |? { $_.filename} |% {
                 $_.filename = $_.filename.Replace('{reporoot}', $RepoRoot).Replace([IO.Path]::AltDirectorySeparatorChar, [IO.Path]::DirectorySeparatorChar)

global.json

@@ -1,9 +1,12 @@
 {
   "sdk": {
-    "version": "10.0.100",
+    "version": "10.0.101",
     "rollForward": "patch",
     "allowPrerelease": false
   },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  },
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "3.0.44",
     "Microsoft.Build.NoTargets": "3.7.134",

src/Microsoft.VisualStudio.Threading/ListOfOftenOne`1.cs

@@ -3,11 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Microsoft.VisualStudio.Threading;
 

src/Microsoft.VisualStudio.Threading/WeakKeyDictionary`2.cs

@@ -214,7 +214,7 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
     /// </summary>
     internal bool Any()
     {
-        foreach (KeyValuePair<WeakKeyDictionary<TKey, TValue>.WeakReference<TKey>, TValue> item in this.dictionary)
+        foreach (KeyValuePair<WeakReference<TKey>, TValue> item in this.dictionary)
         {
             if (item.Key.IsAlive)
             {

test/.editorconfig

@@ -80,3 +80,6 @@ dotnet_diagnostic.SA1401.severity = silent
 
 # SA1133: Do not combine attributes
 dotnet_diagnostic.SA1133.severity = silent
+
+# xUnit1051: Use TestContext.Current.CancellationToken
+dotnet_diagnostic.xUnit1051.severity = suggestion

test/Directory.Build.props

@@ -3,9 +3,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
-    <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
   </PropertyGroup>
 
   <ItemGroup>

test/Directory.Build.targets

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+  <ItemGroup Condition="'$(IsTestProject)' != 'false'">
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CrashDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.HangDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="Exists('xunit.runner.json')" />
   </ItemGroup>

test/Directory.Packages.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <CodeAnalysisVersionForTests>4.13.0</CodeAnalysisVersionForTests>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForTests)" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForTests)" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForTests)" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForTests)" />
+  </ItemGroup>
+</Project>

test/IsolatedTestHost/App.config

@@ -1,29 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
+
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.3.0" newVersion="2.9.3.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="xunit.execution.desktop" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.2.0" newVersion="2.9.2.0" />
-      </dependentAssembly>
-    </assemblyBinding>
   </runtime>
 </configuration>

test/IsolatedTestHost/IsolatedTestHost.csproj

@@ -3,10 +3,11 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net472</TargetFrameworks>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit.abstractions" />
+    <PackageReference Include="xunit.v3.core.mtp-v2" ExcludeAssets="buildTransitive" />
   </ItemGroup>
 
 </Project>

test/IsolatedTestHost/Program.cs

@@ -7,7 +7,6 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Xunit;
 
 namespace IsolatedTestHost;
 
@@ -53,8 +52,7 @@ private static ExitCode MyMain(string assemblyFile, string testClassName, string
         }
 
         bool fact = testMethod.GetCustomAttributesData().Any(a => a.AttributeType.Name == "FactAttribute");
-        bool skippableFact = testMethod.GetCustomAttributesData().Any(a => a.AttributeType.Name == "SkippableFactAttribute");
-        if (fact || skippableFact)
+        if (fact)
         {
             return ExecuteTest(testClass, testMethod);
         }

test/IsolatedTestHost/TestOutputHelper.cs

@@ -1,20 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using Xunit.Abstractions;
+using System.Globalization;
+using System.Text;
+using Xunit;
 
 namespace IsolatedTestHost;
 
 internal class TestOutputHelper : ITestOutputHelper
 {
-    public void WriteLine(string message)
-    {
-        Console.WriteLine(message);
-    }
-
-    public void WriteLine(string format, params object[] args)
-    {
-        Console.WriteLine(format, args);
-    }
+    private readonly StringBuilder builder = new();
+
+    public string Output => this.builder.ToString();
+
+    public void Write(string message) => this.builder.Append(message);
+
+    public void Write(string format, params object[] args) => this.builder.AppendFormat(format, args);
+
+    public void WriteLine(string message) => this.builder.AppendLine(message);
+
+    public void WriteLine(string format, params object[] args) => this.builder.AppendLine(string.Format(CultureInfo.CurrentCulture, format, args));
 }

test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/CSharpCodeFixVerifier`2+Test.cs

@@ -37,7 +37,7 @@ public Test()
 #if WINDOWS
                     project = project.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dispatcher).Assembly.Location));
 #else
-                    Skip.If(true);
+                    Assert.SkipWhen(true, "Windows only");
 #endif
                 }
 

test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/VisualBasicCodeFixVerifier`2+Test.cs

@@ -37,7 +37,7 @@ public Test()
 #if WINDOWS
                     project = project.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dispatcher).Assembly.Location));
 #else
-                    Skip.If(true);
+                    Assert.SkipWhen(true, "Windows only");
 #endif
                 }
 

test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
-    <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
@@ -25,13 +25,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.VisualStudio.Interop" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" IncludeAssets="None" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" IncludeAssets="None" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="Xunit.SkippableFact" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\src\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\buildTransitive\AdditionalFiles\**"

test/Microsoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD001UseSwitchToMainThreadAsyncAnalyzerTests.cs

@@ -53,7 +53,7 @@ void Foo() {
         await CSVerify.VerifyAnalyzerAsync(test, CSVerify.Diagnostic().WithLocation(0));
     }
 
-    [SkippableFact]
+    [Fact]
     public async Task DispatcherInvoke_ProducesDiagnostic()
     {
         var test = @"
@@ -71,7 +71,7 @@ void Foo() {
         await t.RunAsync();
     }
 
-    [SkippableFact]
+    [Fact]
     public async Task DispatcherBeginInvoke_ProducesDiagnostic()
     {
         var test = @"
@@ -90,7 +90,7 @@ void Foo() {
         await t.RunAsync();
     }
 
-    [SkippableFact]
+    [Fact]
     public async Task DispatcherInvokeAsync_ProducesDiagnostic()
     {
         var test = @"

test/Microsoft.VisualStudio.Threading.Tests.Win7RegistryWatcher/Microsoft.VisualStudio.Threading.Tests.Win7RegistryWatcher.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Threading\Microsoft.VisualStudio.Threading.csproj" />

test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Xunit;
-
 // Some of our tests measure stress, GC pressure, etc.
 // It messes with reliable test results when other threads are doing random stuff.
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

test/Microsoft.VisualStudio.Threading.Tests/AsyncAutoResetEventTests.cs

@@ -4,14 +4,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Threading;
-using Xunit;
 
 public class AsyncAutoResetEventTests : TestBase
 {
     private AsyncAutoResetEvent evt;
 
-    public AsyncAutoResetEventTests(Xunit.Abstractions.ITestOutputHelper logger)
+    public AsyncAutoResetEventTests(ITestOutputHelper logger)
         : base(logger)
     {
         this.evt = new AsyncAutoResetEvent();
@@ -200,7 +198,7 @@ public async Task WaitAsync_Canceled_Stress()
     /// <summary>
     /// Verifies that long-lived, uncanceled CancellationTokens do not result in leaking memory.
     /// </summary>
-    [SkippableFact(Skip = "It always fails after xunit 2.8 update.")]
+    [Fact(Skip = "It always fails after xunit 2.8 update.")]
     [Trait("GC", "true")]
     [Trait("TestCategory", "FailsInCloudTest")]
     public async Task WaitAsync_WithCancellationToken_DoesNotLeakWhenNotCanceled()
@@ -222,7 +220,7 @@ public async Task WaitAsync_WithCancellationToken_DoesNotLeakWhenNotCanceled()
     /// <summary>
     /// Verifies that canceled CancellationTokens do not result in leaking memory.
     /// </summary>
-    [SkippableFact(Skip = "It always fails after xunit 2.8 update.")]
+    [Fact(Skip = "It always fails after xunit 2.8 update.")]
     [Trait("GC", "true")]
     [Trait("TestCategory", "FailsInCloudTest")]
     public async Task WaitAsync_WithCancellationToken_DoesNotLeakWhenCanceled()

test/Microsoft.VisualStudio.Threading.Tests/AsyncBarrierTests.cs

@@ -6,9 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft;
-using Microsoft.VisualStudio.Threading;
-using Xunit;
-using Xunit.Abstractions;
 
 public class AsyncBarrierTests : TestBase
 {

test/Microsoft.VisualStudio.Threading.Tests/AsyncCountdownEventTests.cs

@@ -4,9 +4,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Threading;
-using Xunit;
-using Xunit.Abstractions;
 
 public class AsyncCountdownEventTests : TestBase
 {

test/Microsoft.VisualStudio.Threading.Tests/AsyncCrossProcessMutexTests.cs

@@ -4,9 +4,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Threading;
-using Xunit;
-using Xunit.Abstractions;
 
 public class AsyncCrossProcessMutexTests : TestBase, IDisposable
 {

test/Microsoft.VisualStudio.Threading.Tests/AsyncLazyInitializerTests.cs

@@ -4,9 +4,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.Threading;
-using Xunit;
-using Xunit.Abstractions;
 
 public class AsyncLazyInitializerTests : TestBase
 {