Skip to content

Commit 5438e9c

Browse files
authored
Move ColorToolViewModel to shared project (#3624)
* Drop net7.0-windows due to EOL (#3597) * ColorToolViewModel to shared project * Stop compile error CS0436 on PR build * Add root namespace
1 parent 962cf81 commit 5438e9c

File tree

9 files changed

+11
-202
lines changed

9 files changed

+11
-202
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MaterialDesign3Demo.Domain;
1+
using MaterialDesignDemo.Domain;
22

33
namespace MaterialDesign3Demo;
44

src/MaterialDesign3.Demo.Wpf/Domain/ColorToolViewModel.cs

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

src/MaterialDesign3.Demo.Wpf/Domain/MainWindowViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.ComponentModel;
33
using System.Configuration;
44
using System.Windows.Data;
5+
using MaterialDesignDemo.Domain;
56
using MaterialDesignThemes.Wpf;
67
using MaterialDesignThemes.Wpf.Transitions;
78

src/MainDemo.Wpf/ColorScheme.cs renamed to src/MaterialDesignDemo.Shared/ColorScheme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace MaterialDesignDemo;
22

3-
enum ColorScheme
3+
public enum ColorScheme
44
{
55
Primary,
66
Secondary,

src/MainDemo.Wpf/Domain/ColorToolViewModel.cs renamed to src/MaterialDesignDemo.Shared/Domain/ColorToolViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace MaterialDesignDemo.Domain;
66

7-
internal class ColorToolViewModel : ViewModelBase
7+
public class ColorToolViewModel : ViewModelBase
88
{
99
private readonly PaletteHelper _paletteHelper = new();
1010

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<RootNamespace>MaterialDesignDemo</RootNamespace>
78
</PropertyGroup>
89

10+
<ItemGroup>
11+
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
12+
<ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
13+
</ItemGroup>
14+
915
</Project>

0 commit comments

Comments
 (0)