Karathan
/
Editopia
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

remove nuget dependency

Karathan 6 vuotta sitten
vanhempi
e447792490
commit
141cb16156
18 muutettua tiedostoa jossa 224 lisäystä ja 77 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 0
    0
      Editopia.Editor/App.xaml
  2. 0
    0
      Editopia.Editor/App.xaml.cs
  3. 63
    0
      Editopia.Editor/Editopia.Editor.csproj
  4. 0
    0
      Editopia.Editor/MainView.xaml
  5. 0
    0
      Editopia.Editor/MainView.xaml.cs
  6. 0
    0
      Editopia.Editor/MainWindow.xaml
  7. 0
    0
      Editopia.Editor/MainWindow.xaml.cs
  8. 0
    0
      Editopia.Editor/Pages/EditTrainer.xaml
  9. 0
    0
      Editopia.Editor/Pages/EditTrainer.xaml.cs
  10. 0
    0
      Editopia.Editor/Pages/FilePage.xaml
  11. 0
    0
      Editopia.Editor/Pages/FilePage.xaml.cs
  12. 0
    0
      Editopia.Editor/SideBar.xaml
  13. 0
    0
      Editopia.Editor/nuget.config
  14. 4
    6
      Editopia.Universal/Editopia.Universal.csproj
  15. 157
    2
      Editopia.sln
  16. 0
    45
      Editopia/Editopia.Editor.csproj
  17. 0
    4
      Editopia/Editopia.csproj
  18. 0
    20
      Editopia/Program.cs

Editopia/App.xaml → Editopia.Editor/App.xaml Näytä tiedosto


Editopia/App.xaml.cs → Editopia.Editor/App.xaml.cs Näytä tiedosto


+ 63
- 0
Editopia.Editor/Editopia.Editor.csproj Näytä tiedosto 

@@ -0,0 +1,63 @@
1 
+<Project Sdk="Microsoft.NET.Sdk">
2 
+  <PropertyGroup>
3 
+    <OutputType>Library</OutputType>
4 
+    <TargetFramework>netstandard2.0</TargetFramework>
5 
+    <StartupObject></StartupObject>
6 
+    <ApplicationIcon />
7 
+  </PropertyGroup>
8 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
9 
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP;NETCOREAPP2_0</DefineConstants>
10 
+    <OutputPath>bin\Debug\netcoreapp2.0\</OutputPath>
11 
+    <DocumentationFile>bin\Debug\netcoreapp2.0\netcoreapp2.0\Editopia.Editor.xml</DocumentationFile>
12 
+    <WarningsAsErrors>NU1605</WarningsAsErrors>
13 
+    <NoWarn>1701;1702;CS1591</NoWarn>
14 
+  </PropertyGroup>
15 
+  <ItemGroup>
16 
+    <Compile Update="**\*.xaml.cs">
17 
+      <DependentUpon>%(Filename)</DependentUpon>
18 
+    </Compile>
19 
+    <EmbeddedResource Include="**\*.xaml">
20 
+      <SubType>Designer</SubType>
21 
+    </EmbeddedResource>
22 
+  </ItemGroup>
23 
+  <ItemGroup>
24 
+    <None Remove="MainView.xaml" />
25 
+    <None Remove="Pages\EditTrainer.xaml" />
26 
+    <None Remove="Pages\FilePage.xaml" />
27 
+    <None Remove="sidebar.xaml" />
28 
+  </ItemGroup>
29 
+  <ItemGroup>
30 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Animation\Avalonia.Animation.csproj" />
31 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Base\Avalonia.Base.csproj" />
32 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Controls\Avalonia.Controls.csproj" />
33 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
34 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Input\Avalonia.Input.csproj" />
35 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
36 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Layout\Avalonia.Layout.csproj" />
37 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
38 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Styling\Avalonia.Styling.csproj" />
39 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
40 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
41 
+    <ProjectReference Include="..\Avalonia\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
42 
+    <ProjectReference Include="..\Avalonia\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
43 
+  </ItemGroup>
44 
+  <ItemGroup>
45 
+    <Compile Update="MainView.xaml.cs">
46 
+      <DependentUpon>MainView.xaml</DependentUpon>
47 
+    </Compile>
48 
+    <Compile Update="Pages\FilePage.xaml.cs">
49 
+      <DependentUpon>FilePage.xaml</DependentUpon>
50 
+    </Compile>
51 
+    <Compile Update="Pages\EditTrainer.xaml.cs">
52 
+      <DependentUpon>EditTrainer.xaml</DependentUpon>
53 
+    </Compile>
54 
+  </ItemGroup>
55 
+  <ItemGroup>
56 
+    <EmbeddedResource Update="Pages\FilePage.xaml">
57 
+      <Generator>MSBuild:Compile</Generator>
58 
+    </EmbeddedResource>
59 
+    <EmbeddedResource Update="Pages\EditTrainer.xaml">
60 
+      <Generator>MSBuild:Compile</Generator>
61 
+    </EmbeddedResource>
62 
+  </ItemGroup>
63 
+</Project>

