Merge pull request #3 from flabbet/PretendLikeThisBranchDoesntExist

Pretend like this branch doesnt exist

PixiEditor/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>

PixiEditor/App.xaml.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace PixiEditor
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-}

PixiEditor/Models/Change.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.Models
-{
-    public class Change
-    {
-        private object _oldValue;
-
-        public object OldValue
-        {
-            get { return _oldValue; }
-            set { _oldValue = value; }
-        }
-
-        private object _newValue;
-
-        public object NewValue
-        {
-            get { return _newValue; }
-            set { _newValue = value; }
-        }
-
-        private object _type;
-
-        public object Type
-        {
-            get { return _type; }
-            set { _type = value; }
-        }
-
-        private string _description;
-
-        public string Description
-        {
-            get { return _description; }
-            set { _description = value; }
-        }
-
-        private string _property;
-
-        public string Property
-        {
-            get { return _property; }
-            set { _property = value; }
-        }
-
-
-        public Change(string property, object oldValue, object newValue, string description = null)
-        {
-            Property = property;
-            OldValue = oldValue;
-            NewValue = newValue;
-            Description = description;
-        }
-
-    }
-}

PixiEditor/PixiEditor.csproj

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{04324995-2B67-402A-A427-F35AFA014D05}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>PixiEditor</RootNamespace>
-    <AssemblyName>PixiEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WriteableBitmapEx.Wpf, Version=1.5.0.0, Culture=neutral, PublicKeyToken=50375ca6144f1c69, processorArchitecture=MSIL">
-      <HintPath>packages\WriteableBitmapEx.1.5.1.0\lib\net40\WriteableBitmapEx.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Helpers\Behaviours\AllowableCharactersTextBoxBehavior.cs" />
-    <Compile Include="Helpers\Behaviours\HintTextBehavior.cs" />
-    <Compile Include="Helpers\Behaviours\MouseBehaviour.cs" />
-    <Compile Include="Helpers\Behaviours\TextBoxNumericFinisherBehavior.cs" />
-    <Compile Include="Helpers\NotifyableObject.cs" />
-    <Compile Include="Helpers\RelayCommand.cs" />
-    <Compile Include="Helpers\ToolSizeToIntConverter.cs" />
-    <Compile Include="Models\BasicLayer.cs" />
-    <Compile Include="Models\BitmapConverter.cs" />
-    <Compile Include="Models\Change.cs" />
-    <Compile Include="Models\Coordinates.cs" />
-    <Compile Include="Models\CustomDialog.cs" />
-    <Compile Include="Models\DCords.cs" />
-    <Compile Include="Models\Enums\FileType.cs" />
-    <Compile Include="Models\ExColor.cs" />
-    <Compile Include="Models\Exporter.cs" />
-    <Compile Include="Models\ImageGenerator.cs" />
-    <Compile Include="Models\Importer.cs" />
-    <Compile Include="Models\ImportFileDialog.cs" />
-    <Compile Include="Models\LayerGenerator.cs" />
-    <Compile Include="Models\Layer.cs" />
-    <Compile Include="Models\LightLayer.cs" />
-    <Compile Include="Models\MousePositionConverter.cs" />
-    <Compile Include="Models\NewFileDialog.cs" />
-    <Compile Include="Models\ExportFileDialog.cs" />
-    <Compile Include="Models\StackEx.cs" />
-    <Compile Include="Models\Tools\ToolSet.cs" />
-    <Compile Include="Models\ToolManager.cs" />
-    <Compile Include="Models\Tools\ToolType.cs" />
-    <Compile Include="Models\UndoManager.cs" />
-    <Compile Include="ViewModels\FeedbackDialogViewModel.cs" />
-    <Compile Include="ViewModels\ImportFilePopupViewModel.cs" />
-    <Compile Include="ViewModels\MenuButtonViewModel.cs" />
-    <Compile Include="ViewModels\NewFileMenuViewModel.cs" />
-    <Compile Include="ViewModels\SaveFilePopupViewModel.cs" />
-    <Compile Include="ViewModels\ViewModelBase.cs" />
-    <Compile Include="ViewModels\ViewModelMain.cs" />
-    <Compile Include="Views\ImportFilePopup.xaml.cs">
-      <DependentUpon>ImportFilePopup.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainDrawingPanel.xaml.cs">
-      <DependentUpon>MainDrawingPanel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MenuButton.xaml.cs">
-      <DependentUpon>MenuButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NewFilePopup.xaml.cs">
-      <DependentUpon>NewFilePopup.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SaveFilePopup.xaml.cs">
-      <DependentUpon>SaveFilePopup.xaml</DependentUpon>
-    </Compile>
-    <Page Include="Styles\ThemeStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ImportFilePopup.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainDrawingPanel.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Styles\MenuButtonStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MenuButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NewFilePopup.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SaveFilePopup.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\Lighten image.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\Bucket image.png" />
-    <Resource Include="Images\Earser image.png" />
-    <Resource Include="Images\Circle Image.png" />
-    <Resource Include="Images\Line Image.png" />
-    <Resource Include="Images\Pen Image.png" />
-    <Resource Include="Images\Pipette image.png" />
-    <Resource Include="Images\Rectangle Image.png" />
-    <Resource Include="Images\transparent bg.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\Cross.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

