net 8

cwinland · Dec 3, 2023 · 3f8e04e · 3f8e04e
1 parent dc29f21
commit 3f8e04e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 31 deletions.
diff --git a/src/wpf-material-dialogs.csproj b/src/wpf-material-dialogs.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <AssemblyTitle>Material Design WPF Dialogs</AssemblyTitle>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <UseWPF>true</UseWPF>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <NoWarn></NoWarn>
-    <PlatformTarget>x64</PlatformTarget>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <WarningsAsErrors>1591</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <WarningsAsErrors>1591</WarningsAsErrors>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>wpf_material_dialogs</RootNamespace>
@@ -41,7 +40,6 @@
     <Copyright>copyright(c) 2021 Christopher Winland</Copyright>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
-    <PlatformTarget>x64</PlatformTarget>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <Target Name="SetPackageVersion">
@@ -53,6 +51,7 @@
   <ItemGroup>
     <PackageReference Include="MaterialDesignColors" Version="2.0.3" />
     <PackageReference Include="MaterialDesignThemes" Version="4.2.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.*" PrivateAssets="Analyzers" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/wpf-material-dialogs.sln b/wpf-material-dialogs.sln
@@ -1,16 +1,14 @@
 
 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
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wpf-material-dialogs.test", "wpf-material-dialogs.test\wpf-material-dialogs.test.csproj", "{46927F38-1C0F-40BB-88D5-E9FEF374356E}"
 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
@@ -9,7 +9,7 @@ namespace wpf_material_dialogs.test.AvalonUnitTesting
     internal static class AvalonActivatorHelper
     {
         /// <summary>
-        /// 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
         /// </summary>
         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
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <RootNamespace>wpf_material_dialogs.test</RootNamespace>
-
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseWPF>true</UseWPF>
+    <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>x64</PlatformTarget>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
@@ -16,10 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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">
     <UserControl.Resources>
         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFlatAccentBgButton}">
             <Setter Property="Margin" Value="5" />
-            <Setter Property="Command" Value="{Binding CloseCommand, RelativeSource={RelativeSource AncestorType={x:Type Control}}}" />
+            <Setter Property="Command" Value="{Binding CloseCommand, RelativeSource={RelativeSource AncestorType={x:Type wpfMaterialWpfTest:TestCustomDialog}}}" />
         </Style>
     </UserControl.Resources>
     <Grid Margin="5">

diff --git a/wpf-material-wpfTest/wpf-material-wpfTest.csproj b/wpf-material-wpfTest/wpf-material-wpfTest.csproj
@@ -2,26 +2,24 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <RootNamespace>wpf_material_wpfTest</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
+    <LangVersion>latest</LangVersion>
     <UseWPF>true</UseWPF>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>x64</PlatformTarget>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.6.36389" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
+    <PackageReference Include="coverlet.collector" Version="6.*" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj b/wpf-material-wpftestFramework/wpf-material-wpftestFramework.csproj
@@ -18,7 +18,7 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>