From a697349fe0903c23cff4acc0bdf5b42d17fbeae9 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 25 Nov 2015 04:54:25 +0300 Subject: [PATCH 1/3] GTK's RadialGradientBrushImpl doesn't crash anymore but doesn't seem to work properly --- src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs b/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs index a345f1869d..2d54882324 100644 --- a/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs +++ b/src/Gtk/Perspex.Cairo/Media/RadialGradientBrushImpl.cs @@ -15,10 +15,10 @@ namespace Perspex.Cairo foreach (var stop in brush.GradientStops) { - ((LinearGradient)this.PlatformBrush).AddColorStop(stop.Offset, stop.Color.ToCairo()); + ((RadialGradient)this.PlatformBrush).AddColorStop(stop.Offset, stop.Color.ToCairo()); } - ((LinearGradient)this.PlatformBrush).Extend = Extend.Pad; + ((RadialGradient)this.PlatformBrush).Extend = Extend.Pad; } } } From de8b407be9daac93c5482318b65536d900386bdb Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 26 Nov 2015 02:22:41 +0300 Subject: [PATCH 2/3] Packaging scripts refactoring --- nuget/build-appveyor.ps1 | 9 +++++---- nuget/build-version.ps1 | 35 +++++++++++++++++++---------------- nuget/include.ps1 | 1 + 3 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 nuget/include.ps1 diff --git a/nuget/build-appveyor.ps1 b/nuget/build-appveyor.ps1 index ee38e950b7..fafafdc2bd 100644 --- a/nuget/build-appveyor.ps1 +++ b/nuget/build-appveyor.ps1 @@ -9,6 +9,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 +24,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..49bf6c6947 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 @@ -65,17 +67,18 @@ 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 -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) +{ + (gc Perspex\$pkg.nuspec).replace('#VERSION#', $args[0]) | sc $pkg\$pkg.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/include.ps1 b/nuget/include.ps1 new file mode 100644 index 0000000000..1898105862 --- /dev/null +++ b/nuget/include.ps1 @@ -0,0 +1 @@ +$Packages = @("Perspex", "Perspex.Desktop", "Perspex.Skia.Desktop", "Perspex.Android") \ No newline at end of file From 043e1d5eaf0648d04f69348ea931c83d3d6ceebc Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 26 Nov 2015 02:49:21 +0300 Subject: [PATCH 3/3] Added nuget package for iOS --- nuget/build-version.ps1 | 4 ++++ nuget/include.ps1 | 2 +- nuget/template/Perspex.iOS.nuspec | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 nuget/template/Perspex.iOS.nuspec diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index 49bf6c6947..59031527d5 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -16,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 @@ -67,6 +69,8 @@ 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 +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) { diff --git a/nuget/include.ps1 b/nuget/include.ps1 index 1898105862..f1e6f5d523 100644 --- a/nuget/include.ps1 +++ b/nuget/include.ps1 @@ -1 +1 @@ -$Packages = @("Perspex", "Perspex.Desktop", "Perspex.Skia.Desktop", "Perspex.Android") \ No newline at end of file +$Packages = @("Perspex", "Perspex.Desktop", "Perspex.Skia.Desktop", "Perspex.Android", "Perspex.iOS") \ No newline at end of file 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