.config/dotnet-tools.json

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "cake.tool": {
-      "version": "2.0.0-rc0002",
-      "commands": [
-        "dotnet-cake"
-      ]
-    },
-    "gitversion.tool": {
-      "version": "5.8.1",
-      "commands": [
-        "dotnet-gitversion"
-      ]
-    }
-  }
-}

.gitignore

@@ -339,4 +339,3 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 .ionide
-/tools

App/App.xaml.cs

@@ -1,5 +1,4 @@
-using System.Windows;
+using ModernWpf;
-using ModernWpf;
 using ModernWpfPlayground.Types;
 
 namespace ModernWpfPlayground

App/AssemblyInfo.cs

@@ -1,5 +1,3 @@
-using System.Windows;
-
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
                                      //(used if a resource is not found in the page,

App/ContentDialogExample.xaml.cs

@@ -1,6 +1,4 @@
-using System.Windows;
+namespace ModernWpfPlayground
-
-namespace ModernWpfPlayground
 {
     public partial class ContentDialogExample
     {

App/GlobalUsings.cs

@@ -0,0 +1,3 @@
+global using System;
+global using MvvmGen;
+global using System.Windows;

App/MainWindow.xaml

@@ -2,12 +2,12 @@
     x:Class="ModernWpfPlayground.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="http://wpflib.de/"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
     xmlns:local="clr-namespace:ModernWpfPlayground"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:controls="clr-namespace:Controls;assembly=Controls"
     x:Name="Window"
     Title="{Binding Title}"
     Width="{Binding WindowWidth, Mode=TwoWay}"
@@ -69,6 +69,16 @@
                     </Style>
                 </Menu.Resources>
                 <MenuItem Header="File">
+                    <MenuItem
+                        Command="{Binding ResetViewModelCommand}"
+                        Header="New"
+                        Icon="{iconPacks:FontAwesome Kind=FileRegular}"
+                        InputGestureText="Ctrl+N" />
+                    <MenuItem
+                        Command="{Binding OpenViewModelCommand}"
+                        Header="Open"
+                        Icon="{iconPacks:FontAwesome Kind=FolderOpenRegular}"
+                        InputGestureText="Ctrl+O" />
                     <MenuItem
                         Command="{Binding SaveViewModelCommand}"
                         Header="Save"
@@ -211,6 +221,10 @@
                                     Margin="5"
                                     Orientation="Vertical"
                                     Spacing="5">
+                                    <Button
+                                        HorizontalAlignment="Stretch"
+                                        Command="{Binding OpenViewModelCommand}"
+                                        Content="Open" />
                                     <Button
                                         HorizontalAlignment="Stretch"
                                         Command="{Binding SaveViewModelCommand}"

App/MainWindowViewModel.cs

@@ -1,6 +1,4 @@
-using System.Windows;
+using ModernWpfPlayground.Types;
-using ModernWpfPlayground.Types;
-using MvvmGen;
 using static ModernWpf.ThemeManager;
 
 namespace ModernWpfPlayground

App/ModernWpfPlayground.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <Nullable>enable</Nullable>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FastMember" Version="1.5.0" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Include="ModernWpfUis" Version="1.2.0" />
+    <PackageReference Include="MvvmGen" Version="1.1.1" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
+    <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Controls\Controls.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="MvvmStuff" />
+  </ItemGroup>
+
+</Project>

App/PixelsToGridLengthConverter.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Globalization;
-using System.Globalization;
-using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 

App/Types/AccentColors.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Windows.Media;
-using System.Windows.Media;
 
 namespace ModernWpfPlayground.Types
 {

App/Types/ThemeMode.cs

@@ -1,5 +1,4 @@
-using System;
+using System.ComponentModel;
-using System.ComponentModel;
 using ModernWpf;
 
 namespace ModernWpfPlayground.Types

Controls/Controls.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+  </ItemGroup>
+
+</Project>

Controls/Properties/AssemblyInfo.cs

@@ -0,0 +1,9 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Markup;
+
+[assembly: ComVisible(false)]
+
+[assembly: CLSCompliant(true)]
+
+[assembly: XmlnsDefinition("http://wpflib.de/", "Controls")]

Controls/controls.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=propertypresenter/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ModernWpfPlayground.sln

@@ -1,13 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# Visual Studio Version 16
-VisualStudioVersion = 17.0.31912.275
+VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{216EA1DF-5F39-4D23-9E1F-887785D1FF6C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWpfPlayground", "App\ModernWpfPlayground.csproj", "{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWpfPlayground", "src\App\ModernWpfPlayground.csproj", "{D7364CD3-5150-4FA8-90D9-07093354D7A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls", "Controls\Controls.csproj", "{3884FD41-5A46-4A67-A147-57C36F0059DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "src\Controls\Controls.csproj", "{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,22 +13,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7364CD3-5150-4FA8-90D9-07093354D7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7364CD3-5150-4FA8-90D9-07093354D7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7364CD3-5150-4FA8-90D9-07093354D7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7364CD3-5150-4FA8-90D9-07093354D7A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3884FD41-5A46-4A67-A147-57C36F0059DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3884FD41-5A46-4A67-A147-57C36F0059DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3884FD41-5A46-4A67-A147-57C36F0059DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3884FD41-5A46-4A67-A147-57C36F0059DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D7364CD3-5150-4FA8-90D9-07093354D7A0} = {216EA1DF-5F39-4D23-9E1F-887785D1FF6C}
-		{3AAA0309-C1C0-44C8-A53F-E3CE8556A4D4} = {216EA1DF-5F39-4D23-9E1F-887785D1FF6C}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {21075E5E-39D9-4681-91A0-D9E7E0BDBB85}
 	EndGlobalSection

build.cake

@@ -1,60 +0,0 @@
-#tool "dotnet:?package=GitVersion.Tool"
-
-using System;
-var target = Argument("target", "Publish");
-var configuration = Argument("configuration", "Release");
-
-var gitVersion = GitVersion(new GitVersionSettings());
-
-//////////////////////////////////////////////////////////////////////
-// TASKS
-//////////////////////////////////////////////////////////////////////
-
-Task("Clean")
-    .WithCriteria(c => HasArgument("rebuild"))
-    .Does(() =>
-{
-    CleanDirectory($"./src/App/bin/{configuration}");
-});
-
-Task("Build")
-    .IsDependentOn("Clean")
-    .Does(() =>
-{
-    DotNetBuild("./ModernWpfPlayground.sln", new DotNetBuildSettings
-    {
-        Configuration = configuration, ArgumentCustomization = c=> c.Append($"/p:Version={gitVersion.AssemblySemVer}")
-    
-    });
-});
-
-Task("Publish")
-    .IsDependentOn("Build")
-    .Does(() =>
-    {
-        DotNetPublish("./src/App/ModernWpfPlayground.csproj", new DotNetPublishSettings{
-            Configuration = configuration, 
-            EnableCompressionInSingleFile = true,
-            PublishReadyToRun = true,
-            PublishSingleFile = true,
-            Runtime = "win-x64",
-            SelfContained = true,
-        });
-    });
-
-// Task("Test")
-//     .IsDependentOn("Build")
-//     .Does(() =>
-// {
-//     DotNetCoreTest("./src/Example.sln", new DotNetCoreTestSettings
-//     {
-//         Configuration = configuration,
-//         NoBuild = true,
-//     });
-// });
-
-//////////////////////////////////////////////////////////////////////
-// EXECUTION
-//////////////////////////////////////////////////////////////////////
-
-RunTarget(target);

src/App/ModernWpfPlayground.csproj

@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
-		<Nullable>enable</Nullable>
-		<UseWPF>true</UseWPF>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Controls\Controls.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="FastMember" Version="1.5.0" />
-		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-		<PackageReference Include="ModernWpfUis" Version="1.2.0" />
-		<PackageReference Include="MvvmGen" Version="1.1.2" />
-		<PackageReference Include="YamlDotNet" Version="11.2.1" />
-		<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ApplicationDefinition Update="App.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <Generator>MSBuild:Compile</Generator>
-	  </ApplicationDefinition>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Page Update="ContentDialogExample.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	  </Page>
-	  <Page Update="MainWindow.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-</Project>

src/Controls/AssemblyInfo.cs

@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]

src/Controls/Controls.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0-windows</TargetFramework>
-		<Nullable>enable</Nullable>
-		<UseWPF>true</UseWPF>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Page Update="PropertyPresenter\PropertyPresenter.xaml">
-			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-	</ItemGroup>
-
-
-</Project>