Moved projects to src folder

Core2D.sln

@@ -11,45 +11,45 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Editor", "src\Core2D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utilities", "utilities", "{02F7371B-FFDA-46ED-B5FE-9D643EA3354A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileSystem.DotNet", "utilities\Core2D.FileSystem.DotNet\Core2D.FileSystem.DotNet.csproj", "{D1F867F7-9029-480D-B1E1-B0BE4658B182}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileSystem.DotNet", "src\Core2D.FileSystem.DotNet\Core2D.FileSystem.DotNet.csproj", "{D1F867F7-9029-480D-B1E1-B0BE4658B182}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.Dxf", "utilities\Core2D.FileWriter.Dxf\Core2D.FileWriter.Dxf.csproj", "{D40B3BCD-0A26-40BB-960B-9464D248C934}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.Dxf", "src\Core2D.FileWriter.Dxf\Core2D.FileWriter.Dxf.csproj", "{D40B3BCD-0A26-40BB-960B-9464D248C934}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.Emf", "utilities\Core2D.FileWriter.Emf\Core2D.FileWriter.Emf.csproj", "{3660FCE5-3D0F-412E-93A7-D0D992B4DA65}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.Emf", "src\Core2D.FileWriter.Emf\Core2D.FileWriter.Emf.csproj", "{3660FCE5-3D0F-412E-93A7-D0D992B4DA65}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.PdfSharp", "utilities\Core2D.FileWriter.PdfSharp\Core2D.FileWriter.PdfSharp.csproj", "{EC0EFA51-83F0-4439-BE9F-FAEBD3418C94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.PdfSharp", "src\Core2D.FileWriter.PdfSharp\Core2D.FileWriter.PdfSharp.csproj", "{EC0EFA51-83F0-4439-BE9F-FAEBD3418C94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.SkiaSharp", "utilities\Core2D.FileWriter.SkiaSharp\Core2D.FileWriter.SkiaSharp.csproj", "{CE2D5901-94D6-491F-A78E-4446160E621F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.FileWriter.SkiaSharp", "src\Core2D.FileWriter.SkiaSharp\Core2D.FileWriter.SkiaSharp.csproj", "{CE2D5901-94D6-491F-A78E-4446160E621F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Log.Trace", "utilities\Core2D.Log.Trace\Core2D.Log.Trace.csproj", "{68A36926-DF55-4F05-9F89-B9AB1463227E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Log.Trace", "src\Core2D.Log.Trace\Core2D.Log.Trace.csproj", "{68A36926-DF55-4F05-9F89-B9AB1463227E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Avalonia", "utilities\Core2D.Renderer.Avalonia\Core2D.Renderer.Avalonia.csproj", "{E05F3F7E-2176-43DC-90BB-F5C66CFDB12F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Avalonia", "src\Core2D.Renderer.Avalonia\Core2D.Renderer.Avalonia.csproj", "{E05F3F7E-2176-43DC-90BB-F5C66CFDB12F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Dxf", "utilities\Core2D.Renderer.Dxf\Core2D.Renderer.Dxf.csproj", "{ACC2C898-B49B-4ED9-B18C-389F50801B39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Dxf", "src\Core2D.Renderer.Dxf\Core2D.Renderer.Dxf.csproj", "{ACC2C898-B49B-4ED9-B18C-389F50801B39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.PdfSharp", "utilities\Core2D.Renderer.PdfSharp\Core2D.Renderer.PdfSharp.csproj", "{34C8EE31-A1FE-4A74-BE36-C1F38BC06FEC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.PdfSharp", "src\Core2D.Renderer.PdfSharp\Core2D.Renderer.PdfSharp.csproj", "{34C8EE31-A1FE-4A74-BE36-C1F38BC06FEC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.SkiaSharp", "utilities\Core2D.Renderer.SkiaSharp\Core2D.Renderer.SkiaSharp.csproj", "{9B8FA9BD-63BE-4560-BA55-0D86AEE1809E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.SkiaSharp", "src\Core2D.Renderer.SkiaSharp\Core2D.Renderer.SkiaSharp.csproj", "{9B8FA9BD-63BE-4560-BA55-0D86AEE1809E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.WinForms", "utilities\Core2D.Renderer.WinForms\Core2D.Renderer.WinForms.csproj", "{3DC476E6-5032-4888-9337-221B88653C40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.WinForms", "src\Core2D.Renderer.WinForms\Core2D.Renderer.WinForms.csproj", "{3DC476E6-5032-4888-9337-221B88653C40}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Wpf", "utilities\Core2D.Renderer.Wpf\Core2D.Renderer.Wpf.csproj", "{3BFBD239-8979-480D-B1CB-B763F7C915C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Renderer.Wpf", "src\Core2D.Renderer.Wpf\Core2D.Renderer.Wpf.csproj", "{3BFBD239-8979-480D-B1CB-B763F7C915C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Serializer.Newtonsoft", "utilities\Core2D.Serializer.Newtonsoft\Core2D.Serializer.Newtonsoft.csproj", "{11E61A53-13D5-4447-8D66-3F328BBFC30A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Serializer.Newtonsoft", "src\Core2D.Serializer.Newtonsoft\Core2D.Serializer.Newtonsoft.csproj", "{11E61A53-13D5-4447-8D66-3F328BBFC30A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Serializer.Xaml", "utilities\Core2D.Serializer.Xaml\Core2D.Serializer.Xaml.csproj", "{1DCA99EA-F8FE-4DDD-AB81-BF0380C1B33D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Serializer.Xaml", "src\Core2D.Serializer.Xaml\Core2D.Serializer.Xaml.csproj", "{1DCA99EA-F8FE-4DDD-AB81-BF0380C1B33D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.ServiceProvider.Autofac", "utilities\Core2D.ServiceProvider.Autofac\Core2D.ServiceProvider.Autofac.csproj", "{7D5D7DF6-058D-4F2E-A3A8-47F89B6E2E7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.ServiceProvider.Autofac", "src\Core2D.ServiceProvider.Autofac\Core2D.ServiceProvider.Autofac.csproj", "{7D5D7DF6-058D-4F2E-A3A8-47F89B6E2E7C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.ScriptRunner.Roslyn", "utilities\Core2D.ScriptRunner.Roslyn\Core2D.ScriptRunner.Roslyn.csproj", "{352C23CD-8A6D-4C91-9FD2-FC35ECBC8AFE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.ScriptRunner.Roslyn", "src\Core2D.ScriptRunner.Roslyn\Core2D.ScriptRunner.Roslyn.csproj", "{352C23CD-8A6D-4C91-9FD2-FC35ECBC8AFE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.TextFieldReader.CsvHelper", "utilities\Core2D.TextFieldReader.CsvHelper\Core2D.TextFieldReader.CsvHelper.csproj", "{F215ADF5-74C1-4E26-9045-B6BBDA736092}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.TextFieldReader.CsvHelper", "src\Core2D.TextFieldReader.CsvHelper\Core2D.TextFieldReader.CsvHelper.csproj", "{F215ADF5-74C1-4E26-9045-B6BBDA736092}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.TextFieldWriter.CsvHelper", "utilities\Core2D.TextFieldWriter.CsvHelper\Core2D.TextFieldWriter.CsvHelper.csproj", "{AE7FF1B5-ABE3-45BF-87CC-44AC580A666A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.TextFieldWriter.CsvHelper", "src\Core2D.TextFieldWriter.CsvHelper\Core2D.TextFieldWriter.CsvHelper.csproj", "{AE7FF1B5-ABE3-45BF-87CC-44AC580A666A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Utilities.Avalonia", "utilities\Core2D.Utilities.Avalonia\Core2D.Utilities.Avalonia.csproj", "{C6DBD1FD-C462-4005-B382-97BB4AEF26F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Utilities.Avalonia", "src\Core2D.Utilities.Avalonia\Core2D.Utilities.Avalonia.csproj", "{C6DBD1FD-C462-4005-B382-97BB4AEF26F2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Utilities.Wpf", "utilities\Core2D.Utilities.Wpf\Core2D.Utilities.Wpf.csproj", "{E8D9036D-7E08-4405-B767-FB1E654EF66A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Utilities.Wpf", "src\Core2D.Utilities.Wpf\Core2D.Utilities.Wpf.csproj", "{E8D9036D-7E08-4405-B767-FB1E654EF66A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8756F874-0C1B-4AB8-83E0-0BEDA782D212}"
 EndProject
@@ -97,9 +97,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core2D.Utilities.Wpf.UnitTe
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{4322259E-219C-4F6C-9A1B-3DEB14B224A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core2D.Wpf", "apps\Core2D.Wpf\Core2D.Wpf.csproj", "{12889680-3769-4914-BE60-5D09E83DF5B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core2D.Wpf", "src\Core2D.Wpf\Core2D.Wpf.csproj", "{12889680-3769-4914-BE60-5D09E83DF5B2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Avalonia", "apps\Core2D.Avalonia\Core2D.Avalonia.csproj", "{0C7EA04E-94D8-49B7-B387-C031B2422F3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Avalonia", "src\Core2D.Avalonia\Core2D.Avalonia.csproj", "{0C7EA04E-94D8-49B7-B387-C031B2422F3B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{C7162582-C1FD-45FB-99FD-6770D67B5A21}"
 EndProject

LICENSE.TXT

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Wiesław Šoltés
+Copyright (c) 2018 Wiesław Šoltés
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -66,14 +66,14 @@ $ ./build.sh --target "Default" --platform "AnyCPU" --configuration "Release"
 
 Open up a Powershell prompt and execute:
 ```PowerShell
-cd apps/Core2D.Avalonia
+cd src/Core2D.Avalonia
 dotnet restore
 dotnet build
 ```
 
 Open up a terminal prompt and execute:
 ```Bash
-cd apps/Core2D.Avalonia
+cd src/Core2D.Avalonia
 dotnet restore
 dotnet build
 ```
@@ -84,21 +84,21 @@ You can publish self-contained `Core2D` application and all of its dependencies
 
 Open up a Powershell prompt and execute:
 ```PowerShell
-cd apps/Core2D.Avalonia
+cd src/Core2D.Avalonia
 dotnet restore
 dotnet publish -r win7-x64 -o win7-x64
 ```
 
 Open up a Powershell prompt and execute:
 ```PowerShell
-cd apps/Core2D.Avalonia
+cd src/Core2D.Avalonia
 dotnet restore
 dotnet publish -r win7-x86 -o win7-x86
 ```
 
 Open up a terminal prompt and execute:
 ```Bash
-cd apps/Core2D.Avalonia
+cd src/Core2D.Avalonia
 dotnet restore
 dotnet publish -r ubuntu.16.10-x64 -o ubuntu.16.10-x64
 ```

apps/Core2D.Avalonia/Core2D.Avalonia.csproj

@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-  </PropertyGroup>
-
-  <Import Project="..\..\build\Default.targets" />
-  <Import Project="..\..\build\NETCore.props" />
-  <Import Project="..\..\build\NuGet.props" />
-  <Import Project="..\..\build\Base.props" />
-  <Import Project="..\..\build\Autofac.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\Avalonia.Desktop.props" />
-  <Import Project="..\..\build\SkiaSharp.props" />
-  <Import Project="..\..\build\SharpDX.props" />
-
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="obj\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="**\*.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Core2D.Editor\Core2D.Editor.csproj" />
-    <ProjectReference Include="..\..\src\Core2D\Core2D.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.FileSystem.DotNet\Core2D.FileSystem.DotNet.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.FileWriter.SkiaSharp\Core2D.FileWriter.SkiaSharp.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Log.Trace\Core2D.Log.Trace.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Renderer.Avalonia\Core2D.Renderer.Avalonia.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Renderer.SkiaSharp\Core2D.Renderer.SkiaSharp.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.ScriptRunner.Roslyn\Core2D.ScriptRunner.Roslyn.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Serializer.Newtonsoft\Core2D.Serializer.Newtonsoft.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Serializer.Xaml\Core2D.Serializer.Xaml.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.ServiceProvider.Autofac\Core2D.ServiceProvider.Autofac.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.TextFieldReader.CsvHelper\Core2D.TextFieldReader.CsvHelper.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.TextFieldWriter.CsvHelper\Core2D.TextFieldWriter.CsvHelper.csproj" />
-    <ProjectReference Include="..\..\utilities\Core2D.Utilities.Avalonia\Core2D.Utilities.Avalonia.csproj" />
-  </ItemGroup>
-
-</Project>

build.cake

@@ -59,7 +59,7 @@ var UnitTestsFramework = "net461";
 // .NET Core Projects
 ///////////////////////////////////////////////////////////////////////////////
 
-var netCoreAppsRoot= "./apps";
+var netCoreAppsRoot= "./src";
 var netCoreApps = new string[] { "Core2D.Avalonia" };
 var netCoreProjects = netCoreApps.Select(name => 
     new {
@@ -97,24 +97,20 @@ if (IsRunningOnWindows())
 var buildDirs = 
     GetDirectories("./src/**/bin/**") + 
     GetDirectories("./src/**/obj/**") + 
-    GetDirectories("./utilities/**/bin/**") + 
-    GetDirectories("./utilities/**/obj/**") + 
     GetDirectories("./tests/**/bin/**") + 
-    GetDirectories("./tests/**/obj/**") + 
-    GetDirectories("./apps/**/bin/**") + 
-    GetDirectories("./apps/**/obj/**");
+    GetDirectories("./tests/**/obj/**");
 var artifactsDir = (DirectoryPath)Directory("./artifacts");
 var testResultsDir = artifactsDir.Combine("test-results");	
 var zipRootDir = artifactsDir.Combine("zip");
 var dirSuffixZip = platform + "/" + configuration;
 var fileZipSuffix = version + ".zip";
-var zipSourceWpfDir = (DirectoryPath)Directory("./apps/Core2D.Wpf/bin/" + dirSuffixZip);
+var zipSourceWpfDir = (DirectoryPath)Directory("./src/Core2D.Wpf/bin/" + dirSuffixZip);
 var zipTargetWpfFile = zipRootDir.CombineWithFilePath("Core2D.Wpf-" + fileZipSuffix);
-var msvcp140_x86 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x86\Microsoft.VC141.CRT\msvcp140.dll";
-var msvcp140_x64 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\msvcp140.dll";
-var vcruntime140_x86 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x86\Microsoft.VC141.CRT\vcruntime140.dll";
-var vcruntime140_x64 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vcruntime140.dll";
-var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.12.25827\bin\HostX86\x86\editbin.exe";
+var msvcp140_x86 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x86\Microsoft.VC141.CRT\msvcp140.dll";
+var msvcp140_x64 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x64\Microsoft.VC141.CRT\msvcp140.dll";
+var vcruntime140_x86 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x86\Microsoft.VC141.CRT\vcruntime140.dll";
+var vcruntime140_x64 = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x64\Microsoft.VC141.CRT\vcruntime140.dll";
+var editbin = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.13.26128\bin\HostX86\x86\editbin.exe";
 
 ///////////////////////////////////////////////////////////////////////////////
 // VALIDATE

build/NuGet.props

@@ -4,7 +4,7 @@
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Description>A multi-platform data driven 2D diagram editor.</Description>
-    <Copyright>Copyright © Wiesław Šoltés 2017</Copyright>
+    <Copyright>Copyright © Wiesław Šoltés 2018</Copyright>
     <PackageLicenseUrl>https://github.com/wieslawsoltes/Core2D/blob/master/LICENSE.TXT</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/wieslawsoltes/Core2D</PackageProjectUrl>
     <PackageTags>2d;editor;data;diagram;graphics;geometry;data;shapes;wysiwyg-editor</PackageTags>

circle.yml

@@ -13,8 +13,8 @@ jobs:
       - run: dotnet build src/Core2D.Editor/Core2D.Editor.csproj -c Release -f netstandard2.0
       - run: dotnet restore tests/Core2D.UnitTests
       - run: dotnet test tests/Core2D.UnitTests/Core2D.UnitTests.csproj -c Release -f netcoreapp2.0
-      - run: dotnet restore apps/Core2D.Avalonia
-      - run: dotnet build apps/Core2D.Avalonia/Core2D.Avalonia.csproj -c Release -f netcoreapp2.0
+      - run: dotnet restore src/Core2D.Avalonia
+      - run: dotnet build src/Core2D.Avalonia/Core2D.Avalonia.csproj -c Release -f netcoreapp2.0
     notify:
       webhooks:
         - url: https://webhooks.gitter.im/e/18bc2743c91ff21c0246

src/Core2D.Avalonia/Core2D.Avalonia.csproj

@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\Default.targets" />
+  <Import Project="..\..\build\NETCore.props" />
+  <Import Project="..\..\build\NuGet.props" />
+  <Import Project="..\..\build\Base.props" />
+  <Import Project="..\..\build\Autofac.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\SkiaSharp.props" />
+  <Import Project="..\..\build\SharpDX.props" />
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="obj\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="**\*.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core2D.Editor\Core2D.Editor.csproj" />
+    <ProjectReference Include="..\Core2D\Core2D.csproj" />
+    <ProjectReference Include="..\Core2D.FileSystem.DotNet\Core2D.FileSystem.DotNet.csproj" />
+    <ProjectReference Include="..\Core2D.FileWriter.SkiaSharp\Core2D.FileWriter.SkiaSharp.csproj" />
+    <ProjectReference Include="..\Core2D.Log.Trace\Core2D.Log.Trace.csproj" />
+    <ProjectReference Include="..\Core2D.Renderer.Avalonia\Core2D.Renderer.Avalonia.csproj" />
+    <ProjectReference Include="..\Core2D.Renderer.SkiaSharp\Core2D.Renderer.SkiaSharp.csproj" />
+    <ProjectReference Include="..\Core2D.ScriptRunner.Roslyn\Core2D.ScriptRunner.Roslyn.csproj" />
+    <ProjectReference Include="..\Core2D.Serializer.Newtonsoft\Core2D.Serializer.Newtonsoft.csproj" />
+    <ProjectReference Include="..\Core2D.Serializer.Xaml\Core2D.Serializer.Xaml.csproj" />
+    <ProjectReference Include="..\Core2D.ServiceProvider.Autofac\Core2D.ServiceProvider.Autofac.csproj" />
+    <ProjectReference Include="..\Core2D.TextFieldReader.CsvHelper\Core2D.TextFieldReader.CsvHelper.csproj" />
+    <ProjectReference Include="..\Core2D.TextFieldWriter.CsvHelper\Core2D.TextFieldWriter.CsvHelper.csproj" />
+    <ProjectReference Include="..\Core2D.Utilities.Avalonia\Core2D.Utilities.Avalonia.csproj" />
+  </ItemGroup>
+
+</Project>