diff --git a/Perspex.sln b/Perspex.sln index 1ddd288c70..5ad71b7946 100644 --- a/Perspex.sln +++ b/Perspex.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "src\Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}" EndProject @@ -130,9 +130,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Android", "src\Andr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.AndroidTestApplication", "src\Android\Perspex.AndroidTestApplication\Perspex.AndroidTestApplication.csproj", "{FF69B927-C545-49AE-8E16-3D14D621AA12}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.iOS", "src\iOS\Perspex.iOS\Perspex.iOS.csproj", "{4488AD85-1495-4809-9AA4-DDFE0A48527E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.iOSTestApplication", "src\iOS\Perspex.iOSTestApplication\Perspex.iOSTestApplication.csproj", "{8C923867-8A8F-4F6B-8B80-47D9E8436166}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.LeakTests", "tests\Perspex.LeakTests\Perspex.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{61BEC86C-F307-4295-B5B8-9428610D7D55}" +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 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 @@ -146,10 +157,12 @@ Global src\Shared\PlatformSupport\PlatformSupport.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*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\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 GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -1189,6 +1202,98 @@ Global {FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|Any CPU.Deploy.0 = Release|Any CPU {FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhone.ActiveCfg = Release|Any CPU {FF69B927-C545-49AE-8E16-3D14D621AA12}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|Any CPU.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhone.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhone.Build.0 = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|Any CPU.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhone.Build.0 = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {4488AD85-1495-4809-9AA4-DDFE0A48527E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.ActiveCfg = AppStore|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhone.Build.0 = AppStore|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|Any CPU.ActiveCfg = Debug|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.ActiveCfg = Debug|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhone.Build.0 = Debug|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|Any CPU.ActiveCfg = Release|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.ActiveCfg = Release|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhone.Build.0 = Release|iPhone + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {8C923867-8A8F-4F6B-8B80-47D9E8436166}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|Any CPU.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhone.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhone.Build.0 = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|Any CPU.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhone.Build.0 = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E1AA3DBF-9056-4530-9376-18119A7A3FFE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|Any CPU.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|iPhone.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|iPhone.Build.0 = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|Any CPU.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhone.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhone.Build.0 = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1229,5 +1334,9 @@ Global {78345174-5B52-4A14-B9FD-D5F2428137F0} = {9B9E3891-2366-4253-A952-D08BCEB71098} {7B92AF71-6287-4693-9DCB-BD5B6E927E23} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F} {FF69B927-C545-49AE-8E16-3D14D621AA12} = {7CF9789C-F1D3-4D0E-90E5-F1DF67A2753F} + {4488AD85-1495-4809-9AA4-DDFE0A48527E} = {0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1} + {8C923867-8A8F-4F6B-8B80-47D9E8436166} = {0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1} + {E1AA3DBF-9056-4530-9376-18119A7A3FFE} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B} + {61BEC86C-F307-4295-B5B8-9428610D7D55} = {9B9E3891-2366-4253-A952-D08BCEB71098} EndGlobalSection EndGlobal diff --git a/docs/build.md b/docs/build.md index 41d8f965f3..b3be7581c4 100644 --- a/docs/build.md +++ b/docs/build.md @@ -12,12 +12,14 @@ Perspex.Gtk project in Visual Studio. ### Clone the Perspex repository - git clone https://github.com/grokys/Perspex.git + git clone https://github.com/Perspex/Perspex.git We currently need to build our own private version of ReactiveUI as it doesn't work on mono. This is linked as a submodule in the git repository, so run: git submodule update --init + +The next step is to download the Skia native libraries. Run ```getnatives.ps1``` PowerShell script which can be found under the folder ```Perspex\src\Skia\```. ## Linux @@ -43,6 +45,8 @@ We currently need to build our own private version of ReactiveUI as it doesn't w is linked as a submodule in the git repository, so run: git submodule update --init + +The next step is to download the Skia native libraries. Run ```getnatives.sh``` script which can be found under the folder ```Perspex\src\Skia\```. ### Load the Project in MonoDevelop diff --git a/nuget/build-appveyor.ps1 b/nuget/build-appveyor.ps1 index ee38e950b7..cbe6980648 100644 --- a/nuget/build-appveyor.ps1 +++ b/nuget/build-appveyor.ps1 @@ -1,3 +1,4 @@ +$ErrorActionPreference = "Stop" $scriptpath = $MyInvocation.MyCommand.Path $dir = Split-Path $scriptpath Push-Location $dir @@ -9,6 +10,7 @@ sv version $env:APPVEYOR_BUILD_NUMBER sv version 9999.0.$version-nightly sv key $env:myget_key +. ".\include.ps1" .\build-version.ps1 $version sv reponame $env:APPVEYOR_REPO_NAME @@ -23,10 +25,10 @@ if ([string]::IsNullOrWhiteSpace($pullreq)) if($repobranch -eq "master") { echo "Repo branch matched" - nuget.exe push Perspex.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Desktop.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Skia.Desktop.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package - nuget.exe push Perspex.Android.$version.nupkg $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package + foreach($pkg in $Packages) + { + nuget.exe push "$($pkg).$($version).nupkg" $key -Source https://www.myget.org/F/perspex-nightly/api/v2/package + } } } diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index 65b673385e..59031527d5 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -1,9 +1,11 @@ $ErrorActionPreference = "Stop" -rm -Force -Recurse .\Perspex -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Desktop -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Skia.Desktop -ErrorAction SilentlyContinue -rm -Force -Recurse .\Perspex.Android -ErrorAction SilentlyContinue +. ".\include.ps1" + +foreach($pkg in $Packages) +{ + rm -Force -Recurse .\$pkg -ErrorAction SilentlyContinue +} rm -Force -Recurse *.nupkg -ErrorAction SilentlyContinue Copy-Item template Perspex -Recurse @@ -14,11 +16,13 @@ sv skia_root "Perspex.Skia.Desktop" sv skia_lib "Perspex.Skia.Desktop\lib\net45" sv skia_native "Perspex.Skia.Desktop\build\net45\native" sv android "Perspex.Android\lib\MonoAndroid10" +sv ios "Perspex.iOS\lib\Xamarin.iOS10" mkdir $lib -ErrorAction SilentlyContinue mkdir $build -ErrorAction SilentlyContinue mkdir $skia_lib mkdir $android +mkdir $ios Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll $lib @@ -65,17 +69,20 @@ Copy-Item ..\src\Skia\Perspex.Skia.Desktop\bin\Release\Perspex.Skia.Desktop.dll Copy-Item ..\src\Android\Perspex.Android\bin\Release\Perspex.Android.dll $android Copy-Item ..\src\Skia\Perspex.Skia.Android\bin\Release\Perspex.Skia.Android.dll $android -(gc Perspex\Perspex.nuspec).replace('#VERSION#', $args[0]) | sc Perspex\Perspex.nuspec -(gc Perspex\Perspex.Desktop.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Desktop\Perspex.Desktop.nuspec -(gc Perspex\Perspex.Skia.Desktop.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Skia.Desktop\Perspex.Skia.Desktop.nuspec -(gc Perspex\Perspex.Android.nuspec).replace('#VERSION#', $args[0]) | sc Perspex.Android\Perspex.Android.nuspec +Copy-Item ..\src\iOS\Perspex.iOS\bin\iPhone\Release\Perspex.iOS.dll $ios +Copy-Item ..\src\Skia\Perspex.Skia.iOS\bin\iPhone\Release\Perspex.Skia.iOS.dll $ios + +foreach($pkg in $Packages) +{ + (gc Perspex\$pkg.nuspec).replace('#VERSION#', $args[0]) | sc $pkg\$pkg.nuspec +} -nuget.exe pack Perspex\Perspex.nuspec -nuget.exe pack Perspex.Desktop\Perspex.Desktop.nuspec -nuget.exe pack Perspex.Skia.Desktop\Perspex.Skia.Desktop.nuspec -nuget.exe pack Perspex.Android\Perspex.Android.nuspec +foreach($pkg in $Packages) +{ + nuget.exe pack $pkg\$pkg.nuspec +} -rm -Force -Recurse .\Perspex -rm -Force -Recurse .\Perspex.Desktop -rm -Force -Recurse .\Perspex.Skia.Desktop -rm -Force -Recurse .\Perspex.Android +foreach($pkg in $Packages) +{ + rm -Force -Recurse .\$pkg +} \ No newline at end of file diff --git a/nuget/build.ps1 b/nuget/build.ps1 index a26fe74706..2663012664 100644 --- a/nuget/build.ps1 +++ b/nuget/build.ps1 @@ -1 +1 @@ -.\build-version.ps1 0.1.1-alpha2 \ No newline at end of file +.\build-version.ps1 0.2.0-alpha3 \ No newline at end of file diff --git a/nuget/include.ps1 b/nuget/include.ps1 new file mode 100644 index 0000000000..f1e6f5d523 --- /dev/null +++ b/nuget/include.ps1 @@ -0,0 +1 @@ +$Packages = @("Perspex", "Perspex.Desktop", "Perspex.Skia.Desktop", "Perspex.Android", "Perspex.iOS") \ No newline at end of file diff --git a/nuget/template/Perspex.Desktop.nuspec b/nuget/template/Perspex.Desktop.nuspec index 2c78dc9c8c..192afe828d 100644 --- a/nuget/template/Perspex.Desktop.nuspec +++ b/nuget/template/Perspex.Desktop.nuspec @@ -21,9 +21,9 @@ - - - + + + diff --git a/nuget/template/Perspex.iOS.nuspec b/nuget/template/Perspex.iOS.nuspec new file mode 100644 index 0000000000..568ee2bae1 --- /dev/null +++ b/nuget/template/Perspex.iOS.nuspec @@ -0,0 +1,27 @@ + + + + Perspex.iOS + #VERSION# + Perspex Team + stevenk + http://opensource.org/licenses/MIT + https://github.com/Perspex/Perspex/ + false + The Perspex UI framework + + Copyright 2015 + Perspex + + + + + + + + + + + + + \ No newline at end of file diff --git a/readme.md b/readme.md index 4f15933968..6eec66c9ae 100644 --- a/readme.md +++ b/readme.md @@ -1,14 +1,20 @@ # Perspex -[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/grokys/Perspex?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Perspex/Perspex?utm_campaign=pr-badge&utm_content=badge&utm_medium=badge&utm_source=badge) [![Build status](https://ci.appveyor.com/api/projects/status/hubk3k0w9idyibfg/branch/master?svg=true)](https://ci.appveyor.com/project/Perspex/Perspex/branch/master) -A multi-platform .NET UI framework. +A multi-platform .NET UI framework. It can run on Windows, Linux, Mac OS X, iOS and Android. ![](docs/screen.png) +Desktop platforms: + ![](docs/perspex-video.png) +Mobile platforms: + +![](https://i.ytimg.com/vi/NJ9-hnmUbBM/hqdefault.jpg) + ## NuGet Perspex is delivered as a NuGet package. @@ -39,7 +45,7 @@ framework. As mentioned above, Perspex is still in alpha and as such there's not much documentation yet. You can take a look at the [getting started page](docs/gettingstarted.md) for an overview of how to get started but probably the best thing to do for now is to already know a little bit -about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/grokys/Perspex). +about WPF/Silverlight/UWP/XAML and ask questions in our [Gitter room](https://gitter.im/Perspex/Perspex). There's also a high-level [architecture document](docs/architecture.md) that is currently a little bit out of date, and I've also started writing blog posts on Perspex at http://grokys.github.io/. diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 62914fdc13..0ba9e86d67 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -79,6 +79,10 @@ MainWindow.paml + + TestUserControl.paml + + @@ -89,6 +93,7 @@ MSBuild:Compile + diff --git a/samples/BindingTest/MainWindow.paml b/samples/BindingTest/MainWindow.paml index 903d1f1050..c782786e42 100644 --- a/samples/BindingTest/MainWindow.paml +++ b/samples/BindingTest/MainWindow.paml @@ -1,5 +1,6 @@  + xmlns:vm="clr-namespace:BindingTest.ViewModels;assembly=BindingTest" + xmlns:local="clr-namespace:BindingTest;assembly=BindingTest"> @@ -55,5 +56,10 @@ + + + \ No newline at end of file diff --git a/samples/BindingTest/TestUserControl.paml b/samples/BindingTest/TestUserControl.paml new file mode 100644 index 0000000000..2c5609f8c9 --- /dev/null +++ b/samples/BindingTest/TestUserControl.paml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/samples/BindingTest/TestUserControl.paml.cs b/samples/BindingTest/TestUserControl.paml.cs new file mode 100644 index 0000000000..1cf4342f19 --- /dev/null +++ b/samples/BindingTest/TestUserControl.paml.cs @@ -0,0 +1,18 @@ +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace BindingTest +{ + public class TestUserControl : UserControl + { + public TestUserControl() + { + this.InitializeComponent(); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + } +} diff --git a/samples/BindingTest/ViewModels/MainWindowViewModel.cs b/samples/BindingTest/ViewModels/MainWindowViewModel.cs index 057666d5c4..650f69bc36 100644 --- a/samples/BindingTest/ViewModels/MainWindowViewModel.cs +++ b/samples/BindingTest/ViewModels/MainWindowViewModel.cs @@ -32,6 +32,7 @@ namespace BindingTest.ViewModels public ObservableCollection Items { get; } public ObservableCollection SelectedItems { get; } public ReactiveCommand ShuffleItems { get; } + public TestUserControlViewModel UserControl { get; } = new TestUserControlViewModel(); public string BooleanString { diff --git a/samples/BindingTest/ViewModels/TestUserControlViewModel.cs b/samples/BindingTest/ViewModels/TestUserControlViewModel.cs new file mode 100644 index 0000000000..9e5879e1c1 --- /dev/null +++ b/samples/BindingTest/ViewModels/TestUserControlViewModel.cs @@ -0,0 +1,9 @@ +using ReactiveUI; + +namespace BindingTest.ViewModels +{ + public class TestUserControlViewModel : ReactiveObject + { + public string Content { get; } = "User Control Content"; + } +} diff --git a/samples/ControlCatalog/App.config b/samples/ControlCatalog/App.config new file mode 100644 index 0000000000..2e292d1c8a --- /dev/null +++ b/samples/ControlCatalog/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/App.paml b/samples/ControlCatalog/App.paml new file mode 100644 index 0000000000..b09160d0a8 --- /dev/null +++ b/samples/ControlCatalog/App.paml @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/App.paml.cs b/samples/ControlCatalog/App.paml.cs new file mode 100644 index 0000000000..b1aa671215 --- /dev/null +++ b/samples/ControlCatalog/App.paml.cs @@ -0,0 +1,55 @@ +using System; +using System.Linq; +using Perspex; +using Perspex.Controls; +using Perspex.Diagnostics; +using Perspex.Markup.Xaml; +using Perspex.Themes.Default; + +namespace ControlCatalog +{ + class App : Application + { + public App() + { + RegisterServices(); + InitializeSubsystems(GetPlatformId()); + Styles = new DefaultTheme(); + InitializeComponent(); + } + + public static void AttachDevTools(Window window) + { +#if DEBUG + DevTools.Attach(window); +#endif + } + + static void Main(string[] args) + { + var app = new App(); + var window = new MainWindow(); + window.Show(); + app.Run(window); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + + private int GetPlatformId() + { + var args = Environment.GetCommandLineArgs(); + + if (args.Contains("--gtk")) + { + return (int)PlatformID.Unix; + } + else + { + return (int)Environment.OSVersion.Platform; + } + } + } +} diff --git a/samples/ControlCatalog/Assets/delicate-arch-896885_640.jpg b/samples/ControlCatalog/Assets/delicate-arch-896885_640.jpg new file mode 100644 index 0000000000..90894abe97 Binary files /dev/null and b/samples/ControlCatalog/Assets/delicate-arch-896885_640.jpg differ diff --git a/samples/ControlCatalog/Assets/hirsch-899118_640.jpg b/samples/ControlCatalog/Assets/hirsch-899118_640.jpg new file mode 100644 index 0000000000..af0eff6b47 Binary files /dev/null and b/samples/ControlCatalog/Assets/hirsch-899118_640.jpg differ diff --git a/samples/ControlCatalog/Assets/maple-leaf-888807_640.jpg b/samples/ControlCatalog/Assets/maple-leaf-888807_640.jpg new file mode 100644 index 0000000000..72bf0a61ae Binary files /dev/null and b/samples/ControlCatalog/Assets/maple-leaf-888807_640.jpg differ diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj new file mode 100644 index 0000000000..1a26286147 --- /dev/null +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -0,0 +1,190 @@ + + + + + Debug + AnyCPU + {61BEC86C-F307-4295-B5B8-9428610D7D55} + WinExe + Properties + ControlCatalog + ControlCatalog + v4.6 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + App.paml + + + MainWindow.paml + + + BorderPage.paml + + + CarouselPage.paml + + + CanvasPage.paml + + + ButtonPage.paml + + + DropDownPage.paml + + + + + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + + + + {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 + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/MainWindow.paml b/samples/ControlCatalog/MainWindow.paml new file mode 100644 index 0000000000..c692b34fc6 --- /dev/null +++ b/samples/ControlCatalog/MainWindow.paml @@ -0,0 +1,14 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/MainWindow.paml.cs b/samples/ControlCatalog/MainWindow.paml.cs new file mode 100644 index 0000000000..5a5b7d4303 --- /dev/null +++ b/samples/ControlCatalog/MainWindow.paml.cs @@ -0,0 +1,19 @@ +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace ControlCatalog +{ + public class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + App.AttachDevTools(this); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + } +} diff --git a/samples/ControlCatalog/Pages/BorderPage.paml b/samples/ControlCatalog/Pages/BorderPage.paml new file mode 100644 index 0000000000..5ce9eb80f1 --- /dev/null +++ b/samples/ControlCatalog/Pages/BorderPage.paml @@ -0,0 +1,29 @@ + + + Border + A control which decorates a child with a border and background + + + + Border + + + Border and Background + + + Rounded Corners + + + Rounded Corners + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/BorderPage.paml.cs b/samples/ControlCatalog/Pages/BorderPage.paml.cs new file mode 100644 index 0000000000..9cc6629599 --- /dev/null +++ b/samples/ControlCatalog/Pages/BorderPage.paml.cs @@ -0,0 +1,18 @@ +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace ControlCatalog.Pages +{ + public class BorderPage : UserControl + { + public BorderPage() + { + this.InitializeComponent(); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + } +} diff --git a/samples/ControlCatalog/Pages/ButtonPage.paml b/samples/ControlCatalog/Pages/ButtonPage.paml new file mode 100644 index 0000000000..a5f99634aa --- /dev/null +++ b/samples/ControlCatalog/Pages/ButtonPage.paml @@ -0,0 +1,26 @@ + + + Button + A button control + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/ButtonPage.paml.cs b/samples/ControlCatalog/Pages/ButtonPage.paml.cs new file mode 100644 index 0000000000..a0c424570b --- /dev/null +++ b/samples/ControlCatalog/Pages/ButtonPage.paml.cs @@ -0,0 +1,18 @@ +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace ControlCatalog.Pages +{ + public class ButtonPage : UserControl + { + public ButtonPage() + { + this.InitializeComponent(); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + } +} diff --git a/samples/ControlCatalog/Pages/CanvasPage.paml b/samples/ControlCatalog/Pages/CanvasPage.paml new file mode 100644 index 0000000000..4a3f682d17 --- /dev/null +++ b/samples/ControlCatalog/Pages/CanvasPage.paml @@ -0,0 +1,13 @@ + + + Canvas + A panel which lays out its children by explicit coordinates + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/CanvasPage.paml.cs b/samples/ControlCatalog/Pages/CanvasPage.paml.cs new file mode 100644 index 0000000000..4264b11071 --- /dev/null +++ b/samples/ControlCatalog/Pages/CanvasPage.paml.cs @@ -0,0 +1,18 @@ +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace ControlCatalog.Pages +{ + public class CanvasPage : UserControl + { + public CanvasPage() + { + this.InitializeComponent(); + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + } + } +} diff --git a/samples/ControlCatalog/Pages/CarouselPage.paml b/samples/ControlCatalog/Pages/CarouselPage.paml new file mode 100644 index 0000000000..0b2b42073c --- /dev/null +++ b/samples/ControlCatalog/Pages/CarouselPage.paml @@ -0,0 +1,33 @@ + + + Carousel + An items control that displays its items as pages that fill the control. + + + + + + + + + + + + + + + + Transition + + None + Slide + Crossfade + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/CarouselPage.paml.cs b/samples/ControlCatalog/Pages/CarouselPage.paml.cs new file mode 100644 index 0000000000..1a4c8d9fcc --- /dev/null +++ b/samples/ControlCatalog/Pages/CarouselPage.paml.cs @@ -0,0 +1,48 @@ +using System; +using Perspex.Animation; +using Perspex.Controls; +using Perspex.Markup.Xaml; + +namespace ControlCatalog.Pages +{ + public class CarouselPage : UserControl + { + private Carousel _carousel; + private Button _left; + private Button _right; + private DropDown _transition; + + public CarouselPage() + { + this.InitializeComponent(); + _left.Click += (s, e) => _carousel.Previous(); + _right.Click += (s, e) => _carousel.Next(); + //_transition.SelectionChanged += TransitionChanged; + } + + private void InitializeComponent() + { + PerspexXamlLoader.Load(this); + _carousel = this.FindControl("carousel"); + _left = this.FindControl