diff --git a/Directory.packages.props b/Directory.packages.props
index b58226de08..301a22823a 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -1,9 +1,9 @@
-
+
-
+
@@ -24,11 +24,12 @@
+
-
-
-
+
+
+
diff --git a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
index 66ee05538b..b7ec25b1ac 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
+++ b/tests/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -4,6 +4,9 @@
net472;net6.0-windows;net8.0-windows
MaterialDesignColors.Wpf.Tests
MaterialDesignColors.Wpf.Tests
+ true
+ Exe
+ true
@@ -25,9 +28,15 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
\ No newline at end of file
diff --git a/tests/MaterialDesignColors.Wpf.Tests/ResourceProviderFixture.cs b/tests/MaterialDesignColors.Wpf.Tests/ResourceProviderFixture.cs
index d54a25183a..80a410690a 100644
--- a/tests/MaterialDesignColors.Wpf.Tests/ResourceProviderFixture.cs
+++ b/tests/MaterialDesignColors.Wpf.Tests/ResourceProviderFixture.cs
@@ -1,7 +1,7 @@
using Shouldly;
using Xunit;
-namespace MaterialDesignColors.Wpf.Fixture;
+namespace MaterialDesignColors.Wpf.Tests;
public class ResourceProviderFixture
{
diff --git a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
index c75b048ec9..d364527ea0 100644
--- a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
+++ b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -6,6 +6,9 @@
true
$(NoWarn);CA1707
true
+ true
+ Exe
+ true
@@ -19,18 +22,17 @@
-
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
diff --git a/tests/MaterialDesignThemes.UITests/TestBase.cs b/tests/MaterialDesignThemes.UITests/TestBase.cs
index 66615f971c..1a48415e54 100644
--- a/tests/MaterialDesignThemes.UITests/TestBase.cs
+++ b/tests/MaterialDesignThemes.UITests/TestBase.cs
@@ -46,7 +46,7 @@ protected async Task LoadUserControl(Type userControlType)
return await App.CreateWindowWithUserControl(userControlType);
}
- public async Task InitializeAsync() =>
+ public async ValueTask InitializeAsync() =>
App = await XamlTest.App.StartRemote(new AppOptions
{
#if !DEBUG
@@ -55,5 +55,6 @@ public async Task InitializeAsync() =>
AllowVisualStudioDebuggerAttach = AttachedDebuggerToRemoteProcess,
LogMessage = Output.WriteLine
});
- public async Task DisposeAsync() => await App.DisposeAsync();
+
+ public async ValueTask DisposeAsync() => await App.DisposeAsync();
}
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
index 4c7aba9f93..483f73bc83 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
@@ -862,7 +862,7 @@ public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingEx
await item1.LeftClickExpander();
//NB: Needs to be long enough delay so the next click does not register as a double click
- await Task.Delay(1000);
+ await Task.Delay(1000, TestContext.Current.CancellationToken);
// Add children to item "1_1" and expand
IVisualElement item11 = await treeListView.GetElement("/TreeListViewItem[3]");
@@ -870,16 +870,16 @@ public async Task TopLevelItemWithNestedExpandedChild_MovesChildrenMaintainingEx
await item11.LeftClickExpander();
//NB: Needs to be long enough delay so the next click does not register as a double click
- await Task.Delay(1000);
+ await Task.Delay(1000, TestContext.Current.CancellationToken);
//Move parent item down
await item1.LeftClick();
await upButton.LeftClick();
- await Task.Delay(1000);
+ await Task.Delay(1000, TestContext.Current.CancellationToken);
await downButton.LeftClick();
- await Task.Delay(1000);
+ await Task.Delay(1000, TestContext.Current.CancellationToken);
//Assert the child was successfully moved
await AssertTreeItemContent(treeListView, 0, "0");
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs
index cfc94767c2..b6cc44e812 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs
@@ -1,7 +1,6 @@
using System.ComponentModel;
using System.Threading;
using System.Windows.Threading;
-using Xunit;
namespace MaterialDesignThemes.Wpf.Tests;
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/EnumDataAttribute.cs b/tests/MaterialDesignThemes.Wpf.Tests/EnumDataAttribute.cs
index 1365affc42..dbaf54d660 100644
--- a/tests/MaterialDesignThemes.Wpf.Tests/EnumDataAttribute.cs
+++ b/tests/MaterialDesignThemes.Wpf.Tests/EnumDataAttribute.cs
@@ -1,11 +1,12 @@
using System.Reflection;
using Xunit.Sdk;
+using Xunit.v3;
namespace MaterialDesignThemes.Wpf.Tests;
public class EnumDataAttribute : DataAttribute
{
- public override IEnumerable GetData(MethodInfo testMethod)
+ public override ValueTask> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
{
ParameterInfo[] parameters = testMethod.GetParameters();
if (parameters.Length != 1 ||
@@ -14,14 +15,15 @@ public override IEnumerable GetData(MethodInfo testMethod)
throw new Exception($"{testMethod.DeclaringType?.FullName}.{testMethod.Name} must have a single enum parameter");
}
- return GetDataImplementation(parameters[0].ParameterType);
+ return new([..GetDataImplementation(parameters[0].ParameterType)]);
- static IEnumerable GetDataImplementation(Type parameterType)
+ static IEnumerable GetDataImplementation(Type parameterType)
{
foreach (object enumValue in Enum.GetValues(parameterType).OfType