Editopia/MainView.xaml → Editopia.Editor/MainView.xaml Näytä tiedosto


Editopia/MainView.xaml.cs → Editopia.Editor/MainView.xaml.cs Näytä tiedosto


Editopia/MainWindow.xaml → Editopia.Editor/MainWindow.xaml Näytä tiedosto


Editopia/MainWindow.xaml.cs → Editopia.Editor/MainWindow.xaml.cs Näytä tiedosto


Editopia/Pages/EditTrainer.xaml → Editopia.Editor/Pages/EditTrainer.xaml Näytä tiedosto


Editopia/Pages/EditTrainer.xaml.cs → Editopia.Editor/Pages/EditTrainer.xaml.cs Näytä tiedosto


Editopia/Pages/FilePage.xaml → Editopia.Editor/Pages/FilePage.xaml Näytä tiedosto


Editopia/Pages/FilePage.xaml.cs → Editopia.Editor/Pages/FilePage.xaml.cs Näytä tiedosto


Editopia/SideBar.xaml → Editopia.Editor/SideBar.xaml Näytä tiedosto


Editopia/nuget.config → Editopia.Editor/nuget.config Näytä tiedosto


+ 4
- 6
Editopia.Universal/Editopia.Universal.csproj Näytä tiedosto 

@@ -6,12 +6,10 @@
6 6 
   </PropertyGroup>
7 7
8 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" />
9 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" />
10 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj" />
11 
+    <ProjectReference Include="..\Avalonia\src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj" />
12 
+    <ProjectReference Include="..\Editopia.Editor\Editopia.Editor.csproj" />
15 13 
   </ItemGroup>
16 14
17 15 
 </Project>

+ 157
- 2
Editopia.sln Näytä tiedosto 

@@ -3,9 +3,55 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editopia.Editor", "Editopia\Editopia.Editor.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
6 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editopia.Editor", "Editopia.Editor\Editopia.Editor.csproj", "{64410260-95AF-4C4C-987B-636DE09F96FA}"
7 7 
 EndProject
8 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editopia.Universal", "Editopia.Universal\Editopia.Universal.csproj", "{BEA7210A-3AE2-4F04-B07F-A8B012340813}"
8 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editopia.Universal", "Editopia.Universal\Editopia.Universal.csproj", "{BEA7210A-3AE2-4F04-B07F-A8B012340813}"
9 
+EndProject
10 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{BE2ACD11-9552-42C2-A288-D803C94A4196}"
11 
+EndProject
12 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Editopia", "Editopia", "{C722AF49-670F-4338-8DD6-A2BE0304A799}"
13 
+EndProject
14 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "Avalonia\src\Avalonia.Base\Avalonia.Base.csproj", "{A27B9BDC-0655-4ED9-80FF-0F5F5082110E}"
15 
+EndProject
16 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "Avalonia\src\Avalonia.Controls\Avalonia.Controls.csproj", "{8BBCC702-D4C3-4643-9069-D1F198FFB0F2}"
17 
+EndProject
18 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation", "Avalonia\src\Avalonia.Animation\Avalonia.Animation.csproj", "{4FA7A0F4-19AE-4312-AF77-C143868C7733}"
19 
+EndProject
20 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport", "Avalonia\src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{96E4F6EC-F094-4B70-AF34-C2BADD159F12}"
21 
+EndProject
22 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Diagnostics", "Avalonia\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{84480ECA-EDA1-462E-88F6-CC2244517EBA}"
23 
+EndProject
24 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input", "Avalonia\src\Avalonia.Input\Avalonia.Input.csproj", "{E2349CE2-58B8-4826-9840-BEFBE63BFE90}"
25 
+EndProject
26 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity", "Avalonia\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{9BA2914E-761E-41F4-BE47-B38D7E3920E1}"
27 
+EndProject
28 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout", "Avalonia\src\Avalonia.Layout\Avalonia.Layout.csproj", "{CFBD4EA3-D510-4D69-8E4C-770E513A70D8}"
29 
+EndProject
30 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Logging.Serilog", "Avalonia\src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC}"
31 
+EndProject
32 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals", "Avalonia\src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{D8A1A5A6-6CA0-4881-93F5-E1A17808F127}"
33 
+EndProject
34 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling", "Avalonia\src\Avalonia.Styling\Avalonia.Styling.csproj", "{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140}"
35 
+EndProject
36 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "Avalonia\src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{EDDF658D-4F4C-476F-B640-C0B5545F727A}"
37 
+EndProject
38 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup", "Avalonia\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{795FB412-03A7-40A1-8358-5E148D08F542}"
39 
+EndProject
40 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml", "Avalonia\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj", "{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7}"
41 
+EndProject
42 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Default", "Avalonia\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{BC363F7C-77E9-428F-907C-A27AB155A0C4}"
43 
+EndProject
44 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DotNetCoreRuntime", "Avalonia\src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj", "{BFC5623C-7197-4D22-9BC2-71D8869A1738}"
45 
+EndProject
46 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Gtk3", "Avalonia\src\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj", "{BCCC6E65-96A0-4C30-98C1-467EF5097EA9}"
47 
+EndProject
48 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.MonoMac", "Avalonia\src\OSX\Avalonia.MonoMac\Avalonia.MonoMac.csproj", "{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F}"
49 
+EndProject
50 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia", "Avalonia\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj", "{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C}"
51 
+EndProject
52 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32", "Avalonia\src\Windows\Avalonia.Win32\Avalonia.Win32.csproj", "{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62}"
53 
+EndProject
54 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI", "Avalonia\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{FD55342C-7A40-44DE-8A90-C8F2F2165FB1}"
9 55 
 EndProject
