From 44b1b4d9cd28905ccde923661d32eb0d6c05fc2d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 22 Mar 2016 15:18:06 -0500 Subject: [PATCH 1/2] Moved Application and Design into Perspex.Controls. Moved designer support classes into new Perspex.DesignerSupport assembly. --- Perspex.sln | 58 +++++++++---------- nuget/build-version.ps1 | 4 +- samples/BindingTest/BindingTest.csproj | 4 -- samples/ControlCatalog/ControlCatalog.csproj | 4 -- .../TestApplication/TestApplication.csproj | 4 -- .../XamlTestApplication.csproj | 4 -- .../XamlTestApplicationPcl.csproj | 4 -- .../Perspex.Android/Perspex.Android.csproj | 4 -- .../Perspex.AndroidTestApplication.csproj | 4 -- src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj | 4 -- .../Application.cs | 0 .../Designer => Perspex.Controls}/Design.cs | 10 +--- src/Perspex.Controls/Perspex.Controls.csproj | 2 + .../Properties/AssemblyInfo.cs | 1 + .../DesignerApi.cs | 0 .../DesignerAssist.cs | 0 .../Perspex.DesignerSupport.csproj} | 12 ++-- .../Properties/AssemblyInfo.cs | 0 .../app.config | 0 .../packages.config | 0 .../Perspex.Skia.Android.TestApp.csproj | 2 +- .../Perspex.Skia.Android.TestApp.csproj.bak | 2 +- .../Perspex.Skia.Android.csproj | 2 +- .../Perspex.Skia.iOS.TestApp.csproj | 4 -- .../Perspex.Skia.iOS/Perspex.Skia.iOS.csproj | 4 -- .../Perspex.Win32/Perspex.Win32.csproj | 4 -- src/iOS/Perspex.iOS/Perspex.iOS.csproj | 4 -- .../Perspex.iOSTestApplication.csproj | 4 -- .../Perspex.Benchmarks.csproj | 4 -- .../Perspex.Controls.UnitTests.csproj | 4 -- .../Perspex.Layout.UnitTests.csproj | 4 -- .../Perspex.LeakTests.csproj | 4 -- .../Perspex.Markup.Xaml.UnitTests.csproj | 4 -- .../Perspex.Skia.RenderTests.csproj | 4 -- .../Perspex.UnitTests.csproj | 4 -- 35 files changed, 44 insertions(+), 129 deletions(-) rename src/{Perspex.Application => Perspex.Controls}/Application.cs (100%) rename src/{Perspex.Application/Designer => Perspex.Controls}/Design.cs (92%) rename src/{Perspex.Application/Designer => Perspex.DesignerSupport}/DesignerApi.cs (100%) rename src/{Perspex.Application/Designer => Perspex.DesignerSupport}/DesignerAssist.cs (100%) rename src/{Perspex.Application/Perspex.Application.csproj => Perspex.DesignerSupport/Perspex.DesignerSupport.csproj} (93%) rename src/{Perspex.Application => Perspex.DesignerSupport}/Properties/AssemblyInfo.cs (100%) rename src/{Perspex.Application => Perspex.DesignerSupport}/app.config (100%) rename src/{Perspex.Application => Perspex.DesignerSupport}/packages.config (100%) diff --git a/Perspex.sln b/Perspex.sln index bc7e0560af..2f5a5bf777 100644 --- a/Perspex.sln +++ b/Perspex.sln @@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling", "src\Pers EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Themes.Default", "src\Perspex.Themes.Default\Perspex.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Application", "src\Perspex.Application\Perspex.Application.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Diagnostics", "src\Perspex.Diagnostics\Perspex.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Animation", "src\Perspex.Animation\Perspex.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}" @@ -142,6 +140,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.UnitTests", "tests\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Benchmarks", "tests\Perspex.Benchmarks\Perspex.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.DesignerSupport", "src\Perspex.DesignerSupport\Perspex.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4 @@ -150,20 +150,20 @@ Global 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 src\Shared\PlatformSupport\PlatformSupport.projitems*{db070a10-bf39-4752-8456-86e9d5928478}*SharedItemsImports = 4 - src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 src\Skia\Perspex.Skia\Perspex.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 + src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 samples\TestApplicationShared\TestApplicationShared.projitems*{78345174-5b52-4a14-b9fd-d5f2428137f0}*SharedItemsImports = 13 src\Shared\PlatformSupport\PlatformSupport.projitems*{54f237d5-a70a-4752-9656-0c70b1a7b047}*SharedItemsImports = 4 samples\TestApplicationShared\TestApplicationShared.projitems*{ff69b927-c545-49ae-8e16-3d14d621aa12}*SharedItemsImports = 4 src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13 src\Shared\PlatformSupport\PlatformSupport.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4 src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 4 - src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4 src\Skia\Perspex.Skia\Perspex.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4 + src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4 samples\TestApplicationShared\TestApplicationShared.projitems*{8c923867-8a8f-4f6b-8b80-47d9e8436166}*SharedItemsImports = 4 samples\TestApplicationShared\TestApplicationShared.projitems*{e3a1060b-50d0-44e8-88b6-f44ef2e5bd72}*SharedItemsImports = 4 - src\Shared\RenderHelpers\RenderHelpers.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4 src\Skia\Perspex.Skia\Perspex.Skia.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4 + src\Shared\RenderHelpers\RenderHelpers.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4 src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4 src\Shared\PlatformSupport\PlatformSupport.projitems*{e1aa3dbf-9056-4530-9376-18119a7a3ffe}*SharedItemsImports = 4 EndGlobalSection @@ -422,30 +422,6 @@ Global {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhone.Build.0 = Release|Any CPU {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {7062AE20-5DCC-4442-9645-8195BDECE63E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU @@ -1321,6 +1297,30 @@ Global {410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhone.Build.0 = Release|Any CPU {410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|Any CPU.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhone.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhone.Build.0 = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|Any CPU.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhone.Build.0 = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index 59031527d5..0c4b8a5281 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -27,12 +27,12 @@ mkdir $ios Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll $lib Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.xml $lib -Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.dll $lib -Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.xml $lib Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.dll $lib Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.xml $lib Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.dll $lib Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.xml $lib +Copy-Item ..\src\Perspex.DesignerSupport\bin\Release\Perspex.DesignerSupport.dll $lib +Copy-Item ..\src\Perspex.DesignerSupport\bin\Release\Perspex.DesignerSupport.xml $lib Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.dll $lib Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.xml $lib Copy-Item ..\src\Perspex.Input\bin\Release\Perspex.Input.dll $lib diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 406c5b1cfb..bdccdd2f98 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -111,10 +111,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 875e8b0505..badba5c0c7 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -139,10 +139,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj index 56f7ff3b4c..11d9ad9939 100644 --- a/samples/TestApplication/TestApplication.csproj +++ b/samples/TestApplication/TestApplication.csproj @@ -98,10 +98,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799A7BB5-3C2C-48B6-85A7-406A12C420DA} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index 94c56c07e2..231103e874 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -95,10 +95,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799A7BB5-3C2C-48B6-85A7-406A12C420DA} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj index f027c763e8..1e30c29730 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj +++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj @@ -69,10 +69,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/Android/Perspex.Android/Perspex.Android.csproj b/src/Android/Perspex.Android/Perspex.Android.csproj index 6af3c2a736..0d3bbcb915 100644 --- a/src/Android/Perspex.Android/Perspex.Android.csproj +++ b/src/Android/Perspex.Android/Perspex.Android.csproj @@ -99,10 +99,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/Android/Perspex.AndroidTestApplication/Perspex.AndroidTestApplication.csproj b/src/Android/Perspex.AndroidTestApplication/Perspex.AndroidTestApplication.csproj index 11d757083d..3122e2a8fc 100644 --- a/src/Android/Perspex.AndroidTestApplication/Perspex.AndroidTestApplication.csproj +++ b/src/Android/Perspex.AndroidTestApplication/Perspex.AndroidTestApplication.csproj @@ -139,10 +139,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj index 1d286b3bf0..81cb022a3e 100644 --- a/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj +++ b/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj @@ -63,10 +63,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799A7BB5-3C2C-48B6-85A7-406A12C420DA} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/src/Perspex.Application/Application.cs b/src/Perspex.Controls/Application.cs similarity index 100% rename from src/Perspex.Application/Application.cs rename to src/Perspex.Controls/Application.cs diff --git a/src/Perspex.Application/Designer/Design.cs b/src/Perspex.Controls/Design.cs similarity index 92% rename from src/Perspex.Application/Designer/Design.cs rename to src/Perspex.Controls/Design.cs index 380d1939b0..66df299bcd 100644 --- a/src/Perspex.Application/Designer/Design.cs +++ b/src/Perspex.Controls/Design.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Perspex.Controls; - -namespace Perspex + +namespace Perspex.Controls { public static class Design { diff --git a/src/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj index c249a901f6..f430bc4b76 100644 --- a/src/Perspex.Controls/Perspex.Controls.csproj +++ b/src/Perspex.Controls/Perspex.Controls.csproj @@ -43,8 +43,10 @@ Properties\SharedAssemblyInfo.cs + + diff --git a/src/Perspex.Controls/Properties/AssemblyInfo.cs b/src/Perspex.Controls/Properties/AssemblyInfo.cs index 898bc92b87..5126ed362a 100644 --- a/src/Perspex.Controls/Properties/AssemblyInfo.cs +++ b/src/Perspex.Controls/Properties/AssemblyInfo.cs @@ -7,6 +7,7 @@ using Perspex.Metadata; [assembly: AssemblyTitle("Perspex.Controls")] [assembly: InternalsVisibleTo("Perspex.Controls.UnitTests")] +[assembly: InternalsVisibleTo("Perspex.DesignerSupport")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls.Presenters")] diff --git a/src/Perspex.Application/Designer/DesignerApi.cs b/src/Perspex.DesignerSupport/DesignerApi.cs similarity index 100% rename from src/Perspex.Application/Designer/DesignerApi.cs rename to src/Perspex.DesignerSupport/DesignerApi.cs diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.DesignerSupport/DesignerAssist.cs similarity index 100% rename from src/Perspex.Application/Designer/DesignerAssist.cs rename to src/Perspex.DesignerSupport/DesignerAssist.cs diff --git a/src/Perspex.Application/Perspex.Application.csproj b/src/Perspex.DesignerSupport/Perspex.DesignerSupport.csproj similarity index 93% rename from src/Perspex.Application/Perspex.Application.csproj rename to src/Perspex.DesignerSupport/Perspex.DesignerSupport.csproj index db58d8e3f9..cb46112c79 100644 --- a/src/Perspex.Application/Perspex.Application.csproj +++ b/src/Perspex.DesignerSupport/Perspex.DesignerSupport.csproj @@ -9,7 +9,7 @@ Library Properties Perspex - Perspex.Application + Perspex.DesignerSupport en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -26,7 +26,7 @@ DEBUG;TRACE prompt 4 - bin\Debug\Perspex.Application.XML + bin\Debug\Perspex.DesignerSupport.xml CS1591 @@ -36,7 +36,7 @@ TRACE prompt 4 - bin\Release\Perspex.Application.XML + bin\Release\Perspex.DesignerSupport.xml CS1591 @@ -90,10 +90,8 @@ Properties\SharedAssemblyInfo.cs - - - - + + diff --git a/src/Perspex.Application/Properties/AssemblyInfo.cs b/src/Perspex.DesignerSupport/Properties/AssemblyInfo.cs similarity index 100% rename from src/Perspex.Application/Properties/AssemblyInfo.cs rename to src/Perspex.DesignerSupport/Properties/AssemblyInfo.cs diff --git a/src/Perspex.Application/app.config b/src/Perspex.DesignerSupport/app.config similarity index 100% rename from src/Perspex.Application/app.config rename to src/Perspex.DesignerSupport/app.config diff --git a/src/Perspex.Application/packages.config b/src/Perspex.DesignerSupport/packages.config similarity index 100% rename from src/Perspex.Application/packages.config rename to src/Perspex.DesignerSupport/packages.config diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj index 36cb4b0e0b..614b0210bb 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v5.0 + v6.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak index 614b0210bb..36cb4b0e0b 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v6.0 + v5.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj index 2160eb2592..2916c4059e 100644 --- a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj @@ -15,7 +15,7 @@ Resources\Resource.Designer.cs Off True - v5.0 + v6.0 true diff --git a/src/Skia/Perspex.Skia.iOS.TestApp/Perspex.Skia.iOS.TestApp.csproj b/src/Skia/Perspex.Skia.iOS.TestApp/Perspex.Skia.iOS.TestApp.csproj index 8b107002c3..950a0e729a 100644 --- a/src/Skia/Perspex.Skia.iOS.TestApp/Perspex.Skia.iOS.TestApp.csproj +++ b/src/Skia/Perspex.Skia.iOS.TestApp/Perspex.Skia.iOS.TestApp.csproj @@ -108,10 +108,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/Skia/Perspex.Skia.iOS/Perspex.Skia.iOS.csproj b/src/Skia/Perspex.Skia.iOS/Perspex.Skia.iOS.csproj index a583ceb5b2..ecacf50b8c 100644 --- a/src/Skia/Perspex.Skia.iOS/Perspex.Skia.iOS.csproj +++ b/src/Skia/Perspex.Skia.iOS/Perspex.Skia.iOS.csproj @@ -56,10 +56,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/Windows/Perspex.Win32/Perspex.Win32.csproj b/src/Windows/Perspex.Win32/Perspex.Win32.csproj index 0cd573d7b8..458e1de004 100644 --- a/src/Windows/Perspex.Win32/Perspex.Win32.csproj +++ b/src/Windows/Perspex.Win32/Perspex.Win32.csproj @@ -88,10 +88,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799A7BB5-3C2C-48B6-85A7-406A12C420DA} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/src/iOS/Perspex.iOS/Perspex.iOS.csproj b/src/iOS/Perspex.iOS/Perspex.iOS.csproj index 0d670ac5ed..b0ce948a3c 100644 --- a/src/iOS/Perspex.iOS/Perspex.iOS.csproj +++ b/src/iOS/Perspex.iOS/Perspex.iOS.csproj @@ -49,10 +49,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/src/iOS/Perspex.iOSTestApplication/Perspex.iOSTestApplication.csproj b/src/iOS/Perspex.iOSTestApplication/Perspex.iOSTestApplication.csproj index 42c0c2eccd..63a5fc4e96 100644 --- a/src/iOS/Perspex.iOSTestApplication/Perspex.iOSTestApplication.csproj +++ b/src/iOS/Perspex.iOSTestApplication/Perspex.iOSTestApplication.csproj @@ -139,10 +139,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/tests/Perspex.Benchmarks/Perspex.Benchmarks.csproj b/tests/Perspex.Benchmarks/Perspex.Benchmarks.csproj index 253a26cfa1..7460e34af4 100644 --- a/tests/Perspex.Benchmarks/Perspex.Benchmarks.csproj +++ b/tests/Perspex.Benchmarks/Perspex.Benchmarks.csproj @@ -78,10 +78,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj index 2888640b07..b8365478ee 100644 --- a/tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj +++ b/tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj @@ -152,10 +152,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj b/tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj index 49506cb582..d48634c6ed 100644 --- a/tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj +++ b/tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj @@ -105,10 +105,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/tests/Perspex.LeakTests/Perspex.LeakTests.csproj b/tests/Perspex.LeakTests/Perspex.LeakTests.csproj index 7330f47fbe..e28ec17f3c 100644 --- a/tests/Perspex.LeakTests/Perspex.LeakTests.csproj +++ b/tests/Perspex.LeakTests/Perspex.LeakTests.csproj @@ -111,10 +111,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/tests/Perspex.Markup.Xaml.UnitTests/Perspex.Markup.Xaml.UnitTests.csproj b/tests/Perspex.Markup.Xaml.UnitTests/Perspex.Markup.Xaml.UnitTests.csproj index f9b43771f1..0c8ee10821 100644 --- a/tests/Perspex.Markup.Xaml.UnitTests/Perspex.Markup.Xaml.UnitTests.csproj +++ b/tests/Perspex.Markup.Xaml.UnitTests/Perspex.Markup.Xaml.UnitTests.csproj @@ -126,10 +126,6 @@ {D211E587-D8BC-45B9-95A4-F297C8FA5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Perspex.Base diff --git a/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj index e4b44699d4..d358a6ccb5 100644 --- a/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj +++ b/tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj @@ -87,10 +87,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base diff --git a/tests/Perspex.UnitTests/Perspex.UnitTests.csproj b/tests/Perspex.UnitTests/Perspex.UnitTests.csproj index 675485d81b..352682051c 100644 --- a/tests/Perspex.UnitTests/Perspex.UnitTests.csproj +++ b/tests/Perspex.UnitTests/Perspex.UnitTests.csproj @@ -82,10 +82,6 @@ {d211e587-d8bc-45b9-95a4-f297c8fa5200} Perspex.Animation - - {799a7bb5-3c2c-48b6-85a7-406a12c420da} - Perspex.Application - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Perspex.Base From 364fe86e78e1ca5e092688076435f969dd5430f4 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 27 Mar 2016 21:36:03 +0200 Subject: [PATCH 2/2] Allow designer to work again. --- samples/BindingTest/BindingTest.csproj | 4 + samples/ControlCatalog/ControlCatalog.csproj | 4 + .../TestApplication/TestApplication.csproj | 4 + .../XamlTestApplication.csproj | 4 + .../XamlTestApplicationPcl.csproj | 4 + .../Properties/AssemblyInfo.cs | 1 + .../Perspex.Skia.Android.TestApp.csproj | 2 +- .../Perspex.Skia.Android.TestApp.csproj.bak | 2 +- .../Perspex.Skia.Android.csproj | 2 +- .../Perspex.Skia.Android.csproj.bak | 108 ++++++++++++++++++ 10 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index be9f7f6ef8..ed4900a402 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -120,6 +120,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 1dc0a1e7c3..0afab93b30 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -154,6 +154,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj index 11d9ad9939..d8159c2649 100644 --- a/samples/TestApplication/TestApplication.csproj +++ b/samples/TestApplication/TestApplication.csproj @@ -106,6 +106,10 @@ {D2221C82-4A25-4583-9B43-D791E3F6820C} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062AE20-5DCC-4442-9645-8195BDECE63E} Perspex.Diagnostics diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index e40b734d3c..be4aa1671a 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -103,6 +103,10 @@ {D2221C82-4A25-4583-9B43-D791E3F6820C} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062AE20-5DCC-4442-9645-8195BDECE63E} Perspex.Diagnostics diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj index 1e30c29730..6d15fea543 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj +++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj @@ -77,6 +77,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/src/Perspex.Controls/Properties/AssemblyInfo.cs b/src/Perspex.Controls/Properties/AssemblyInfo.cs index 5126ed362a..fa4f1c7d9a 100644 --- a/src/Perspex.Controls/Properties/AssemblyInfo.cs +++ b/src/Perspex.Controls/Properties/AssemblyInfo.cs @@ -9,6 +9,7 @@ using Perspex.Metadata; [assembly: InternalsVisibleTo("Perspex.Controls.UnitTests")] [assembly: InternalsVisibleTo("Perspex.DesignerSupport")] +[assembly: XmlnsDefinition("https://github.com/perspex", "Perspex")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls.Presenters")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls.Primitives")] diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj index 614b0210bb..36cb4b0e0b 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v6.0 + v5.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak index 36cb4b0e0b..614b0210bb 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v5.0 + v6.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj index 2916c4059e..2160eb2592 100644 --- a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj @@ -15,7 +15,7 @@ Resources\Resource.Designer.cs Off True - v6.0 + v5.0 true diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak new file mode 100644 index 0000000000..2916c4059e --- /dev/null +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak @@ -0,0 +1,108 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {BD43F7C0-396B-4AA1-BAD9-DFDE54D51298} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + Perspex.Skia.Android + Perspex.Skia.Android + 512 + Resources\Resource.Designer.cs + Off + True + v6.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + + + + + + + + + + + {d211e587-d8bc-45b9-95a4-f297c8fa5200} + Perspex.Animation + + + {b09b78d8-9b26-48b0-9149-d64a2f120f3f} + Perspex.Base + + + {d2221c82-4a25-4583-9b43-d791e3f6820c} + Perspex.Controls + + + {62024b2d-53eb-4638-b26b-85eeaa54866e} + Perspex.Input + + + {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} + Perspex.Interactivity + + + {42472427-4774-4c81-8aff-9f27b8e31721} + Perspex.Layout + + + {eb582467-6abb-43a1-b052-e981ba910e3a} + Perspex.SceneGraph + + + {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} + Perspex.Styling + + + + + + + + + + + native\armeabi-v7a\libperspesk.so + + + native\x86\libperspesk.so + + + + + + + \ No newline at end of file