Karathan
/
Editopia
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update to use different project for universal project entry

Karathan 6 years ago
parent
431f8838a0
commit
5866e3297b
14 changed files with 101 additions and 54 deletions
Split View Show Diff Stats
  1. 17
    0
      Editopia.Universal/Editopia.Universal.csproj
  2. 20
    0
      Editopia.Universal/Program.cs
  3. 7
    1
      Editopia.sln
  4. 1
    1
      Editopia/App.xaml
  5. 1
    1
      Editopia/App.xaml.cs
  6. 45
    0
      Editopia/Editopia.Editor.csproj
  7. 3
    44
      Editopia/Editopia.csproj
  8. 1
    1
      Editopia/MainView.xaml
  9. 1
    1
      Editopia/MainView.xaml.cs
  10. 1
    1
      Editopia/MainWindow.xaml
  11. 1
    1
      Editopia/MainWindow.xaml.cs
  12. 1
    1
      Editopia/Pages/EditTrainer.xaml.cs
  13. 1
    1
      Editopia/Pages/FilePage.xaml.cs
  14. 1
    1
      Editopia/Program.cs

+ 17
- 0
Editopia.Universal/Editopia.Universal.csproj View File 

@@ -0,0 +1,17 @@
1 
+<Project Sdk="Microsoft.NET.Sdk">
2 
+
3 
+  <PropertyGroup>
4 
+    <OutputType>Exe</OutputType>
5 
+    <TargetFramework>netcoreapp2.1</TargetFramework>
6 
+  </PropertyGroup>
7 
+
8 
+  <ItemGroup>
9 
+    <PackageReference Include="Avalonia" Version="0.6.1" />
10 
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
11 
+  </ItemGroup>
12 
+
13 
+  <ItemGroup>
14 
+    <ProjectReference Include="..\Editopia\Editopia.Editor.csproj" />
15 
+  </ItemGroup>
16 
+
17 
+</Project>

+ 20
- 0
Editopia.Universal/Program.cs View File 

@@ -0,0 +1,20 @@
1 
+using System;
2 
+using Avalonia;
3 
+using Avalonia.Logging.Serilog;
4 
+using Editopia.Editor;
5 
+
6 
+namespace Editopia.Universal
7 
+{
8 
+    class Program
9 
+    {
10 
+        static void Main(string[] args)
11 
+        {
12 
+            BuildAvaloniaApp().Start<MainWindow>();
13 
+        }
14 
+
15 
+        public static AppBuilder BuildAvaloniaApp()
16 
+            => AppBuilder.Configure<App>()
17 
+                .UsePlatformDetect()
18 
+                .LogToDebug();
19 
+    }
20 
+}

+ 7
- 1
Editopia.sln View File 

@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3 3 
 # Visual Studio 15
4 4 
 VisualStudioVersion = 15.0.27703.2042
5 5 
 MinimumVisualStudioVersion = 10.0.40219.1
6 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editopia", "Editopia\Editopia.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
6 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editopia.Editor", "Editopia\Editopia.Editor.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
7 
+EndProject
8 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editopia.Universal", "Editopia.Universal\Editopia.Universal.csproj", "{BEA7210A-3AE2-4F04-B07F-A8B012340813}"
7 9 
 EndProject
8 10 
 Global
9 11 
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 
@@ -15,6 +17,10 @@ Global
15 17 
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
16 18 
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
17 19 
 		{64410260-95AF-4C4C-987B-636DE09F96FA}.Release|Any CPU.Build.0 = Release|Any CPU
20 
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21 
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Debug|Any CPU.Build.0 = Debug|Any CPU
22 
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.ActiveCfg = Release|Any CPU
23 
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.Build.0 = Release|Any CPU
18 24 
 	EndGlobalSection
19 25 
 	GlobalSection(SolutionProperties) = preSolution
20 26 
 		HideSolutionNode = FALSE

+ 1
- 1
Editopia/App.xaml View File 

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

+ 1
- 1
Editopia/App.xaml.cs View File 

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

+ 45
- 0
Editopia/Editopia.Editor.csproj View File 