10 56 
 Global
11 57 
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 
@@ -21,10 +67,119 @@ Global
21 67 
 		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Debug|Any CPU.Build.0 = Debug|Any CPU
22 68 
 		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.ActiveCfg = Release|Any CPU
23 69 
 		{BEA7210A-3AE2-4F04-B07F-A8B012340813}.Release|Any CPU.Build.0 = Release|Any CPU
70 
+		{A27B9BDC-0655-4ED9-80FF-0F5F5082110E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71 
+		{A27B9BDC-0655-4ED9-80FF-0F5F5082110E}.Debug|Any CPU.Build.0 = Debug|Any CPU
72 
+		{A27B9BDC-0655-4ED9-80FF-0F5F5082110E}.Release|Any CPU.ActiveCfg = Release|Any CPU
73 
+		{A27B9BDC-0655-4ED9-80FF-0F5F5082110E}.Release|Any CPU.Build.0 = Release|Any CPU
74 
+		{8BBCC702-D4C3-4643-9069-D1F198FFB0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75 
+		{8BBCC702-D4C3-4643-9069-D1F198FFB0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
76 
+		{8BBCC702-D4C3-4643-9069-D1F198FFB0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
77 
+		{8BBCC702-D4C3-4643-9069-D1F198FFB0F2}.Release|Any CPU.Build.0 = Release|Any CPU
78 
+		{4FA7A0F4-19AE-4312-AF77-C143868C7733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79 
+		{4FA7A0F4-19AE-4312-AF77-C143868C7733}.Debug|Any CPU.Build.0 = Debug|Any CPU
80 
+		{4FA7A0F4-19AE-4312-AF77-C143868C7733}.Release|Any CPU.ActiveCfg = Release|Any CPU
81 
+		{4FA7A0F4-19AE-4312-AF77-C143868C7733}.Release|Any CPU.Build.0 = Release|Any CPU
82 
+		{96E4F6EC-F094-4B70-AF34-C2BADD159F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83 
+		{96E4F6EC-F094-4B70-AF34-C2BADD159F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
84 
+		{96E4F6EC-F094-4B70-AF34-C2BADD159F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
85 
+		{96E4F6EC-F094-4B70-AF34-C2BADD159F12}.Release|Any CPU.Build.0 = Release|Any CPU
86 
+		{84480ECA-EDA1-462E-88F6-CC2244517EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87 
+		{84480ECA-EDA1-462E-88F6-CC2244517EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
88 
+		{84480ECA-EDA1-462E-88F6-CC2244517EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
89 
+		{84480ECA-EDA1-462E-88F6-CC2244517EBA}.Release|Any CPU.Build.0 = Release|Any CPU
90 
+		{E2349CE2-58B8-4826-9840-BEFBE63BFE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91 
+		{E2349CE2-58B8-4826-9840-BEFBE63BFE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
92 
+		{E2349CE2-58B8-4826-9840-BEFBE63BFE90}.Release|Any CPU.ActiveCfg = Release|Any CPU
93 
+		{E2349CE2-58B8-4826-9840-BEFBE63BFE90}.Release|Any CPU.Build.0 = Release|Any CPU
94 
+		{9BA2914E-761E-41F4-BE47-B38D7E3920E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95 
+		{9BA2914E-761E-41F4-BE47-B38D7E3920E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
96 
+		{9BA2914E-761E-41F4-BE47-B38D7E3920E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
97 
+		{9BA2914E-761E-41F4-BE47-B38D7E3920E1}.Release|Any CPU.Build.0 = Release|Any CPU
98 
+		{CFBD4EA3-D510-4D69-8E4C-770E513A70D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99 
+		{CFBD4EA3-D510-4D69-8E4C-770E513A70D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
100 
+		{CFBD4EA3-D510-4D69-8E4C-770E513A70D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
101 
+		{CFBD4EA3-D510-4D69-8E4C-770E513A70D8}.Release|Any CPU.Build.0 = Release|Any CPU
102 
+		{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103 
+		{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
104 
+		{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
105 
+		{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC}.Release|Any CPU.Build.0 = Release|Any CPU
106 
+		{D8A1A5A6-6CA0-4881-93F5-E1A17808F127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107 
+		{D8A1A5A6-6CA0-4881-93F5-E1A17808F127}.Debug|Any CPU.Build.0 = Debug|Any CPU
108 
+		{D8A1A5A6-6CA0-4881-93F5-E1A17808F127}.Release|Any CPU.ActiveCfg = Release|Any CPU
109 
+		{D8A1A5A6-6CA0-4881-93F5-E1A17808F127}.Release|Any CPU.Build.0 = Release|Any CPU
110 
+		{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111 
+		{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140}.Debug|Any CPU.Build.0 = Debug|Any CPU
112 
+		{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140}.Release|Any CPU.ActiveCfg = Release|Any CPU
113 
+		{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140}.Release|Any CPU.Build.0 = Release|Any CPU
114 
+		{EDDF658D-4F4C-476F-B640-C0B5545F727A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115 
+		{EDDF658D-4F4C-476F-B640-C0B5545F727A}.Debug|Any CPU.Build.0 = Debug|Any CPU
116 
+		{EDDF658D-4F4C-476F-B640-C0B5545F727A}.Release|Any CPU.ActiveCfg = Release|Any CPU
117 
+		{EDDF658D-4F4C-476F-B640-C0B5545F727A}.Release|Any CPU.Build.0 = Release|Any CPU
118 
+		{795FB412-03A7-40A1-8358-5E148D08F542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119 
+		{795FB412-03A7-40A1-8358-5E148D08F542}.Debug|Any CPU.Build.0 = Debug|Any CPU
120 
+		{795FB412-03A7-40A1-8358-5E148D08F542}.Release|Any CPU.ActiveCfg = Release|Any CPU
121 
+		{795FB412-03A7-40A1-8358-5E148D08F542}.Release|Any CPU.Build.0 = Release|Any CPU
122 
+		{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123 
+		{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
124 
+		{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
125 
+		{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7}.Release|Any CPU.Build.0 = Release|Any CPU
126 
+		{BC363F7C-77E9-428F-907C-A27AB155A0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127 
+		{BC363F7C-77E9-428F-907C-A27AB155A0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
128 
+		{BC363F7C-77E9-428F-907C-A27AB155A0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
129 
+		{BC363F7C-77E9-428F-907C-A27AB155A0C4}.Release|Any CPU.Build.0 = Release|Any CPU
130 
+		{BFC5623C-7197-4D22-9BC2-71D8869A1738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131 
+		{BFC5623C-7197-4D22-9BC2-71D8869A1738}.Debug|Any CPU.Build.0 = Debug|Any CPU
132 
+		{BFC5623C-7197-4D22-9BC2-71D8869A1738}.Release|Any CPU.ActiveCfg = Release|Any CPU
133 
+		{BFC5623C-7197-4D22-9BC2-71D8869A1738}.Release|Any CPU.Build.0 = Release|Any CPU
134 
+		{BCCC6E65-96A0-4C30-98C1-467EF5097EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135 
+		{BCCC6E65-96A0-4C30-98C1-467EF5097EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
136 
+		{BCCC6E65-96A0-4C30-98C1-467EF5097EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
137 
+		{BCCC6E65-96A0-4C30-98C1-467EF5097EA9}.Release|Any CPU.Build.0 = Release|Any CPU
138 
+		{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139 
+		{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
140 
+		{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
141 
+		{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F}.Release|Any CPU.Build.0 = Release|Any CPU
142 
+		{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143 
+		{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
144 
+		{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
145 
+		{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C}.Release|Any CPU.Build.0 = Release|Any CPU
146 
+		{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147 
+		{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62}.Debug|Any CPU.Build.0 = Debug|Any CPU
148 
+		{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62}.Release|Any CPU.ActiveCfg = Release|Any CPU
149 
+		{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62}.Release|Any CPU.Build.0 = Release|Any CPU
150 
+		{FD55342C-7A40-44DE-8A90-C8F2F2165FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151 
+		{FD55342C-7A40-44DE-8A90-C8F2F2165FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
152 
+		{FD55342C-7A40-44DE-8A90-C8F2F2165FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
153 
+		{FD55342C-7A40-44DE-8A90-C8F2F2165FB1}.Release|Any CPU.Build.0 = Release|Any CPU
24 154 
 	EndGlobalSection
25 155 
 	GlobalSection(SolutionProperties) = preSolution
26 156 
 		HideSolutionNode = FALSE
27 157 
 	EndGlobalSection
158 
+	GlobalSection(NestedProjects) = preSolution
159 
+		{64410260-95AF-4C4C-987B-636DE09F96FA} = {C722AF49-670F-4338-8DD6-A2BE0304A799}
160 
+		{BEA7210A-3AE2-4F04-B07F-A8B012340813} = {C722AF49-670F-4338-8DD6-A2BE0304A799}
161 
+		{A27B9BDC-0655-4ED9-80FF-0F5F5082110E} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
162 
+		{8BBCC702-D4C3-4643-9069-D1F198FFB0F2} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
163 
+		{4FA7A0F4-19AE-4312-AF77-C143868C7733} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
164 
+		{96E4F6EC-F094-4B70-AF34-C2BADD159F12} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
165 
+		{84480ECA-EDA1-462E-88F6-CC2244517EBA} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
166 
+		{E2349CE2-58B8-4826-9840-BEFBE63BFE90} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
167 
+		{9BA2914E-761E-41F4-BE47-B38D7E3920E1} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
168 
+		{CFBD4EA3-D510-4D69-8E4C-770E513A70D8} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
169 
+		{7B7D6BE4-BFD9-4DC1-8222-79DCDFF554AC} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
170 
+		{D8A1A5A6-6CA0-4881-93F5-E1A17808F127} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
171 
+		{9BA4DDD2-4875-48C1-95C7-AFC93FCB5140} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
172 
+		{EDDF658D-4F4C-476F-B640-C0B5545F727A} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
173 
+		{795FB412-03A7-40A1-8358-5E148D08F542} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
174 
+		{AEC6A194-1CC1-42B0-9E85-C8D6DE34FEA7} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
175 
+		{BC363F7C-77E9-428F-907C-A27AB155A0C4} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
176 
+		{BFC5623C-7197-4D22-9BC2-71D8869A1738} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
177 
+		{BCCC6E65-96A0-4C30-98C1-467EF5097EA9} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
178 
+		{D2070D9E-36DA-4FF5-A03F-A188DEA64E5F} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
179 
+		{DE60FF65-3F0A-4F27-BCD3-0697A45DD24C} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
180 
+		{1BB33107-5BD0-49DB-BF8B-CEA312E4DC62} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
181 
+		{FD55342C-7A40-44DE-8A90-C8F2F2165FB1} = {BE2ACD11-9552-42C2-A288-D803C94A4196}
182 
+	EndGlobalSection
28 183 
 	GlobalSection(ExtensibilityGlobals) = postSolution
29 184 
 		SolutionGuid = {1E71EF89-9E35-40BB-9071-247DE301209B}
30 185 
 	EndGlobalSection

+ 0
- 45
Editopia/Editopia.Editor.csproj Näytä tiedosto 

@@ -1,45 +0,0 @@
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>

+ 0
- 4
Editopia/Editopia.csproj Näytä tiedosto 

@@ -1,4 +0,0 @@
1 
-<?xml version="1.0" encoding="utf-8"?>
2 
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 
-  <PropertyGroup />
4 
-</Project>

+ 0
- 20
Editopia/Program.cs Näytä tiedosto 

@@ -1,20 +0,0 @@
1 
-using System;
2 
-using Avalonia;
3 
-using Avalonia.Logging.Serilog;
4 
-using Editopia;
5 
-
6 
-namespace Editopia.Editor
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 
-}