New WPF class library project for shared demo code (#3592)

* New WPF class library project for shared demo code * Remove Nullable from .csproj Nullable is handled by solutions Directory.Build.props
MaterialDesignInXAML · Jun 20, 2024 · f8c1eed · f8c1eed
1 parent 07a42ba
commit f8c1eed
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 95 deletions.
diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
@@ -64,6 +64,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "src\MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignDemo.Shared", "src\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj", "{B39795A7-D66A-4F2F-9F41-050838D14048}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -236,6 +238,22 @@ Global
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -246,6 +264,7 @@ Global
 		{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
 		{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
 		{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
+		{B39795A7-D66A-4F2F-9F41-050838D14048} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}

diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.ColorTool"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:local="clr-namespace:MaterialDesignDemo"

diff --git a/src/MainDemo.Wpf/ComboBoxes.xaml b/src/MainDemo.Wpf/ComboBoxes.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:colorsDomain="clr-namespace:MaterialDesignDemo.Domain"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"

diff --git a/src/MainDemo.Wpf/Fields.xaml b/src/MainDemo.Wpf/Fields.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.Fields"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"

diff --git a/src/MainDemo.Wpf/IconPack.xaml b/src/MainDemo.Wpf/IconPack.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.IconPack"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"

diff --git a/src/MainDemo.Wpf/MaterialDesignDemo.csproj b/src/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesign3Demo.ColorTool"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesign3Demo.Converters"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"             
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
              xmlns:local="clr-namespace:MaterialDesign3Demo"

diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/StringJoinConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/StringJoinConverter.cs
diff --git a/src/MaterialDesign3.Demo.Wpf/IconPack.xaml b/src/MaterialDesign3.Demo.Wpf/IconPack.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesign3Demo.IconPack"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesign3Demo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -212,4 +212,4 @@
       </StackPanel>
     </materialDesign:ColorZone>
   </Grid>
-</UserControl>
+</UserControl>
diff --git a/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj b/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...pf/Converters/BooleanToDoubleConverter.cs → ...ed/Converters/BooleanToDoubleConverter.cs b/...pf/Converters/BooleanToDoubleConverter.cs → ...ed/Converters/BooleanToDoubleConverter.cs
diff --git a/...emo.Wpf/Converters/BrushToHexConverter.cs → ....Shared/Converters/BrushToHexConverter.cs b/...emo.Wpf/Converters/BrushToHexConverter.cs → ....Shared/Converters/BrushToHexConverter.cs
diff --git a/...o.Wpf/Converters/ColorToBrushConverter.cs → ...hared/Converters/ColorToBrushConverter.cs b/...o.Wpf/Converters/ColorToBrushConverter.cs → ...hared/Converters/ColorToBrushConverter.cs
diff --git a/....Wpf/Converters/IsTransparentConverter.cs → ...ared/Converters/IsTransparentConverter.cs b/....Wpf/Converters/IsTransparentConverter.cs → ...ared/Converters/IsTransparentConverter.cs
diff --git a/...Converters/MultiValueEqualityConverter.cs → ...Converters/MultiValueEqualityConverter.cs b/...Converters/MultiValueEqualityConverter.cs → ...Converters/MultiValueEqualityConverter.cs
diff --git a/...emo.Wpf/Converters/StringJoinConverter.cs → ....Shared/Converters/StringJoinConverter.cs b/...emo.Wpf/Converters/StringJoinConverter.cs → ....Shared/Converters/StringJoinConverter.cs
diff --git a/src/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj b/src/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>