PixiEditor/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net461" />
-  <package id="Extended.Wpf.Toolkit" version="3.4.0" targetFramework="net461" />
-  <package id="WriteableBitmapEx" version="1.5.1.0" targetFramework="net461" />
-</packages>

PixiEditor/Helpers/NotifyableObject.cs → PixiEditorDotNetCore3/Helpers/NotifyableObject.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 
 namespace PixiEditor.Helpers
 {
+    [Serializable]
     public class NotifyableObject : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged = delegate { };

PixiEditor/Models/BasicLayer.cs → PixiEditorDotNetCore3/Models/BasicLayer.cs

@@ -8,6 +8,7 @@ using PixiEditor.Helpers;
 
 namespace PixiEditor.Models
 {
+    [Serializable]
     public class BasicLayer : NotifyableObject
     {
 

PixiEditorDotNetCore3/Models/Change.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using PixiEditorDotNetCore3.Models;
+
+namespace PixiEditor.Models
+{
+    [Serializable]
+    public class Change
+    {
+        public object OldValue { get; set; }
+
+        public string Description { get; set; }
+
+        public string Property { get; set; }
+
+        public Change(string property, object oldValue, string description = "")
+        {
+            Property = property;
+            OldValue = oldValue;
+            Description = description;
+        }
+
+        public Change()
+        {
+
+        }
+
+    }
+}

PixiEditor/Models/LightLayer.cs → PixiEditorDotNetCore3/Models/LightLayer.cs

@@ -4,10 +4,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PixiEditor.Helpers;
 
 namespace PixiEditor.Models
 {
+    [Serializable]
     public class LightLayer : BasicLayer
     {
         private byte[] _layerBytes;
@@ -37,5 +40,15 @@ namespace PixiEditor.Models
             Height = width;
         }
 
+        public LightLayer()
+        {
+
+        }
+
+        public static LightLayer Deserialize(object value)
+        {
+            return JsonConvert.DeserializeObject<LightLayer>(((JObject)value).ToString());
+        }
+
     }
 }

PixiEditorDotNetCore3/Models/PixiFilesManager.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace PixiEditorDotNetCore3.Models
+{
+    public static class PixiFilesManager
+    {
+
+        public static string TempFolderPath
+        {
+            get { return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"PixiEditor\Temp"); }
+        }
+
+        public static string RedoStackPath
+        {
+            get { return Path.Combine(TempFolderPath, @"RedoStack"); }
+        }
+
+        public static string UndoStackPath
+        {
+            get { return Path.Combine(TempFolderPath, @"UndoStack"); }
+        }
+
+        /// <summary>
+        /// Saves object to file on disk using binary formatter
+        /// </summary>
+        /// <param name="obj">Object to be saved</param>
+        public static void SaveObjectToJsonFile<T>(T obj, string fileName) where T : new()
+        {
+            try
+            {
+                SaveSerializedObjectToFile(obj, fileName);
+            }
+            catch (IOException ex)
+            {
+                Debug.WriteLine(ex.Message);
+            }
+        }
+
+
+        public static void RemoveFile(string path)
+        {
+            File.Delete(path);
+        }
+
+        /// <summary>
+        /// Removes all files from directory
+        /// </summary>
+        /// <param name="path"></param>
+        public static void ClearDirectory(string path)
+        {
+            string[] filesInDirectory = Directory.GetFiles(path);
+            for (int i = 0; i < filesInDirectory.Length; i++)
+            {
+                File.Delete(filesInDirectory[i]);
+            }
+        }
+
+        private static void SaveSerializedObjectToFile(object obj, string filename)
+        {
+            using (TextWriter writer = new StreamWriter(filename, false))
+            {
+                var contentsToWriteToFile = JsonConvert.SerializeObject(obj);
+                writer.Write(contentsToWriteToFile);
+            }
+        }
+
+        public static T ReadObjectFromFile<T>(string filePath) where T : new()
+        {
+            using (TextReader reader = new StreamReader(filePath))
+            {
+                var fileContent = reader.ReadToEnd();
+                return JsonConvert.DeserializeObject<T>(fileContent);
+            }
+        }
+
+        /// <summary>
+        /// Creates and cleares temp directories
+        /// </summary>
+        public static void InitializeTempDirectories()
+        {
+            CreateTempDirectories();
+            ClearTempDirectoriesContent();
+        }
+
+        private static void CreateTempDirectories()
+        {
+            Directory.CreateDirectory(TempFolderPath);
+            Directory.CreateDirectory(Path.Combine(TempFolderPath, "UndoStack"));
+            Directory.CreateDirectory(Path.Combine(TempFolderPath, "RedoStack"));
+        }
+
+        public static void ClearTempDirectoriesContent()
+        {
+            ClearDirectory(RedoStackPath);
+            ClearDirectory(UndoStackPath);
+        }
+    }
+}

PixiEditor/Models/StackEx.cs → PixiEditorDotNetCore3/Models/StackEx.cs

@@ -1,48 +1,60 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.Models
-{
-    public class StackEx<T>
-    {
-        public int Count
-        {
-            get { return items.Count; }
-        }
-
-        private List<T> items = new List<T>();
-
-        public void Clear()
-        {
-            items.Clear();
-        }
-
-        public T Peek()
-        {
-            return items[items.Count - 1];
-        }
-
-        public void Push(T item)
-        {
-            items.Add(item);
-        }
-        public T Pop()
-        {
-            if (items.Count > 0)
-            {
-                T temp = items[items.Count - 1];
-                items.RemoveAt(items.Count - 1);
-                return temp;
-            }
-            else
-                return default(T);
-        }
-        public void Remove(int itemAtPosition)
-        {
-            items.RemoveAt(itemAtPosition);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PixiEditor.Models
+{
+    public class StackEx<T>
+    {
+        public int Count
+        {
+            get { return items.Count; }
+        }
+
+        public T First
+        {
+            get { return items[0]; }
+        }
+
+        private List<T> items = new List<T>();
+
+        public void Clear()
+        {
+            items.Clear();
+        }
+
+        public T Peek()
+        {
+            return items[items.Count - 1];
+        }
+
+        public void Push(T item)
+        {
+            items.Add(item);
+        }
+
+        public T Pop()
+        {
+            if (items.Count > 0)
+            {
+                T temp = items[items.Count - 1];
+                items.RemoveAt(items.Count - 1);
+                return temp;
+            }
+            else
+                return default(T);
+        }
+
+        public void PushToBottom(T item)
+        {
+            items.Insert(0, item);
+        }
+
+        public void Remove(int itemAtPosition)
+        {
+            items.RemoveAt(itemAtPosition);
+        }
+    }
+}

PixiEditorDotNetCore3/Models/Tuple.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace PixiEditorDotNetCore3.Models
+{
+    public class Tuple<T1, T2, T3> : IEquatable<Object>
+    {
+        public T1 Item1
+        {
+            get;
+            set;
+        }
+
+        public T2 Item2
+        {
+            get;
+            set;
+        }
+
+        public T3 Item3
+        {
+            get;
+            set;
+        }
+
+        public Tuple(T1 Item1, T2 Item2, T3 Item3)
+        {
+            this.Item1 = Item1;
+            this.Item2 = Item2;
+            this.Item3 = Item3;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null || (obj as Tuple<T1, T2, T3>) == null) //if the object is null or the cast fails
+                return false;
+            else
+            {
+                Tuple<T1, T2, T3> tuple = (Tuple<T1, T2, T3>)obj;
+                return Item1.Equals(tuple.Item1) && Item2.Equals(tuple.Item2) && Item3.Equals(tuple.Item3);
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return Item1.GetHashCode() ^ Item2.GetHashCode() ^ Item3.GetHashCode();
+        }
+
+        public static bool operator ==(Tuple<T1, T2, T3> tuple1, Tuple<T1, T2, T3> tuple2)
+        {
+            return tuple1.Equals(tuple2);
+        }
+
+        public static bool operator !=(Tuple<T1, T2, T3> tuple1, Tuple<T1, T2, T3> tuple2)
+        {
+            return !tuple1.Equals(tuple2);
+        }
+    }
+}

PixiEditor/Models/UndoManager.cs → PixiEditorDotNetCore3/Models/UndoManager.cs

@@ -1,125 +1,127 @@
-using PixiEditor.Helpers;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing.Printing;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
-
-namespace PixiEditor.Models
-{
-    public static class UndoManager
-    {
-        public static StackEx<Change> UndoStack { get; set; } = new StackEx<Change>(); 
-        public static StackEx<Change> RedoStack { get; set; } = new StackEx<Change>();
-        private static bool _stopRecording = false; 
-        private static List<Change> _recordedChanges = new List<Change>();
-        private static int _stackLimit = 25;
-        private static bool _lastChangeWasUndo = false;
-        public static bool CanUndo
-        {
-            get
-            {
-                return UndoStack.Count > 0;
-            }
-        }
-        public static bool CanRedo
-        {
-            get
-            {
-                return RedoStack.Count > 0;
-            }
-        }
-
-        public static object MainRoot { get; set; }
-
-        /// <summary>
-        /// Sets object(root) in which undo properties are stored.
-        /// </summary>
-        /// <param name="root">Parent object.</param>
-        public static void SetMainRoot(object root)
-        {
-            MainRoot = root;
-        }
-
-        /// <summary>
-        /// Records changes, used to save multiple changes as one
-        /// </summary>
-        /// <param name="property">Record property name.</param>
-        /// <param name="oldValue">Old change value.</param>
-        /// <param name="newValue">New change value.</param>
-        /// <param name="undoDescription">Description of change.</param>
-        public static void RecordChanges(string property, object oldValue, string undoDescription = null)
-        {
-            if (_stopRecording == false)
-            {
-                if (_recordedChanges.Count < 3)
-                {
-                    _recordedChanges.Add(new Change(property, oldValue, undoDescription));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Stops recording changes and saves it as one.
-        /// </summary>
-        public static void StopRecording()
-        {
-                _stopRecording = true;
-            if (_recordedChanges.Count > 0)
-            {
-                Change changeToSave = _recordedChanges[0];
-                AddUndoChange(changeToSave.Property, changeToSave.OldValue, changeToSave.Description);
-                _recordedChanges.Clear();
-            }
-            _stopRecording = false;
-        }
-        /// <summary>
-        /// Adds property change to UndoStack
-        /// </summary>
-        /// <param name="property">Changed property name.</param>
-        /// <param name="oldValue">Old value of property.</param>
-        /// <param name="newValue">New value of property.</param>
-        /// <param name="undoDescription">Description of change.</param>
-        public static void AddUndoChange(string property, object oldValue, string undoDescription = null)
-        {
-            if(_lastChangeWasUndo == false && RedoStack.Count > 0) //Cleares RedoStack if las move wasn't redo or undo and if redo stack is greater than 0
-            {
-                RedoStack.Clear();
-            }
-            _lastChangeWasUndo = false;
-            UndoStack.Push(new Change(property, oldValue, undoDescription)); //Adds change to UndoStack
-            if(UndoStack.Count > _stackLimit) //If Undostack hits limit, removes elements from beginning of stack
-            {
-                UndoStack.Remove(0);
-            }
-            Debug.WriteLine(UndoStack.Count + " " + RedoStack.Count);
-        }
-        /// <summary>
-        /// Sets top property in UndoStack to Old Value
-        /// </summary>
-        public static void Undo()
-        {
-            _lastChangeWasUndo = true;
-            PropertyInfo propInfo = MainRoot.GetType().GetProperty(UndoStack.Peek().Property);
-            propInfo.SetValue(MainRoot, UndoStack.Peek().OldValue);
-            RedoStack.Push(UndoStack.Pop());
-            UndoStack.Pop();
-        }
-
-        /// <summary>
-        /// Sets top property from RedoStack to old value
-        /// </summary>
-        public static void Redo()
-        {
-            _lastChangeWasUndo = true;
-            PropertyInfo propinfo = MainRoot.GetType().GetProperty(RedoStack.Peek().Property);
-            propinfo.SetValue(MainRoot, RedoStack.Pop().OldValue);
-        }
-    }
-}
+using PixiEditor.Helpers;
+using PixiEditorDotNetCore3.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing.Printing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+
+namespace PixiEditor.Models
+{
+    public static class UndoManager
+    {
+        private const int MaximumChangesInRam = 1;
+
+        private static int _undosSavedOnDisk = 0;
+        private static int _redosSavedOnDisk = 0;
+        public static StackEx<Change> UndoStack { get; set; } = new StackEx<Change>(); 
+        public static StackEx<Change> RedoStack { get; set; } = new StackEx<Change>();
+        private static bool _stopRecording = false; 
+        private static List<Change> _recordedChanges = new List<Change>();
+        private static bool _lastChangeWasUndo = false;
+        public static bool CanUndo
+        {
+            get
+            {
+                return UndoStack.Count > 0;
+            }
+        }
+        public static bool CanRedo
+        {
+            get
+            {
+                return RedoStack.Count > 0;
+            }
+        }
+
+        public static object MainRoot { get; set; }
+
+        /// <summary>
+        /// Sets object(root) in which undo properties are stored.
+        /// </summary>
+        /// <param name="root">Parent object.</param>
+        public static void SetMainRoot(object root)
+        {
+            MainRoot = root;
+        }
+
+        /// <summary>
+        /// Records changes, used to save multiple changes as one
+        /// </summary>
+        /// <param name="property">Record property name.</param>
+        /// <param name="oldValue">Old change value.</param>
+        /// <param name="newValue">New change value.</param>
+        /// <param name="undoDescription">Description of change.</param>
+        public static void RecordChanges(string property, object oldValue, string undoDescription = "")
+        {
+            if (_stopRecording == false)
+            {
+                if (_recordedChanges.Count < 2)
+                {
+                    _recordedChanges.Add(new Change(property, oldValue, undoDescription));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Stops recording changes and saves it as one.
+        /// </summary>
+        public static void StopRecording()
+        {
+                _stopRecording = true;
+            if (_recordedChanges.Count > 0)
+            {
+                Change changeToSave = _recordedChanges[0];
+                AddUndoChange(changeToSave.Property, changeToSave.OldValue, changeToSave.Description);
+                _recordedChanges.Clear();
+            }
+            _stopRecording = false;
+        }
+        /// <summary>
+        /// Adds property change to UndoStack
+        /// </summary>
+        /// <param name="property">Changed property name.</param>
+        /// <param name="oldValue">Old value of property.</param>
+        /// <param name="newValue">New value of property.</param>
+        /// <param name="undoDescription">Description of change.</param>
+        public static void AddUndoChange(string property, object oldValue, string undoDescription = "")
+        {
+            if(_lastChangeWasUndo == false && RedoStack.Count > 0) //Cleares RedoStack if las move wasn't redo or undo and if redo stack is greater than 0
+            {
+                RedoStack.Clear();
+            }
+            _lastChangeWasUndo = false;
+            UndoStack.Push(new Change(property, oldValue, undoDescription));
+            Debug.WriteLine("UndoStackCount: " + UndoStack.Count + " RedoStackCount: " + RedoStack.Count);
+        }
+
+        /// <summary>
+        /// Sets top property in UndoStack to Old Value
+        /// </summary>
+        public static void Undo()
+        { 
+            _lastChangeWasUndo = true;
+            PropertyInfo propInfo = MainRoot.GetType().GetProperty(UndoStack.Peek().Property);
+            propInfo.SetValue(MainRoot, UndoStack.Peek().OldValue);
+            RedoStack.Push(UndoStack.Pop());
+        }
+
+        /// <summary>
+        /// Sets top property from RedoStack to old value
+        /// </summary>
+        public static void Redo() 
+        {
+            _lastChangeWasUndo = true;
+            PropertyInfo propinfo = MainRoot.GetType().GetProperty(RedoStack.Peek().Property);
+            propinfo.SetValue(MainRoot, RedoStack.Pop().OldValue);
+
+        }
+    }
+}

PixiEditorDotNetCore3/PixiEditorDotNetCore3.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Expression.Blend.Sdk">
+      <Version>1.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="Extended.Wpf.Toolkit">
+      <Version>3.5.0</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="WriteableBitmapEx">
+      <Version>1.6.2</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\BucketImage.png" />
+    <Resource Include="Images\CircleImage.png" />
+    <Resource Include="Images\Cross.png" />
+    <Resource Include="Images\EarserImage.png" />
+    <Resource Include="Images\LightenImage.png" />
+    <Resource Include="Images\LineImage.png" />
+    <Resource Include="Images\PenImage.png" />
+    <Resource Include="Images\PipetteImage.png" />
+    <Resource Include="Images\RectangleImage.png" />
+    <Resource Include="Images\transparentbg.png" />
+  </ItemGroup>
+  
+</Project>

PixiEditor/PixiEditor.sln → PixiEditorDotNetCore3/PixiEditorDotNetCore3.sln

@@ -1,25 +1,25 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2042
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor", "PixiEditor.csproj", "{04324995-2B67-402A-A427-F35AFA014D05}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{04324995-2B67-402A-A427-F35AFA014D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04324995-2B67-402A-A427-F35AFA014D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04324995-2B67-402A-A427-F35AFA014D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04324995-2B67-402A-A427-F35AFA014D05}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F514506B-7EFD-425F-9491-0C9D4ED0266B}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditorDotNetCore3", "PixiEditorDotNetCore3.csproj", "{B17A8190-059F-4FDD-A1B5-4F63D866778F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B17A8190-059F-4FDD-A1B5-4F63D866778F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B17A8190-059F-4FDD-A1B5-4F63D866778F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B17A8190-059F-4FDD-A1B5-4F63D866778F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B17A8190-059F-4FDD-A1B5-4F63D866778F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}
+	EndGlobalSection
+EndGlobal

PixiEditor/ViewModels/ViewModelMain.cs → PixiEditorDotNetCore3/ViewModels/ViewModelMain.cs

@@ -4,11 +4,13 @@ using PixiEditor.Models;
 using PixiEditor.Models.Enums;
 using PixiEditor.Models.Tools;
 using PixiEditor.Views;
+using PixiEditorDotNetCore3.Models;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -143,6 +145,7 @@ namespace PixiEditor.ViewModels
 
         public ViewModelMain()
         {
+            PixiFilesManager.InitializeTempDirectories();
             Layers = new ObservableCollection<Layer>();
             SelectToolCommand = new RelayCommand(RecognizeTool);
             GenerateDrawAreaCommand = new RelayCommand(GenerateDrawArea);
@@ -255,7 +258,7 @@ namespace PixiEditor.ViewModels
 
         private void RefreshImage()
         {
-            //If it won't work with layers, bug might occur here
+            //If it won't work with layers, bug may occur here
             if (ActiveLayer != null)
             {
                 ActiveImage.Source = ActiveLayer.LayerBitmap;

PixiEditor/Views/ImportFilePopup.xaml → PixiEditorDotNetCore3/Views/ImportFilePopup.xaml

@@ -25,7 +25,7 @@
             </i:Interaction.Triggers>
             <Button Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" BorderThickness="0" Command="{Binding CloseButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
                 <Button.Background>
-                    <ImageBrush ImageSource="/PixiEditor;component/Images/Cross.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/Cross.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
         </Grid>

PixiEditor/Views/MainWindow.xaml → PixiEditorDotNetCore3/Views/MainWindow.xaml

@@ -126,7 +126,7 @@
                             <i:Interaction.Behaviors>
                                 <behaviors:MouseBehaviour MouseX="{Binding MouseXOnCanvas, Mode=OneWayToSource}" MouseY="{Binding MouseYOnCanvas, Mode=OneWayToSource}"/>
                             </i:Interaction.Behaviors>
-                            <Image Source="/Images/transparent bg.png" Height="{Binding ActiveLayer.Height}" Width="{Binding ActiveLayer.Width}" Opacity="0.2" Stretch="UniformToFill"/>
+                            <Image Source="/Images/transparentbg.png" Height="{Binding ActiveLayer.Height}" Width="{Binding ActiveLayer.Width}" Opacity="0.2" Stretch="UniformToFill"/>
                             <ContentControl Content="{Binding ActiveImage}"/>
                         </Canvas>
                     </vws:MainDrawingPanel.Item>
@@ -142,42 +142,42 @@
             </TextBox>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Pen" ToolTip="Standard brush (B)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Pen Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/PenImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Bucket" ToolTip="Fills area with color (G)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Bucket Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/BucketImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Line" ToolTip="Draws line on canvas (L)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Line Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/LineImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Circle" ToolTip="Draws circle on cavnas (C)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Circle Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/CircleImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Rectangle" ToolTip="Draws rectanlge on cavnas (R)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Rectangle Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/RectangleImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="ColorPicker" ToolTip="Color picker, sets color from pixel as active (O)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Pipette Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/PipetteImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Earser" ToolTip="Earser, Earsers color from pixel (E)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Earser Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/EarserImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
             <Button Style="{StaticResource ToolButtonStyle}" Command="{Binding SelectToolCommand, Mode=OneWay}" CommandParameter="Lighten" ToolTip="Makes pixel brighter or darker pixel (U)">
                 <Button.Background>
-                    <ImageBrush ImageSource="/Images/Lighten Image.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/LightenImage.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
         </StackPanel>

PixiEditor/Views/NewFilePopup.xaml → PixiEditorDotNetCore3/Views/NewFilePopup.xaml

@@ -25,7 +25,7 @@
             </i:Interaction.Triggers>
             <Button Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" BorderThickness="0" Command="{Binding CloseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
             <Button.Background>
-                <ImageBrush ImageSource="/PixiEditor;component/Images/Cross.png" Stretch="Uniform"/>
+                <ImageBrush ImageSource="/Images/Cross.png" Stretch="Uniform"/>
             </Button.Background>
         </Button>
         </Grid>

PixiEditor/Views/SaveFilePopup.xaml → PixiEditorDotNetCore3/Views/SaveFilePopup.xaml

@@ -22,7 +22,7 @@
             </i:Interaction.Triggers>
             <Button Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" BorderThickness="0" Command="{Binding CloseButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
                 <Button.Background>
-                    <ImageBrush ImageSource="/PixiEditor;component/Images/Cross.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/Images/Cross.png" Stretch="Uniform"/>
                 </Button.Background>
             </Button>
         </Grid>

PixiEditorTests/Models/UndoManagerTests.cs

@@ -1,20 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PixiEditor.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.Models.Tests
-{
-    [TestClass()]
-    public class UndoManagerTests
-    {
-        [TestMethod()]
-        public void StopRecordingTest()
-        {
-            Assert.Fail();
-        }
-    }
-}

PixiEditorTests/PixiEditorTests.csproj

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2725573E-D3CD-44FF-8331-8527A0A2ADE2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PixiEditorTests</RootNamespace>
-    <AssemblyName>PixiEditorTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\PixiEditor\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\PixiEditor\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
-  <ItemGroup>
-    <Compile Include="Models\UndoManagerTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PixiEditor\PixiEditor.csproj">
-      <Project>{04324995-2B67-402A-A427-F35AFA014D05}</Project>
-      <Name>PixiEditor</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
-  </Target>
-  <Import Project="..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\PixiEditor\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

PixiEditorTests/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PixiEditorTests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PixiEditorTests")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2725573e-d3cd-44ff-8331-8527a0a2ade2")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

PixiEditorTests/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net461" />
-</packages>