From 3f8e04e20a5939daeb9f282ddeaf7de63b40a01f Mon Sep 17 00:00:00 2001 From: Chris Winland Date: Sun, 3 Dec 2023 06:57:00 -0500 Subject: [PATCH] net 8 --- src/wpf-material-dialogs.csproj | 7 +++---- wpf-material-dialogs.sln | 10 ++-------- .../AvalonUnitTesting/AvalonActivatorHelper.cs | 2 +- .../wpf-material-dialogs.test.csproj | 13 ++++++------- wpf-material-wpfTest/TestCustomDialog.xaml | 3 ++- wpf-material-wpfTest/wpf-material-wpfTest.csproj | 16 +++++++--------- .../wpf-material-wpftestFramework.csproj | 2 +- 7 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/wpf-material-dialogs.csproj b/src/wpf-material-dialogs.csproj index 4687fd1..76977ba 100644 --- a/src/wpf-material-dialogs.csproj +++ b/src/wpf-material-dialogs.csproj @@ -1,20 +1,19 @@  - net472;net6.0-windows;net7.0-windows + net472;net6.0-windows;net7.0-windows;net8.0-windows Material Design WPF Dialogs true latest true + AnyCPU - x64 false 1591 1591 - x64 wpf_material_dialogs @@ -41,7 +40,6 @@ copyright(c) 2021 Christopher Winland - x64 DEBUG;TRACE @@ -53,6 +51,7 @@ + diff --git a/wpf-material-dialogs.sln b/wpf-material-dialogs.sln index baf2caf..589975e 100644 --- a/wpf-material-dialogs.sln +++ b/wpf-material-dialogs.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34316.72 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf-material-dialogs", "src\wpf-material-dialogs.csproj", "{DB04B9E7-952D-4F8A-8A9E-31C3D223DA2F}" EndProject @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf-material-dialogs.test", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf-material-wpfTest", "wpf-material-wpfTest\wpf-material-wpfTest.csproj", "{441E0B86-9D05-4A1C-BB12-6C966FF8F890}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wpf-material-wpftestFramework", "wpf-material-wpftestFramework\wpf-material-wpftestFramework.csproj", "{8183930B-C5AE-4C65-8721-DD9BE6B5D879}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,10 +27,6 @@ Global {441E0B86-9D05-4A1C-BB12-6C966FF8F890}.Debug|Any CPU.Build.0 = Debug|Any CPU {441E0B86-9D05-4A1C-BB12-6C966FF8F890}.Release|Any CPU.ActiveCfg = Release|Any CPU {441E0B86-9D05-4A1C-BB12-6C966FF8F890}.Release|Any CPU.Build.0 = Release|Any CPU - {8183930B-C5AE-4C65-8721-DD9BE6B5D879}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8183930B-C5AE-4C65-8721-DD9BE6B5D879}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8183930B-C5AE-4C65-8721-DD9BE6B5D879}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8183930B-C5AE-4C65-8721-DD9BE6B5D879}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wpf-material-dialogs.test/AvalonUnitTesting/AvalonActivatorHelper.cs b/wpf-material-dialogs.test/AvalonUnitTesting/AvalonActivatorHelper.cs index cabd695..93733ca 100644 --- a/wpf-material-dialogs.test/AvalonUnitTesting/AvalonActivatorHelper.cs +++ b/wpf-material-dialogs.test/AvalonUnitTesting/AvalonActivatorHelper.cs @@ -9,7 +9,7 @@ namespace wpf_material_dialogs.test.AvalonUnitTesting internal static class AvalonActivatorHelper { /// - /// wrapps a control in a window so that it can be unit tested + /// wraps a control in a window so that it can be unit tested /// private class ControlWrapper : Window { diff --git a/wpf-material-dialogs.test/wpf-material-dialogs.test.csproj b/wpf-material-dialogs.test/wpf-material-dialogs.test.csproj index 31bcd74..fce2694 100644 --- a/wpf-material-dialogs.test/wpf-material-dialogs.test.csproj +++ b/wpf-material-dialogs.test/wpf-material-dialogs.test.csproj @@ -1,13 +1,15 @@  - net7.0-windows + net6.0-windows;net7.0-windows;net8.0-windows wpf_material_dialogs.test - + AnyCPU + true + latest false + true - x64 DEBUG;TRACE @@ -16,10 +18,7 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/wpf-material-wpfTest/TestCustomDialog.xaml b/wpf-material-wpfTest/TestCustomDialog.xaml index f21189a..12c1265 100644 --- a/wpf-material-wpfTest/TestCustomDialog.xaml +++ b/wpf-material-wpfTest/TestCustomDialog.xaml @@ -6,13 +6,14 @@ xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:wpfMaterialDialogs="clr-namespace:wpf_material_dialogs;assembly=wpf-material-dialogs" + xmlns:wpfMaterialWpfTest="clr-namespace:wpf_material_wpfTest" mc:Ignorable="d" Height="Auto" Width="500" d:DesignHeight="450" d:DesignWidth="500"> diff --git a/wpf-material-wpfTest/wpf-material-wpfTest.csproj b/wpf-material-wpfTest/wpf-material-wpfTest.csproj index a951c12..24a37f8 100644 --- a/wpf-material-wpfTest/wpf-material-wpfTest.csproj +++ b/wpf-material-wpfTest/wpf-material-wpfTest.csproj @@ -2,26 +2,24 @@ WinExe - net7.0-windows + net6.0-windows;net7.0-windows;net8.0-windows wpf_material_wpfTest true + latest true + AnyCPU + false + true - x64 DEBUG;TRACE 4 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + diff --git a/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj b/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj index 21c809b..c6ca757 100644 --- a/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj +++ b/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj @@ -18,7 +18,7 @@ - x64 + AnyCPU true full false