Merge branch 'master' of https://github.com/Perspex/Perspex

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
+        }
     }
 }
 

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
+}

nuget/include.ps1

@@ -0,0 +1 @@
+$Packages = @("Perspex", "Perspex.Desktop",  "Perspex.Skia.Desktop", "Perspex.Android", "Perspex.iOS")

nuget/template/Perspex.iOS.nuspec

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Perspex.iOS</id>
+    <version>#VERSION#</version>
+    <authors>Perspex Team</authors>
+    <owners>stevenk</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>https://github.com/Perspex/Perspex/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>The Perspex UI framework</description>
+    <releaseNotes></releaseNotes>
+    <copyright>Copyright 2015</copyright>
+    <tags>Perspex</tags>
+    <dependencies>
+      <dependency id="Serilog" version="1.5.9" />
+      <dependency id="Splat" version="1.6.2" />
+      <dependency id="Sprache" version="2.0.0.47" />
+      <dependency id="Rx-Core" version="2.2.5" />
+      <dependency id="Rx-Interfaces" version="2.2.5" />
+      <dependency id="Rx-Linq" version="2.2.5" />
+      <dependency id="Rx-Main" version="2.2.5" />
+      <dependency id="Rx-PlatformServices" version="2.2.5" />
+	  <dependency id="Perspex" version="#VERSION#" />
+    </dependencies>
+  </metadata>
+</package>

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;
 		}
 	}
 }