diff --git a/Perspex.sln b/Perspex.sln
index fd7a671168..01e79a2632 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -147,13 +147,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Logging.Serilog", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.DesignerSupport", "src\Perspex.DesignerSupport\Perspex.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Skia.Desktop.TestApp", "src\Skia\Perspex.Skia.Desktop.TestApp\Perspex.Skia.Desktop.TestApp.csproj", "{383168DF-5A4E-45E5-A239-FB54D40D4F5C}"
-EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
- samples\TestApplicationShared\TestApplicationShared.projitems*{383168df-5a4e-45e5-a239-fb54d40d4f5c}*SharedItemsImports = 4
src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 4
src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
src\Skia\Perspex.Skia\Perspex.Skia.projitems*{2f59f3d0-748d-4652-b01e-e0d954756308}*SharedItemsImports = 13
@@ -1749,38 +1746,6 @@ Global
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.ActiveCfg = Release|Any CPU
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|x86.ActiveCfg = Release|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Ad-Hoc|x86.Build.0 = Release|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|Any CPU.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|iPhone.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|x86.ActiveCfg = Release|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.AppStore|x86.Build.0 = Release|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|Any CPU.ActiveCfg = Debug|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|Any CPU.Build.0 = Debug|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|iPhone.Build.0 = Debug|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|x86.ActiveCfg = Debug|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Debug|x86.Build.0 = Debug|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|Any CPU.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|iPhone.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|iPhone.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|x86.ActiveCfg = Release|x86
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1826,6 +1791,5 @@ Global
{61BEC86C-F307-4295-B5B8-9428610D7D55} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{88060192-33D5-4932-B0F9-8BD2763E857D} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
EndGlobalSection
EndGlobal
diff --git a/src/Skia/Perspex.Skia.Desktop.TestApp/App.config b/src/Skia/Perspex.Skia.Desktop.TestApp/App.config
deleted file mode 100644
index 2e292d1c8a..0000000000
--- a/src/Skia/Perspex.Skia.Desktop.TestApp/App.config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Skia/Perspex.Skia.Desktop.TestApp/Perspex.Skia.Desktop.TestApp.csproj b/src/Skia/Perspex.Skia.Desktop.TestApp/Perspex.Skia.Desktop.TestApp.csproj
deleted file mode 100644
index d912e884a0..0000000000
--- a/src/Skia/Perspex.Skia.Desktop.TestApp/Perspex.Skia.Desktop.TestApp.csproj
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {383168DF-5A4E-45E5-A239-FB54D40D4F5C}
- WinExe
- Properties
- Perspex.Skia.Desktop.TestApp
- Perspex.Skia.Desktop.TestApp
- v4.6
- 512
- true
-
-
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
- MinimumRecommendedRules.ruleset
- true
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- prompt
- MinimumRecommendedRules.ruleset
- true
-
-
-
- ..\..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll
- True
-
-
- ..\..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll
- True
-
-
- ..\..\..\packages\SkiaSharp.1.49.2.0-beta\lib\net45\SkiaSharp.dll
- True
-
-
-
-
- ..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
- True
-
-
- ..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll
- True
-
-
- ..\..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll
- True
-
-
- ..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
- True
-
-
- ..\..\..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {fb05ac90-89ba-4f2f-a924-f37875fb547c}
- Perspex.Cairo
-
-
- {54f237d5-a70a-4752-9656-0c70b1a7b047}
- Perspex.Gtk
-
-
- {3e53a01a-b331-47f3-b828-4a5717e77a24}
- Perspex.Markup.Xaml
-
-
- {6417e941-21bc-467b-a771-0de389353ce6}
- Perspex.Markup
-
-
- {d211e587-d8bc-45b9-95a4-f297c8fa5200}
- Perspex.Animation
-
-
- {799a7bb5-3c2c-48b6-85a7-406a12c420da}
- Perspex.Application
-
-
- {b09b78d8-9b26-48b0-9149-d64a2f120f3f}
- Perspex.Base
-
-
- {d2221c82-4a25-4583-9b43-d791e3f6820c}
- Perspex.Controls
-
-
- {7062ae20-5dcc-4442-9645-8195bdece63e}
- Perspex.Diagnostics
-
-
- {5fb2b005-0a7f-4dad-add4-3ed01444e63d}
- Perspex.HtmlRenderer
-
-
- {62024b2d-53eb-4638-b26b-85eeaa54866e}
- Perspex.Input
-
-
- {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}
- Perspex.Interactivity
-
-
- {42472427-4774-4c81-8aff-9f27b8e31721}
- Perspex.Layout
-
-
- {6417b24e-49c2-4985-8db2-3ab9d898ec91}
- Perspex.ReactiveUI
-
-
- {eb582467-6abb-43a1-b052-e981ba910e3a}
- Perspex.SceneGraph
-
-
- {f1baa01a-f176-4c6a-b39d-5b40bb1b148f}
- Perspex.Styling
-
-
- {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}
- Perspex.Themes.Default
-
-
- {3e908f67-5543-4879-a1dc-08eace79b3cd}
- Perspex.Direct2D1
-
-
- {811a76cf-1cf6-440f-963b-bbe31bd72a82}
- Perspex.Win32
-
-
- {925dd807-b651-475f-9f7c-cbeb974ce43d}
- Perspex.Skia.Desktop
-
-
-
-
-
-
-
- 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}.
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Skia/Perspex.Skia.Desktop.TestApp/Program.cs b/src/Skia/Perspex.Skia.Desktop.TestApp/Program.cs
deleted file mode 100644
index 98e79c8a8d..0000000000
--- a/src/Skia/Perspex.Skia.Desktop.TestApp/Program.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) The Perspex Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Reactive.Linq;
-using Perspex;
-using Perspex.Animation;
-using Perspex.Collections;
-using Perspex.Controls;
-using Perspex.Controls.Html;
-using Perspex.Controls.Primitives;
-using Perspex.Controls.Shapes;
-using Perspex.Controls.Templates;
-using Perspex.Diagnostics;
-using Perspex.Layout;
-using Perspex.Media;
-using Perspex.Media.Imaging;
-using TestApplication;
-using Perspex.Rendering;
-#if PERSPEX_GTK
-using Perspex.Gtk;
-#endif
-using ReactiveUI;
-
-namespace Perspex.Skia.Desktop.TestApp
-{
- internal class Program
- {
- private static void Main(string[] args)
- {
- // The version of ReactiveUI currently included is for WPF and so expects a WPF
- // dispatcher. This makes sure it's initialized.
- System.Windows.Threading.Dispatcher foo = System.Windows.Threading.Dispatcher.CurrentDispatcher;
-
- new App()
- .UseWin32()
- .UseSkia();
-
- //RendererMixin.DrawFpsCounter = true;
-
- MainWindow.RootNamespace = "Perspex.Skia.Desktop.TestApp";
- var wnd = MainWindow.Create();
-
- // let's start small :)
- //var wnd = SimpleWindow.Create();
-
- DevTools.Attach(wnd);
- Application.Current.Run(wnd);
- }
- }
-
- internal class SimpleWindow
- {
- public static Window Create()
- {
- Border container;
-
- Window window = new Window
- {
- Title = "Perspex Test Application",
- Content = (container = new Border
- {
- Background = Brushes.Green,
- BorderBrush = Brushes.Yellow,
- BorderThickness = 12,
- Padding = new Thickness(5),
- Child = new Rectangle
- {
- Fill = Brushes.Blue,
- Width = 200,
- Height = 200,
- Margin = new Thickness(50)
- }
- })
-
- };
-
- window.Show();
- return window;
- }
-
- }
-}
diff --git a/src/Skia/Perspex.Skia.Desktop.TestApp/Properties/AssemblyInfo.cs b/src/Skia/Perspex.Skia.Desktop.TestApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index ec1558ed5c..0000000000
--- a/src/Skia/Perspex.Skia.Desktop.TestApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -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("Perspex.Skia.Desktop.TestApp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Perspex.Skia.Desktop.TestApp")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[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("383168df-5a4e-45e5-a239-fb54d40d4f5c")]
-
-// 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")]
diff --git a/src/Skia/Perspex.Skia.Desktop.TestApp/packages.config b/src/Skia/Perspex.Skia.Desktop.TestApp/packages.config
deleted file mode 100644
index a23c1e822f..0000000000
--- a/src/Skia/Perspex.Skia.Desktop.TestApp/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file