diff --git a/Directory.Packages.props b/Directory.Packages.props
index 20d2189f0..da87d3770 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -73,7 +73,7 @@
-
+
@@ -84,27 +84,23 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
+
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index bc6cb5d3e..cf491ca78 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -12,6 +12,7 @@
false
true
true
+ Exe
@@ -24,19 +25,19 @@
-
+
-
+
-
+
@@ -46,7 +47,6 @@
-
diff --git a/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.cs b/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.cs
index cb9ef0eab..1cce21a7e 100644
--- a/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.cs
+++ b/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.cs
@@ -14,7 +14,7 @@ public Task Generator()
var generator = new WrapperElementsGenerator();
GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
- driver = driver.RunGenerators(inputCompilation);
+ driver = driver.RunGenerators(inputCompilation, Xunit.TestContext.Current.CancellationToken);
var settings = new VerifySettings();
settings.AutoVerify();
diff --git a/tests/bunit.generators.tests/bunit.generators.tests.csproj b/tests/bunit.generators.tests/bunit.generators.tests.csproj
index 8d65fcec9..a59629e50 100644
--- a/tests/bunit.generators.tests/bunit.generators.tests.csproj
+++ b/tests/bunit.generators.tests/bunit.generators.tests.csproj
@@ -15,12 +15,12 @@
-
+
-
+
diff --git a/tests/bunit.testassets/DumpCapture.cs b/tests/bunit.testassets/DumpCapture.cs
index 2f3a1ebfd..822fddf28 100644
--- a/tests/bunit.testassets/DumpCapture.cs
+++ b/tests/bunit.testassets/DumpCapture.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
using System.Runtime.CompilerServices;
-using Xunit.Abstractions;
+using Xunit;
namespace Bunit.TestAssets;
diff --git a/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs b/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs
index 16b449e8d..86cc61c2e 100644
--- a/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs
+++ b/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs
@@ -1,8 +1,9 @@
using Serilog.Core;
using Serilog.Events;
using Serilog.Formatting;
-using Xunit.Abstractions;
+using Xunit;
using Xunit.Sdk;
+using Xunit.v3;
namespace Serilog.Sinks.XUnit;
diff --git a/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs b/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs
index a5f831cd5..b68cc2b32 100644
--- a/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs
+++ b/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs
@@ -4,7 +4,8 @@
using Serilog.Formatting;
using Serilog.Formatting.Display;
using Serilog.Sinks.XUnit;
-using Xunit.Abstractions;
+using Xunit;
+using Xunit.Sdk;
namespace Serilog;
diff --git a/tests/bunit.testassets/ServiceCollectionLoggingExtensions.cs b/tests/bunit.testassets/ServiceCollectionLoggingExtensions.cs
index 4369522b4..c83ab00b9 100644
--- a/tests/bunit.testassets/ServiceCollectionLoggingExtensions.cs
+++ b/tests/bunit.testassets/ServiceCollectionLoggingExtensions.cs
@@ -2,7 +2,6 @@
using Serilog;
using Serilog.Events;
using Serilog.Templates;
-using Xunit.Abstractions;
namespace Xunit;
diff --git a/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs b/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs
index 7ced47dc8..cba5cb039 100644
--- a/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs
+++ b/tests/bunit.testassets/XunitExtensions/RepeatAttribute.cs
@@ -1,5 +1,6 @@
using System.Reflection;
using Xunit.Sdk;
+using Xunit.v3;
namespace Xunit;
@@ -20,11 +21,12 @@ public RepeatAttribute(int count)
Count = count;
}
- public override IEnumerable GetData(MethodInfo testMethod)
+ public override ValueTask> GetData(MethodInfo testMethod,
+ DisposalTracker disposalTracker)
{
- for (int count = 1; count <= Count; count++)
- {
- yield return new object[] { count };
- }
+ var rows = Enumerable.Range(1, Count).Select(i => new TheoryDataRow(new object[] { i })).ToArray();
+ return new ValueTask>(rows);
}
+
+ public override bool SupportsDiscoveryEnumeration() => false;
}
diff --git a/tests/bunit.testassets/XunitExtensions/UseCultureAttribute.cs b/tests/bunit.testassets/XunitExtensions/UseCultureAttribute.cs
index 28c5fcca5..addd02d2a 100644
--- a/tests/bunit.testassets/XunitExtensions/UseCultureAttribute.cs
+++ b/tests/bunit.testassets/XunitExtensions/UseCultureAttribute.cs
@@ -1,6 +1,7 @@
using System.Globalization;
using System.Reflection;
using Xunit.Sdk;
+using Xunit.v3;
namespace Xunit;
@@ -62,7 +63,7 @@ public UseCultureAttribute(string culture, string uiCulture)
/// and replaces them with the new cultures defined in the constructor.
///
/// The method under test
- public override void Before(MethodInfo methodUnderTest)
+ public override void Before(MethodInfo methodUnderTest, IXunitTest test)
{
originalCulture = Thread.CurrentThread.CurrentCulture;
originalUICulture = Thread.CurrentThread.CurrentUICulture;
@@ -79,7 +80,7 @@ public override void Before(MethodInfo methodUnderTest)
/// to
///
/// The method under test
- public override void After(MethodInfo methodUnderTest)
+ public override void After(MethodInfo methodUnderTest, IXunitTest test)
{
Thread.CurrentThread.CurrentCulture = originalCulture;
Thread.CurrentThread.CurrentUICulture = originalUICulture;
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
index 9d5c0f6d4..96fe12aa6 100644
--- a/tests/bunit.testassets/bunit.testassets.csproj
+++ b/tests/bunit.testassets/bunit.testassets.csproj
@@ -16,9 +16,8 @@
-
-
-
+
+
diff --git a/tests/bunit.tests/Rendering/BunitHtmlParserTest.cs b/tests/bunit.tests/Rendering/BunitHtmlParserTest.cs
index a9f5473ff..3f386b6ea 100644
--- a/tests/bunit.tests/Rendering/BunitHtmlParserTest.cs
+++ b/tests/bunit.tests/Rendering/BunitHtmlParserTest.cs
@@ -31,7 +31,8 @@ public class BunitHtmlParserTest
};
public static readonly IEnumerable BodyHtmlAndSpecialElements =
- TheoryDataExtensions.AddRange(BodyHtmlElements.Clone(), "html", "head", "body");
+ TheoryDataExtensions.AddRange(BodyHtmlElements.Clone(), "html", "head", "body")
+ .Select(data => new object[] { data });
public static readonly TheoryData SvgElements = new TheoryData
{