update to use different project for universal project entry

Editopia.Universal/Editopia.Universal.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.6.1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Editopia\Editopia.Editor.csproj" />
+  </ItemGroup>
+
+</Project>

Editopia.Universal/Program.cs

@@ -0,0 +1,20 @@
+using System;
+using Avalonia;
+using Avalonia.Logging.Serilog;
+using Editopia.Editor;
+
+namespace Editopia.Universal
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            BuildAvaloniaApp().Start<MainWindow>();
+        }
+
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToDebug();
+    }
+}

Editopia.sln

@@ -3,7 +3,9 @@ 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}") = "Editopia", "Editopia\Editopia.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editopia.Editor", "Editopia\Editopia.Editor.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editopia.Universal", "Editopia.Universal\Editopia.Universal.csproj", "{BEA7210A-3AE2-4F04-B07F-A8B012340813}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Editopia/App.xaml

@@ -14,6 +14,6 @@
     </Style>
     <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
     <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
-    <StyleInclude Source="resm:Editopia.SideBar.xaml"/>
+    <StyleInclude Source="resm:Editopia.Editor.SideBar.xaml"/>
   </Application.Styles>
 </Application>

Editopia/App.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Markup.Xaml;
 
-namespace Editopia
+namespace Editopia.Editor
 {
     public class App : Application
     {

Editopia/Editopia.Editor.csproj

@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <StartupObject></StartupObject>
+    <ApplicationIcon />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <EmbeddedResource Include="**\*.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="MainView.xaml" />
+    <None Remove="Pages\EditTrainer.xaml" />
+    <None Remove="Pages\FilePage.xaml" />
+    <None Remove="sidebar.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.6.1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Pages\FilePage.xaml.cs">
+      <DependentUpon>FilePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="Pages\EditTrainer.xaml.cs">
+      <DependentUpon>EditTrainer.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Pages\FilePage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Pages\EditTrainer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>

Editopia/Editopia.csproj

@@ -1,45 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <StartupObject>Editopia.Program</StartupObject>
-    <ApplicationIcon />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Update="**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="**\*.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="MainView.xaml" />
-    <None Remove="Pages\EditTrainer.xaml" />
-    <None Remove="Pages\FilePage.xaml" />
-    <None Remove="sidebar.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.6.1" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\FilePage.xaml.cs">
-      <DependentUpon>FilePage.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Pages\EditTrainer.xaml.cs">
-      <DependentUpon>EditTrainer.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Pages\FilePage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Pages\EditTrainer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
 </Project>

Editopia/MainView.xaml

@@ -1,5 +1,5 @@
 <UserControl xmlns="https://github.com/avaloniaui"
-        xmlns:pages="clr-namespace:Editopia.Pages"
+        xmlns:pages="clr-namespace:Editopia.Editor.Pages"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <TabControl Classes="sidebar" Name="Sidebar">
     <TabItem Header="File">

Editopia/MainView.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Editopia
+namespace Editopia.Editor
 {
     public class MainView : UserControl
     {

Editopia/MainWindow.xaml

@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Editopia"
-        xmlns:local="clr-namespace:Editopia">
+        xmlns:local="clr-namespace:Editopia.Editor">
   <local:MainView/>
 </Window>

Editopia/MainWindow.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Editopia
+namespace Editopia.Editor
 {
     public class MainWindow : Window
     {

Editopia/Pages/EditTrainer.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Editopia.Pages
+namespace Editopia.Editor.Pages
 {
     public class EditTrainer : UserControl
     {

Editopia/Pages/FilePage.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Editopia.Pages
+namespace Editopia.Editor.Pages
 {
     public class FilePage : UserControl
     {

Editopia/Program.cs

@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Logging.Serilog;
 using Editopia;
 
-namespace Editopia
+namespace Editopia.Editor
 {
     class Program
     {