dotnet · AArnott · Dec 24, 2024 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,7 +15,6 @@
     <PackageVersion Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(VSThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(VSThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
@@ -27,15 +26,18 @@
     <PackageVersion Include="System.IO.Pipes" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.combinatorial" Version="1.6.24" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.console" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="xunit.skippablefact" Version="1.5.23" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="1.0.0" />
+    <PackageVersion Include="xunit.combinatorial" Version="2.0.5-alpha" />
+  </ItemGroup>
+  <ItemGroup Label="Library.Template">
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
+    <PackageVersion Include="xunit.v3" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
+    <!-- Put repo-specific GlobalPackageReference items in this group. -->
+  </ItemGroup>
+  <ItemGroup Label="Library.Template">
     <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
     <GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
     <!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->

diff --git a/docfx/docs/toc.yml b/docfx/docs/toc.yml
@@ -1,3 +1,4 @@
+items:
 - name: Features
   href: features.md
 - name: Getting Started

diff --git a/docfx/toc.yml b/docfx/toc.yml
@@ -1,3 +1,4 @@
+items:
 - name: Docs
   href: docs/
 - name: API

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "9.0.101",
     "rollForward": "patch",
     "allowPrerelease": false
   }

diff --git a/test/.editorconfig b/test/.editorconfig
@@ -59,3 +59,6 @@ dotnet_diagnostic.VSTHRD003.severity = silent
 
 # SA1611: Element parameters should be documented
 dotnet_diagnostic.SA1611.severity = silent
+
+# xUnit1051: Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken
+dotnet_diagnostic.xUnit1051.severity = suggestion
diff --git a/test/IsolatedTestHost/IsolatedTestHost.csproj b/test/IsolatedTestHost/IsolatedTestHost.csproj
@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit.abstractions" />
-    <PackageReference Include="xunit.extensibility.core" />
+    <PackageReference Include="xunit.v3.extensibility.core" ExcludeAssets="build" />
   </ItemGroup>
 
 </Project>
diff --git a/test/IsolatedTestHost/TestOutputHelper.cs b/test/IsolatedTestHost/TestOutputHelper.cs
@@ -4,10 +4,22 @@
 namespace IsolatedTestHost
 {
     using System;
-    using Xunit.Abstractions;
+    using Xunit;
 
     internal class TestOutputHelper : ITestOutputHelper
     {
+        public string Output => throw new NotImplementedException();
+
+        public void Write(string message)
+        {
+            Console.Write(message);
+        }
+
+        public void Write(string format, params object[] args)
+        {
+            Console.Write(format, args);
+        }
+
         public void WriteLine(string message)
         {
             Console.WriteLine(message);

diff --git a/test/Nerdbank.Streams.Tests/BufferTextWriterTests.cs b/test/Nerdbank.Streams.Tests/BufferTextWriterTests.cs
@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class BufferTextWriterTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/BufferWriterStreamTests.cs b/test/Nerdbank.Streams.Tests/BufferWriterStreamTests.cs
@@ -11,7 +11,6 @@
 using Microsoft;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class BufferWriterStreamTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/FullDuplexStreamCombineTests.cs b/test/Nerdbank.Streams.Tests/FullDuplexStreamCombineTests.cs
@@ -8,7 +8,6 @@
 using NSubstitute;
 using NSubstitute.ReceivedExtensions;
 using Xunit;
-using Xunit.Abstractions;
 
 public class FullDuplexStreamCombineTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/FullDuplexStreamPairTests.cs b/test/Nerdbank.Streams.Tests/FullDuplexStreamPairTests.cs
@@ -9,7 +9,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class FullDuplexStreamPairTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/HalfDuplexStreamTests.cs b/test/Nerdbank.Streams.Tests/HalfDuplexStreamTests.cs
@@ -11,7 +11,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 #pragma warning disable CS0618 // Type or member is obsolete
 

diff --git a/test/Nerdbank.Streams.Tests/IOPipelinesStreamPipeReaderTests.cs b/test/Nerdbank.Streams.Tests/IOPipelinesStreamPipeReaderTests.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Andrew Arnott. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using System.IO.Pipelines;
-using Xunit.Abstractions;
+using Xunit;
 
 public class IOPipelinesStreamPipeReaderTests : StreamPipeReaderTestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/MonitoringStreamTests.cs b/test/Nerdbank.Streams.Tests/MonitoringStreamTests.cs
@@ -6,7 +6,6 @@
 using Nerdbank.Streams;
 using NSubstitute;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MonitoringStreamTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingProtocolExceptionTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingProtocolExceptionTests.cs
@@ -4,7 +4,6 @@
 using System;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingProtocolExceptionTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamBasicTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamBasicTests.cs
@@ -5,7 +5,6 @@
 using Nerdbank.Streams;
 using NSubstitute;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamBasicTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamChannelOptionsTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamChannelOptionsTests.cs
@@ -6,7 +6,6 @@
 using System.IO.Pipelines;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamChannelOptionsTests : TestBase
 {

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamPerfTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamPerfTests.cs
@@ -14,7 +14,6 @@
 using Nerdbank.Streams;
 using StreamJsonRpc;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamPerfTests : TestBase, IAsyncLifetime
 {
@@ -32,27 +31,28 @@ public MultiplexingStreamPerfTests(ITestOutputHelper logger)
         this.clientPipe = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         Task connectTask = this.serverPipe.WaitForConnectionAsync(this.TimeoutToken);
         await this.clientPipe.ConnectAsync(this.TimeoutToken);
         await connectTask;
     }
 
-    public Task DisposeAsync()
+    public ValueTask DisposeAsync()
     {
         this.serverPipe.Dispose();
         this.clientPipe.Dispose();
-        return Task.CompletedTask;
+        this.Dispose();
+        return default;
     }
 
-    [SkippableFact]
+    [Fact]
     public Task JsonRpcPerf_Pipe() => this.JsonRpcPerf(useChannel: false);
 
-    [SkippableFact]
+    [Fact]
     public Task JsonRpcPerf_Channel() => this.JsonRpcPerf(useChannel: true);
 
-    [SkippableFact]
+    [Fact]
     public async Task SendLargePayloadOnOneStream()
     {
         if (await this.ExecuteInIsolationAsync())
@@ -103,7 +103,7 @@ await Task.WhenAll(
         }
     }
 
-    [SkippableFact]
+    [Fact]
     public async Task SendLargePayloadOnManyChannels()
     {
         if (await this.ExecuteInIsolationAsync())

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamSeededChannelTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamSeededChannelTests.cs
@@ -15,7 +15,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamSeededChannelTests : TestBase, IAsyncLifetime
 {
@@ -61,12 +60,12 @@ public MultiplexingStreamSeededChannelTests(ITestOutputHelper logger)
         this.mx2 = MultiplexingStream.Create(this.transport2, new MultiplexingStream.Options(this.options) { TraceSource = mx2TraceSource, DefaultChannelTraceSourceFactoryWithQualifier = mx2TraceSourceFactory });
     }
 
-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
     {
-        return Task.CompletedTask;
+        return default;
     }
 
-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         await (this.mx1?.DisposeAsync() ?? default);
         await (this.mx2?.DisposeAsync() ?? default);
@@ -75,6 +74,8 @@ public async Task DisposeAsync()
 
         this.mx1?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
         this.mx2?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
+
+        this.Dispose();
     }
 
     [Fact]

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamTests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamTests.cs
@@ -15,7 +15,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 #pragma warning disable SA1401 // Fields should be private
 #pragma warning disable SA1414 // Tuple types in signatures should have element names
@@ -36,12 +35,12 @@ public MultiplexingStreamTests(ITestOutputHelper logger)
 
     protected virtual int ProtocolMajorVersion { get; } = 1;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         await this.ReinitializeMxStreamsAsync(new MultiplexingStream.Options());
     }
 
-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         await (this.mx1?.DisposeAsync() ?? default);
         await (this.mx2?.DisposeAsync() ?? default);
@@ -50,6 +49,8 @@ public async Task DisposeAsync()
 
         this.mx1?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
         this.mx2?.TraceSource.Listeners.OfType<XunitTraceListener>().SingleOrDefault()?.Dispose();
+
+        this.Dispose();
     }
 
     [Fact, Obsolete]
@@ -751,7 +752,7 @@ public async Task PartialFrameSentWithoutExplicitFlush()
         await ReadAtLeastAsync(s2, new ArraySegment<byte>(recvBuffer), recvBuffer.Length, this.TimeoutToken);
     }
 
-    [SkippableTheory]
+    [Theory]
     [InlineData(true)]
     [InlineData(false)]
     public async Task CancelChannelOfferBeforeAcceptance(bool cancelFirst)
@@ -771,20 +772,20 @@ public async Task CancelChannelOfferBeforeAcceptance(bool cancelFirst)
                 await Task.Delay(250);
             }
 
-            MultiplexingStream.Channel? acceptedChannel = await this.mx2.AcceptChannelAsync(string.Empty, ExpectedTimeoutToken).ConfigureAwait(false);
+            MultiplexingStream.Channel? acceptedChannel = await this.mx2.AcceptChannelAsync(string.Empty, ExpectedTimeoutToken);
             acceptedStream = acceptedChannel.AsStream();
 
             // In this case, we accepted the channel before receiving the cancellation notice. The channel should be terminated by the remote side very soon.
             int bytesRead = await acceptedStream.ReadAsync(new byte[1], 0, 1, this.TimeoutToken).WithCancellation(this.TimeoutToken);
             Assert.Equal(0, bytesRead); // confirm that the stream was closed.
             this.Logger.WriteLine("Verified the channel terminated condition.");
-            Skip.If(cancelFirst);
+            Assert.SkipWhen(cancelFirst, "Skipped");
         }
         catch (OperationCanceledException) when (acceptedStream == null)
         {
             // In this case, the channel offer was canceled before we accepted it.
             this.Logger.WriteLine("Verified the channel offer was canceled before acceptance condition.");
-            Skip.IfNot(cancelFirst);
+            Assert.SkipUnless(cancelFirst, "Skipped");
         }
     }
 

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamV2Tests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamV2Tests.cs
@@ -8,7 +8,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamV2Tests : MultiplexingStreamTests
 {

diff --git a/test/Nerdbank.Streams.Tests/MultiplexingStreamV3Tests.cs b/test/Nerdbank.Streams.Tests/MultiplexingStreamV3Tests.cs
@@ -6,7 +6,6 @@
 using Microsoft.VisualStudio.Threading;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class MultiplexingStreamV3Tests : MultiplexingStreamV2Tests
 {

diff --git a/test/Nerdbank.Streams.Tests/Nerdbank.Streams.Tests.csproj b/test/Nerdbank.Streams.Tests/Nerdbank.Streams.Tests.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net472</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RootNamespace />
 
@@ -32,11 +33,9 @@
     <PackageReference Include="PInvoke.Kernel32" />
     <PackageReference Include="StreamJsonRpc" />
     <PackageReference Include="System.IO.Pipes" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.combinatorial" />
-    <PackageReference Include="xunit.runner.console" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit.skippablefact" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IsolatedTestHost\IsolatedTestHost.csproj">

diff --git a/test/Nerdbank.Streams.Tests/NestedPipeReaderTests.cs b/test/Nerdbank.Streams.Tests/NestedPipeReaderTests.cs
@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using Nerdbank.Streams;
 using Xunit;
-using Xunit.Abstractions;
 
 public class NestedPipeReaderTests : TestBase, IAsyncLifetime
 {
@@ -20,9 +19,13 @@ public NestedPipeReaderTests(ITestOutputHelper logger)
     {
     }
 
-    public Task DisposeAsync() => Task.CompletedTask;
+    public ValueTask DisposeAsync()
+    {
+        this.Dispose();
+        return default;
+    }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         await this.pipe.Writer.WriteAsync(OriginalBuffer, this.TimeoutToken);
     }

diff --git a/test/Nerdbank.Streams.Tests/NestedStreamTests.cs b/test/Nerdbank.Streams.Tests/NestedStreamTests.cs
@@ -7,7 +7,6 @@
 using Nerdbank.Streams;
 using NSubstitute;
 using Xunit;
-using Xunit.Abstractions;
 
 public class NestedStreamTests : TestBase
 {