diff --git a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index e4e13f40df..ad6ffc2697 100644 --- a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -2,7 +2,7 @@ MaterialDesignColors MaterialDesignColors - net452;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net6.0-windows true 1.0.1 MaterialDesignColors.Wpf diff --git a/MaterialDesignColors.nuspec b/MaterialDesignColors.nuspec index 616aee2374..601c3b3641 100644 --- a/MaterialDesignColors.nuspec +++ b/MaterialDesignColors.nuspec @@ -15,12 +15,14 @@ $copyright$ WPF XAML Material Design Colour Color UI UX - + + - + + \ No newline at end of file diff --git a/MaterialDesignThemes.MahApps.nuspec b/MaterialDesignThemes.MahApps.nuspec index 874e15324d..5596f60db4 100644 --- a/MaterialDesignThemes.MahApps.nuspec +++ b/MaterialDesignThemes.MahApps.nuspec @@ -15,7 +15,7 @@ $copyright$ WPF XAML MahApps Material Design Theme Colour Color UI UX - + @@ -25,10 +25,16 @@ + + + + + - + + \ No newline at end of file diff --git a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj index 0d4c802676..e4e98cd918 100644 --- a/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj +++ b/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj @@ -1,7 +1,7 @@  - net452;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net6.0-windows true 1.0.1 MaterialDesignThemes.MahApps diff --git a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs index fc706604cb..1374f6af43 100644 --- a/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs +++ b/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs @@ -47,7 +47,15 @@ public async Task OnOpenDialog_OverlayCoversContent() await closeDialogButton.LeftClick(); var retry = new Retry(5, TimeSpan.FromSeconds(5)); - await Wait.For(async () => await overlay.GetVisibility() != Visibility.Visible, retry); + try + { + await Wait.For(async () => await overlay.GetVisibility() != Visibility.Visible, retry); + } + catch(TimeoutException) + { + await closeDialogButton.LeftClick(); + await Wait.For(async () => await overlay.GetVisibility() != Visibility.Visible, retry); + } await testOverlayButton.LeftClick(); await Wait.For(async () => Assert.Equal("Clicks: 2", await resultTextBlock.GetText()), retry); diff --git a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj index 44866462e7..69926b0470 100644 --- a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj +++ b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj @@ -1,7 +1,7 @@  - net452;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net6.0-windows true 1.0.1 MaterialDesignThemes.Wpf diff --git a/MaterialDesignThemes.nuspec b/MaterialDesignThemes.nuspec index 23eb7f5fc6..6b1f57f484 100644 --- a/MaterialDesignThemes.nuspec +++ b/MaterialDesignThemes.nuspec @@ -15,17 +15,21 @@ $copyright$ WPF XAML Material Design Theme Colour Color UI UX - + + + + - + +