@@ -0,0 +1,45 @@
1 
+<Project Sdk="Microsoft.NET.Sdk">
2 
+  <PropertyGroup>
3 
+    <OutputType>WinExe</OutputType>
4 
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5 
+    <StartupObject></StartupObject>
6 
+    <ApplicationIcon />
7 
+  </PropertyGroup>
8 
+  <ItemGroup>
9 
+    <Compile Update="**\*.xaml.cs">
10 
+      <DependentUpon>%(Filename)</DependentUpon>
11 
+    </Compile>
12 
+    <EmbeddedResource Include="**\*.xaml">
13 
+      <SubType>Designer</SubType>
14 
+    </EmbeddedResource>
15 
+  </ItemGroup>
16 
+  <ItemGroup>
17 
+    <None Remove="MainView.xaml" />
18 
+    <None Remove="Pages\EditTrainer.xaml" />
19 
+    <None Remove="Pages\FilePage.xaml" />
20 
+    <None Remove="sidebar.xaml" />
21 
+  </ItemGroup>
22 
+  <ItemGroup>
23 
+    <PackageReference Include="Avalonia" Version="0.6.1" />
24 
+    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
25 
+  </ItemGroup>
26 
+  <ItemGroup>
27 
+    <Compile Update="MainView.xaml.cs">
28 
+      <DependentUpon>MainView.xaml</DependentUpon>
29 
+    </Compile>
30 
+    <Compile Update="Pages\FilePage.xaml.cs">
31 
+      <DependentUpon>FilePage.xaml</DependentUpon>
32 
+    </Compile>
33 
+    <Compile Update="Pages\EditTrainer.xaml.cs">
34 
+      <DependentUpon>EditTrainer.xaml</DependentUpon>
35 
+    </Compile>
36 
+  </ItemGroup>
37 
+  <ItemGroup>
38 
+    <EmbeddedResource Update="Pages\FilePage.xaml">
39 
+      <Generator>MSBuild:Compile</Generator>
40 
+    </EmbeddedResource>
41 
+    <EmbeddedResource Update="Pages\EditTrainer.xaml">
42 
+      <Generator>MSBuild:Compile</Generator>
43 
+    </EmbeddedResource>
44 
+  </ItemGroup>
45 
+</Project>

+ 3
- 44
Editopia/Editopia.csproj View File 

@@ -1,45 +1,4 @@
1 
-<Project Sdk="Microsoft.NET.Sdk">
2 
-  <PropertyGroup>
3 
-    <OutputType>WinExe</OutputType>
4 
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5 
-    <StartupObject>Editopia.Program</StartupObject>
6 
-    <ApplicationIcon />
7 
-  </PropertyGroup>
8 
-  <ItemGroup>
9 
-    <Compile Update="**\*.xaml.cs">
10 
-      <DependentUpon>%(Filename)</DependentUpon>
11 
-    </Compile>
12 
-    <EmbeddedResource Include="**\*.xaml">
13 
-      <SubType>Designer</SubType>
14 
-    </EmbeddedResource>
15 
-  </ItemGroup>
16 
-  <ItemGroup>
17 
-    <None Remove="MainView.xaml" />
18 
-    <None Remove="Pages\EditTrainer.xaml" />
19 
-    <None Remove="Pages\FilePage.xaml" />
20 
-    <None Remove="sidebar.xaml" />
21 
-  </ItemGroup>
22 
-  <ItemGroup>
23 
-    <PackageReference Include="Avalonia" Version="0.6.1" />
24 
-    <PackageReference Include="Avalonia.Desktop" Version="0.6.1" />
25 
-  </ItemGroup>
26 
-  <ItemGroup>
27 
-    <Compile Update="MainView.xaml.cs">
28 
-      <DependentUpon>MainView.xaml</DependentUpon>
29 
-    </Compile>
30 
-    <Compile Update="Pages\FilePage.xaml.cs">
31 
-      <DependentUpon>FilePage.xaml</DependentUpon>
32 
-    </Compile>
33 
-    <Compile Update="Pages\EditTrainer.xaml.cs">
34 
-      <DependentUpon>EditTrainer.xaml</DependentUpon>
35 
-    </Compile>
36 
-  </ItemGroup>
37 
-  <ItemGroup>
38 
-    <EmbeddedResource Update="Pages\FilePage.xaml">
39 
-      <Generator>MSBuild:Compile</Generator>
40 
-    </EmbeddedResource>
41 
-    <EmbeddedResource Update="Pages\EditTrainer.xaml">
42 
-      <Generator>MSBuild:Compile</Generator>
43 
-    </EmbeddedResource>
44 
-  </ItemGroup>
1 
+<?xml version="1.0" encoding="utf-8"?>
2 
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 
+  <PropertyGroup />
45 4 
 </Project>

+ 1
- 1
Editopia/MainView.xaml View File 

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

+ 1
- 1
Editopia/MainView.xaml.cs View File 

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

+ 1
- 1
Editopia/MainWindow.xaml View File 

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

+ 1
- 1
Editopia/MainWindow.xaml.cs View File 

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

+ 1
- 1
Editopia/Pages/EditTrainer.xaml.cs View File 

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

+ 1
- 1
Editopia/Pages/FilePage.xaml.cs View File 

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

+ 1
- 1
Editopia/Program.cs View File 

@@ -3,7 +3,7 @@ using Avalonia;
3 3 
 using Avalonia.Logging.Serilog;
4 4 
 using Editopia;
5 5
6 
-namespace Editopia
6 
+namespace Editopia.Editor
7 7 
 {
8 8 
     class Program
9 9 
     {