Skip to content

Commit f8c1eed

Browse files
JLdguJLdgu
authored
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
1 parent 07a42ba commit f8c1eed

20 files changed

+38
-95
lines changed

‎MaterialDesignToolkit.Full.sln

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177
6464
EndProject
6565
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "src\MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
6666
EndProject
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignDemo.Shared", "src\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj", "{B39795A7-D66A-4F2F-9F41-050838D14048}"
68+
EndProject
6769
Global
6870
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6971
Debug|Any CPU = Debug|Any CPU
@@ -236,6 +238,22 @@ Global
236238
{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
237239
{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
238240
{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
241+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
242+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.Build.0 = Debug|Any CPU
243+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.ActiveCfg = Debug|Any CPU
244+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.Build.0 = Debug|Any CPU
245+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.ActiveCfg = Debug|Any CPU
246+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.Build.0 = Debug|Any CPU
247+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.ActiveCfg = Debug|Any CPU
248+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.Build.0 = Debug|Any CPU
249+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.ActiveCfg = Release|Any CPU
250+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.Build.0 = Release|Any CPU
251+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.ActiveCfg = Release|Any CPU
252+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.Build.0 = Release|Any CPU
253+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.ActiveCfg = Release|Any CPU
254+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.Build.0 = Release|Any CPU
255+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.ActiveCfg = Release|Any CPU
256+
{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.Build.0 = Release|Any CPU
239257
EndGlobalSection
240258
GlobalSection(SolutionProperties) = preSolution
241259
HideSolutionNode = FALSE
@@ -246,6 +264,7 @@ Global
246264
{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
247265
{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
248266
{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
267+
{B39795A7-D66A-4F2F-9F41-050838D14048} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
249268
EndGlobalSection
250269
GlobalSection(ExtensibilityGlobals) = postSolution
251270
SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}

‎src/MainDemo.Wpf/ColorTool.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<UserControl x:Class="MaterialDesignDemo.ColorTool"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
4+
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
77
xmlns:local="clr-namespace:MaterialDesignDemo"

‎src/MainDemo.Wpf/ComboBoxes.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:colorsDomain="clr-namespace:MaterialDesignDemo.Domain"
5-
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
5+
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
88
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"

‎src/MainDemo.Wpf/Fields.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<UserControl x:Class="MaterialDesignDemo.Fields"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
4+
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
77
xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"

‎src/MainDemo.Wpf/IconPack.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<UserControl x:Class="MaterialDesignDemo.IconPack"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
4+
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
77
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"

‎src/MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
32+
<ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
3233
<ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
3334
</ItemGroup>
3435
<ItemGroup>

‎src/MaterialDesign3.Demo.Wpf/ColorTool.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<UserControl x:Class="MaterialDesign3Demo.ColorTool"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="clr-namespace:MaterialDesign3Demo.Converters"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
77
xmlns:local="clr-namespace:MaterialDesign3Demo"

‎src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)