From a7b6cc2d58446c2add8c42922e1e7ec152bd8943 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 12 Sep 2016 22:46:49 +0200
Subject: [PATCH] Upped the NuGet version to v1.54.1  - added the UWP basic
 sample  - tweaked the ignore and build script

---
 .gitignore                                    |  2 +
 .../Properties/SkiaSharpAssemblyInfo.cs       |  6 +-
 build.cake                                    |  6 ++
 nuget/SkiaSharp.Mac.nuspec                    |  2 +-
 nuget/SkiaSharp.Views.Mac.nuspec              |  4 +-
 nuget/SkiaSharp.Views.Windows.nuspec          |  4 +-
 nuget/SkiaSharp.Views.nuspec                  |  4 +-
 nuget/SkiaSharp.Windows.nuspec                |  2 +-
 nuget/SkiaSharp.nuspec                        |  2 +-
 .../BasicSkiaSharp.csproj                     |  2 +-
 .../BasicSkiaSharp-Android/packages.config    |  2 +-
 .../BasicSkiaSharp.csproj                     |  8 +-
 .../BasicSkiaSharp-Desktop/packages.config    |  2 +-
 .../BasicSkiaSharp-Mac/BasicSkiaSharp.csproj  |  4 +-
 .../BasicSkiaSharp-Mac/packages.config        |  2 +-
 .../BasicSkiaSharp.nuget.targets              |  9 +++
 .../BasicSkiaSharp-UWP/BasicSkiaSharp.sln     | 46 ++++++++---
 .../BasicSkiaSharp-UWP/MainPage.xaml          |  9 ++-
 .../BasicSkiaSharp-UWP/MainPage.xaml.cs       | 78 +++++++++++++------
 .../BasicSkiaSharp-UWP/project.json           |  3 +-
 .../BasicSkiaSharp-WPF/BasicSkiaSharp.csproj  |  8 +-
 .../BasicSkiaSharp-WPF/packages.config        |  2 +-
 .../BasicSkiaSharp-iOS/BasicSkiaSharp.csproj  |  2 +-
 .../BasicSkiaSharp-iOS/packages.config        |  2 +-
 .../BasicSkiaSharp/BasicSkiaSharp.csproj      |  2 +-
 .../BasicSkiaSharp/packages.config            |  2 +-
 .../Droid/Properties/AndroidManifest.xml      |  2 +-
 .../Droid/Skia.Forms.Demo.Droid.csproj        |  2 +-
 samples/Skia.Forms.Demo/Droid/packages.config |  2 +-
 .../Skia.Forms.Demo/Skia.Forms.Demo.csproj    |  2 +-
 .../UWP/Skia.Forms.Demo.UWP.nuget.targets     |  2 +-
 samples/Skia.Forms.Demo/UWP/project.json      |  2 +-
 samples/Skia.Forms.Demo/iOS/Info.plist        |  4 +-
 .../iOS/Skia.Forms.Demo.iOS.csproj            |  2 +-
 samples/Skia.Forms.Demo/iOS/packages.config   |  2 +-
 samples/Skia.Forms.Demo/packages.config       |  2 +-
 samples/Skia.OSX.Demo/Info.plist              |  4 +-
 samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj    |  4 +-
 samples/Skia.OSX.Demo/packages.config         |  2 +-
 samples/Skia.OSX.GLDemo/Info.plist            |  4 +-
 .../Skia.OSX.GLDemo/Skia.OSX.GLDemo.csproj    |  4 +-
 samples/Skia.OSX.GLDemo/packages.config       |  2 +-
 samples/Skia.UWP.Demo/Package.appxmanifest    |  2 +-
 .../Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets |  2 +-
 samples/Skia.UWP.Demo/project.json            |  2 +-
 samples/Skia.WPF.Demo/Skia.WPF.Demo.csproj    |  6 +-
 samples/Skia.WPF.Demo/packages.config         |  2 +-
 .../Skia.WindowsDesktop.Demo.csproj           |  6 +-
 .../Skia.WindowsDesktop.Demo/packages.config  |  2 +-
 .../Skia.WindowsDesktop.GLDemo.csproj         |  6 +-
 .../packages.config                           |  2 +-
 samples/Skia.tvOS.Demo/Info.plist             |  4 +-
 samples/Skia.tvOS.Demo/Skia.tvOS.Demo.csproj  |  2 +-
 samples/Skia.tvOS.Demo/packages.config        |  2 +-
 .../Properties/AssemblyInfo.cs                | 27 -------
 .../SkiaSharp.Views.Android.csproj            |  8 +-
 views/SkiaSharp.Views.Android/packages.config |  2 +-
 .../Properties/AssemblyInfo.cs                | 27 -------
 .../SkiaSharp.Views.Desktop.csproj            | 12 +--
 views/SkiaSharp.Views.Desktop/packages.config |  2 +-
 .../Properties/AssemblyInfo.cs                | 27 -------
 .../SkiaSharp.Views.Mac.csproj                | 16 ++--
 views/SkiaSharp.Views.Mac/packages.config     |  2 +-
 .../Properties/AssemblyInfo.cs                | 27 -------
 .../SkiaSharp.Views.UWP.csproj                |  4 +-
 .../SkiaSharp.Views.UWP.nuget.targets         |  2 +-
 views/SkiaSharp.Views.UWP/project.json        |  2 +-
 .../SkiaSharp.Views.iOS.csproj                | 13 ++--
 views/SkiaSharp.Views.iOS/packages.config     |  2 +-
 .../Properties/AssemblyInfo.cs                | 27 -------
 .../SkiaSharp.Views.tvOS.csproj               | 10 ++-
 views/SkiaSharp.Views.tvOS/packages.config    |  2 +-
 .../Properties/SkiaSharpViewsAssemblyInfo.cs} | 10 +--
 73 files changed, 235 insertions(+), 282 deletions(-)
 create mode 100644 samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.nuget.targets
 delete mode 100644 views/SkiaSharp.Views.Android/Properties/AssemblyInfo.cs
 delete mode 100644 views/SkiaSharp.Views.Desktop/Properties/AssemblyInfo.cs
 delete mode 100644 views/SkiaSharp.Views.Mac/Properties/AssemblyInfo.cs
 delete mode 100644 views/SkiaSharp.Views.UWP/Properties/AssemblyInfo.cs
 delete mode 100644 views/SkiaSharp.Views.tvOS/Properties/AssemblyInfo.cs
 rename views/{SkiaSharp.Views.iOS/Properties/AssemblyInfo.cs => SkiaSharp.Views/Properties/SkiaSharpViewsAssemblyInfo.cs} (77%)

diff --git a/.gitignore b/.gitignore
index f5f3065af..2e1b8d760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ binding/SkiaSharp.Portable/SkiaPortable.cs
 docs/SkiaSharp.tree
 docs/SkiaSharp.zip
 *.VC.db
+# the ANGLE externals folder
+angle/
 
 # User-specific files
 *.suo
diff --git a/binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs b/binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs
index 3c5c98c72..dd213326f 100644
--- a/binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs
+++ b/binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs
@@ -16,9 +16,9 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
+[assembly: AssemblyVersion ("1.54.1.0")]
+[assembly: AssemblyFileVersion ("1.54.1.0")]
+[assembly: AssemblyInformationalVersion ("1.54.1.0-{GIT_SHA}")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
diff --git a/build.cake b/build.cake
index 254e99894..201c73f8c 100644
--- a/build.cake
+++ b/build.cake
@@ -1148,6 +1148,8 @@ Task ("Everything")
     .IsDependentOn ("libs")
     .IsDependentOn ("docs")
     .IsDependentOn ("nuget")
+    .IsDependentOn ("views")
+    .IsDependentOn ("views-nuget")
     .IsDependentOn ("component")
     .IsDependentOn ("tests")
     .IsDependentOn ("samples");
@@ -1161,6 +1163,8 @@ Task ("CI")
     .IsDependentOn ("libs")
     .IsDependentOn ("docs")
     .IsDependentOn ("nuget")
+    .IsDependentOn ("views")
+    .IsDependentOn ("views-nuget")
     .IsDependentOn ("component")
     .IsDependentOn ("tests")
     .IsDependentOn ("samples");
@@ -1170,6 +1174,8 @@ Task ("Windows-CI")
     .IsDependentOn ("libs")
     .IsDependentOn ("docs")
     .IsDependentOn ("nuget")
+    .IsDependentOn ("views")
+    .IsDependentOn ("views-nuget")
     .IsDependentOn ("component")
     .IsDependentOn ("tests")
     .IsDependentOn ("samples");
diff --git a/nuget/SkiaSharp.Mac.nuspec b/nuget/SkiaSharp.Mac.nuspec
index 3441dba2e..51b4bc18f 100644
--- a/nuget/SkiaSharp.Mac.nuspec
+++ b/nuget/SkiaSharp.Mac.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp</id>
     <title>SkiaSharp (for OSX)</title>
-    <version>1.54.0</version>
+    <version>1.54.1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/nuget/SkiaSharp.Views.Mac.nuspec b/nuget/SkiaSharp.Views.Mac.nuspec
index ff7bd629a..71b244c62 100644
--- a/nuget/SkiaSharp.Views.Mac.nuspec
+++ b/nuget/SkiaSharp.Views.Mac.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp.Views</id>
     <title>SkiaSharp Views &amp; Layers (for macOS)</title>
-    <version>1.54.0</version>
+    <version>1.54.1-beta1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -13,7 +13,7 @@
     <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
     <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
     <dependencies>
-      <dependency id="SkiaSharp" version="1.54.0" />
+      <dependency id="SkiaSharp" version="1.54.1" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/SkiaSharp.Views.Windows.nuspec b/nuget/SkiaSharp.Views.Windows.nuspec
index d3f77dc67..766606a7e 100644
--- a/nuget/SkiaSharp.Views.Windows.nuspec
+++ b/nuget/SkiaSharp.Views.Windows.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp.Views</id>
     <title>SkiaSharp Views &amp; Layers (for Windows)</title>
-    <version>1.54.0</version>
+    <version>1.54.1-beta1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -13,7 +13,7 @@
     <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
     <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
     <dependencies>
-      <dependency id="SkiaSharp" version="1.54.0" />
+      <dependency id="SkiaSharp" version="1.54.1" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec
index e79d490c7..d9b0aabdc 100644
--- a/nuget/SkiaSharp.Views.nuspec
+++ b/nuget/SkiaSharp.Views.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp.Views</id>
     <title>SkiaSharp Views &amp; Layers (for macOS)</title>
-    <version>1.54.0</version>
+    <version>1.54.1-beta1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -13,7 +13,7 @@
     <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
     <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
     <dependencies>
-      <dependency id="SkiaSharp" version="1.54.0" />
+      <dependency id="SkiaSharp" version="1.54.1" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/SkiaSharp.Windows.nuspec b/nuget/SkiaSharp.Windows.nuspec
index 404842330..f310af6fd 100644
--- a/nuget/SkiaSharp.Windows.nuspec
+++ b/nuget/SkiaSharp.Windows.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp</id>
     <title>SkiaSharp (for Windows)</title>
-    <version>1.54.0</version>
+    <version>1.54.1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
index 4ded57f4c..48993707d 100644
--- a/nuget/SkiaSharp.nuspec
+++ b/nuget/SkiaSharp.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp</id>
     <title>SkiaSharp</title>
-    <version>1.54.0</version>
+    <version>1.54.1</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/samples/BasicSamples/BasicSkiaSharp-Android/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-Android/BasicSkiaSharp.csproj
index 23a15af77..13128f9e5 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Android/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-Android/BasicSkiaSharp.csproj
@@ -50,7 +50,7 @@
       <HintPath>packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
     </Reference>
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\MonoAndroid\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/BasicSamples/BasicSkiaSharp-Android/packages.config b/samples/BasicSamples/BasicSkiaSharp-Android/packages.config
index edde24b7e..dc9de5bc0 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Android/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-Android/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="monoandroid60" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="monoandroid60" />
 </packages>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-Desktop/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-Desktop/BasicSkiaSharp.csproj
index c0efb02d3..0c50f9e38 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Desktop/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-Desktop/BasicSkiaSharp.csproj
@@ -85,8 +85,8 @@
       <HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -145,12 +145,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/BasicSamples/BasicSkiaSharp-Desktop/packages.config b/samples/BasicSamples/BasicSkiaSharp-Desktop/packages.config
index d7d424f11..80f70e243 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Desktop/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-Desktop/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
   <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-Mac/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-Mac/BasicSkiaSharp.csproj
index e4d30eb41..ae90bf5f9 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Mac/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-Mac/BasicSkiaSharp.csproj
@@ -51,7 +51,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\XamarinMac\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -95,5 +95,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-Mac/packages.config b/samples/BasicSamples/BasicSkiaSharp-Mac/packages.config
index 4b14c3cc1..174f3eeb0 100644
--- a/samples/BasicSamples/BasicSkiaSharp-Mac/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-Mac/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinmac20" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinmac20" />
 </packages>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.nuget.targets b/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.nuget.targets
new file mode 100644
index 000000000..2c2206cfe
--- /dev/null
+++ b/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.nuget.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
+    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+  </PropertyGroup>
+  <ImportGroup>
+    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.sln b/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.sln
index deeab997d..0fae3e71b 100644
--- a/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.sln
+++ b/samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.sln
@@ -7,7 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicSkiaSharp", "BasicSkia
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.UWP", "..\..\..\views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Windows", "..\..\..\views\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.shproj", "{5A67972C-1C04-4913-9950-06A03BFE9533}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkiaSharp.Views.UWP.Interop", "..\..\..\views\SkiaSharp.Views.UWP.Interop\SkiaSharp.Views.UWP.Interop.vcxproj", "{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\..\..\views\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems*{5a67972c-1c04-4913-9950-06a03bfe9533}*SharedItemsImports = 13
+		..\..\..\views\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems*{8bb20362-91a2-4206-944d-634070eac6f3}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
@@ -41,20 +49,34 @@ Global
 		{93EC6366-6C93-42AF-B12B-3A68EA5EBCEA}.Release|x86.Deploy.0 = Release|x86
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.ActiveCfg = Debug|ARM
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.Build.0 = Debug|ARM
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.ActiveCfg = Debug|x64
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.Build.0 = Debug|x64
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.ActiveCfg = Debug|x86
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.Build.0 = Debug|x86
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|x86.Build.0 = Debug|Any CPU
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.ActiveCfg = Release|ARM
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.Build.0 = Release|ARM
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.ActiveCfg = Release|x64
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.Build.0 = Release|x64
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.ActiveCfg = Release|x86
-		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.Build.0 = Release|x86
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM.Build.0 = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.Build.0 = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.Build.0 = Release|Any CPU
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|ARM.Build.0 = Debug|ARM
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x64.ActiveCfg = Debug|x64
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x64.Build.0 = Debug|x64
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x86.ActiveCfg = Debug|Win32
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x86.Build.0 = Debug|Win32
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|ARM.ActiveCfg = Release|ARM
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|ARM.Build.0 = Release|ARM
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x64.ActiveCfg = Release|x64
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x64.Build.0 = Release|x64
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x86.ActiveCfg = Release|Win32
+		{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml b/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml
index d42678b1a..8e3c385d6 100644
--- a/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml
+++ b/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml
@@ -7,7 +7,12 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <TextBlock Text="Hardware" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="30" FontWeight="Bold" />
+        <local:SKSwapChainPanel x:Name="swapChainPanel" Margin="6" Grid.Row="1" PaintSurface="swapChainPanel_PaintSurface" />
     </Grid>
 </Page>
diff --git a/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml.cs b/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml.cs
index dddad3c02..eba09d6d5 100644
--- a/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml.cs
+++ b/samples/BasicSamples/BasicSkiaSharp-UWP/MainPage.xaml.cs
@@ -1,30 +1,58 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
+using SkiaSharp;
+using SkiaSharp.Views;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
 
 namespace BasicSkiaSharp
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page
-    {
-        public MainPage()
-        {
-            this.InitializeComponent();
-        }
-    }
+	public sealed partial class MainPage : Page
+	{
+		public MainPage()
+		{
+			InitializeComponent();
+
+			swapChainPanel.CompositionScaleChanged += (sender, e) => System.Diagnostics.Debug.WriteLine(
+				$"{swapChainPanel.CompositionScaleX}x{swapChainPanel.CompositionScaleY}");
+		}
+
+		// the real draw method
+		private static void Draw(SKSurface surface, SKSize size)
+		{
+			const int stroke = 4;
+			const int curve = 20;
+			const int textSize = 60;
+			const int shrink = stroke / -2;
+
+			var canvas = surface.Canvas;
+
+			canvas.Clear(SKColors.Transparent);
+
+			using (var paint = new SKPaint())
+			{
+				paint.IsAntialias = true;
+				paint.TextSize = textSize;
+
+				paint.Color = SKColors.Orchid;
+				var r = SKRect.Create(SKPoint.Empty, size);
+				canvas.DrawRoundRect(r, curve, curve, paint);
+
+				paint.Color = SKColors.GreenYellow;
+				canvas.DrawText("Hello UWP World!", 30, textSize + 10, paint);
+
+				paint.Color = SKColors.Orange.WithAlpha(100);
+				canvas.DrawOval(SKRect.Create(50, 50, 100, 100), paint);
+
+				paint.IsStroke = true;
+				paint.StrokeWidth = stroke;
+				paint.Color = SKColors.Black;
+				r.Inflate(shrink, shrink);
+				canvas.DrawRoundRect(r, curve - stroke, curve - stroke, paint);
+			}
+		}
+
+		// from the hardware panel
+		private void swapChainPanel_PaintSurface(object sender, SKPaintGLSurfaceEventArgs e)
+		{
+			Draw(e.Surface, new SKSize(e.RenderTarget.Width, e.RenderTarget.Height));
+		}
+	}
 }
diff --git a/samples/BasicSamples/BasicSkiaSharp-UWP/project.json b/samples/BasicSamples/BasicSkiaSharp-UWP/project.json
index 92d145612..4cb5d811c 100644
--- a/samples/BasicSamples/BasicSkiaSharp-UWP/project.json
+++ b/samples/BasicSamples/BasicSkiaSharp-UWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
+    "SkiaSharp": "1.54.1"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/samples/BasicSamples/BasicSkiaSharp-WPF/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-WPF/BasicSkiaSharp.csproj
index bd915e736..9c71028a7 100644
--- a/samples/BasicSamples/BasicSkiaSharp-WPF/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-WPF/BasicSkiaSharp.csproj
@@ -84,8 +84,8 @@
       <HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -160,12 +160,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/BasicSamples/BasicSkiaSharp-WPF/packages.config b/samples/BasicSamples/BasicSkiaSharp-WPF/packages.config
index d7d424f11..80f70e243 100644
--- a/samples/BasicSamples/BasicSkiaSharp-WPF/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-WPF/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
   <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-iOS/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-iOS/BasicSkiaSharp.csproj
index 99e0fc39e..7e5066ee8 100644
--- a/samples/BasicSamples/BasicSkiaSharp-iOS/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-iOS/BasicSkiaSharp.csproj
@@ -93,7 +93,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\XamariniOS\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/BasicSamples/BasicSkiaSharp-iOS/packages.config b/samples/BasicSamples/BasicSkiaSharp-iOS/packages.config
index 586982bc4..526e5b34d 100644
--- a/samples/BasicSamples/BasicSkiaSharp-iOS/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-iOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinios10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/BasicSkiaSharp.csproj b/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/BasicSkiaSharp.csproj
index afad95cef..15e2200dc 100644
--- a/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/BasicSkiaSharp.csproj
+++ b/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/BasicSkiaSharp.csproj
@@ -93,7 +93,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.TVOS" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\XamarintvOS\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/packages.config b/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/packages.config
index 385d71a9f..902aecaaa 100644
--- a/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/packages.config
+++ b/samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarintvos10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.Forms.Demo/Droid/Properties/AndroidManifest.xml b/samples/Skia.Forms.Demo/Droid/Properties/AndroidManifest.xml
index f1ad2c2f6..3b6c76d3b 100644
--- a/samples/Skia.Forms.Demo/Droid/Properties/AndroidManifest.xml
+++ b/samples/Skia.Forms.Demo/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="3" android:versionName="1.54.0" package="com.xamarin.skia_forms_demo" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="1.54.1" package="com.xamarin.skia_forms_demo" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="15" />
 	<application android:label="SkiaSharp for Xamarin.Forms" android:icon="@drawable/ic_launcher" android:theme="@style/MyTheme"></application>
 </manifest>
\ No newline at end of file
diff --git a/samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj b/samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj
index 50ff1ab72..3fe9497af 100644
--- a/samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj
+++ b/samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\MonoAndroid\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/samples/Skia.Forms.Demo/Droid/packages.config b/samples/Skia.Forms.Demo/Droid/packages.config
index 6e63974c6..0c9f01106 100644
--- a/samples/Skia.Forms.Demo/Droid/packages.config
+++ b/samples/Skia.Forms.Demo/Droid/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="monoandroid60" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />
diff --git a/samples/Skia.Forms.Demo/Skia.Forms.Demo.csproj b/samples/Skia.Forms.Demo/Skia.Forms.Demo.csproj
index 77572da15..d5b5af345 100644
--- a/samples/Skia.Forms.Demo/Skia.Forms.Demo.csproj
+++ b/samples/Skia.Forms.Demo/Skia.Forms.Demo.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets b/samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets
index bddba3318..22f1a92be 100644
--- a/samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets
+++ b/samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets
@@ -4,7 +4,7 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets')" />
+    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" />
     <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Skia.Forms.Demo/UWP/project.json b/samples/Skia.Forms.Demo/UWP/project.json
index cc723edc8..198e80e91 100644
--- a/samples/Skia.Forms.Demo/UWP/project.json
+++ b/samples/Skia.Forms.Demo/UWP/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
-    "SkiaSharp": "1.54.0",
+    "SkiaSharp": "1.54.1",
     "Xamarin.Forms": "2.3.0.46-pre3"
   },
   "frameworks": {
diff --git a/samples/Skia.Forms.Demo/iOS/Info.plist b/samples/Skia.Forms.Demo/iOS/Info.plist
index 665e74597..b363fab7e 100644
--- a/samples/Skia.Forms.Demo/iOS/Info.plist
+++ b/samples/Skia.Forms.Demo/iOS/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.xamarin.skia-forms-demo</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.54.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/samples/Skia.Forms.Demo/iOS/Skia.Forms.Demo.iOS.csproj b/samples/Skia.Forms.Demo/iOS/Skia.Forms.Demo.iOS.csproj
index 4a4855c79..33f56c3b0 100644
--- a/samples/Skia.Forms.Demo/iOS/Skia.Forms.Demo.iOS.csproj
+++ b/samples/Skia.Forms.Demo/iOS/Skia.Forms.Demo.iOS.csproj
@@ -80,7 +80,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\XamariniOS\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/samples/Skia.Forms.Demo/iOS/packages.config b/samples/Skia.Forms.Demo/iOS/packages.config
index a0fe57e58..dd8d39b6a 100644
--- a/samples/Skia.Forms.Demo/iOS/packages.config
+++ b/samples/Skia.Forms.Demo/iOS/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinios10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.Forms.Demo/packages.config b/samples/Skia.Forms.Demo/packages.config
index da551d9d8..4df161d74 100644
--- a/samples/Skia.Forms.Demo/packages.config
+++ b/samples/Skia.Forms.Demo/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="portable45-net45+win8+wp8" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="portable45-net45+win8+wp8" />
   <package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="portable45-net45+win8+wp8" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.OSX.Demo/Info.plist b/samples/Skia.OSX.Demo/Info.plist
index e6f09aa18..6aecff40e 100644
--- a/samples/Skia.OSX.Demo/Info.plist
+++ b/samples/Skia.OSX.Demo/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.xamarin.skia-osx-demo</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.54.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.8</string>
 	<key>CFBundleDevelopmentRegion</key>
diff --git a/samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj b/samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj
index b910d05f8..15e0bd5d1 100644
--- a/samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj
+++ b/samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj
@@ -56,7 +56,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\XamarinMac\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -128,5 +128,5 @@
     </BundleResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" />
 </Project>
diff --git a/samples/Skia.OSX.Demo/packages.config b/samples/Skia.OSX.Demo/packages.config
index 4b14c3cc1..174f3eeb0 100644
--- a/samples/Skia.OSX.Demo/packages.config
+++ b/samples/Skia.OSX.Demo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinmac20" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinmac20" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.OSX.GLDemo/Info.plist b/samples/Skia.OSX.GLDemo/Info.plist
index 0dbaf780c..2b237356a 100644
--- a/samples/Skia.OSX.GLDemo/Info.plist
+++ b/samples/Skia.OSX.GLDemo/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.xamarin.skia-osx-demo</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.54.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.8</string>
 	<key>CFBundleDevelopmentRegion</key>
diff --git a/samples/Skia.OSX.GLDemo/Skia.OSX.GLDemo.csproj b/samples/Skia.OSX.GLDemo/Skia.OSX.GLDemo.csproj
index 332f7660f..565e3d851 100644
--- a/samples/Skia.OSX.GLDemo/Skia.OSX.GLDemo.csproj
+++ b/samples/Skia.OSX.GLDemo/Skia.OSX.GLDemo.csproj
@@ -56,7 +56,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\XamarinMac\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="OpenTK" />
@@ -129,5 +129,5 @@
     </BundleResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" />
 </Project>
diff --git a/samples/Skia.OSX.GLDemo/packages.config b/samples/Skia.OSX.GLDemo/packages.config
index 4b14c3cc1..174f3eeb0 100644
--- a/samples/Skia.OSX.GLDemo/packages.config
+++ b/samples/Skia.OSX.GLDemo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinmac20" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinmac20" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.UWP.Demo/Package.appxmanifest b/samples/Skia.UWP.Demo/Package.appxmanifest
index a0fa3067a..4580d57e9 100644
--- a/samples/Skia.UWP.Demo/Package.appxmanifest
+++ b/samples/Skia.UWP.Demo/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.54.0.0" />
+  <Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.54.1.0" />
   <mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>SkiaSharp for Windows</DisplayName>
diff --git a/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets b/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
index 618af61cc..2c2206cfe 100644
--- a/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
+++ b/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets')" />
+    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Skia.UWP.Demo/project.json b/samples/Skia.UWP.Demo/project.json
index cc394e2a1..b78f45d97 100644
--- a/samples/Skia.UWP.Demo/project.json
+++ b/samples/Skia.UWP.Demo/project.json
@@ -4,7 +4,7 @@
     "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
     "Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
-    "SkiaSharp": "1.54.0"
+    "SkiaSharp": "1.54.1"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/samples/Skia.WPF.Demo/Skia.WPF.Demo.csproj b/samples/Skia.WPF.Demo/Skia.WPF.Demo.csproj
index 9c7f4839c..568fed119 100644
--- a/samples/Skia.WPF.Demo/Skia.WPF.Demo.csproj
+++ b/samples/Skia.WPF.Demo/Skia.WPF.Demo.csproj
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -166,12 +166,12 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/Skia.WPF.Demo/packages.config b/samples/Skia.WPF.Demo/packages.config
index 7affb2459..62e854b60 100644
--- a/samples/Skia.WPF.Demo/packages.config
+++ b/samples/Skia.WPF.Demo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.csproj b/samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.csproj
index 7e403124c..db4db4d48 100644
--- a/samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.csproj
+++ b/samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.csproj
@@ -87,7 +87,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -139,11 +139,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/samples/Skia.WindowsDesktop.Demo/packages.config b/samples/Skia.WindowsDesktop.Demo/packages.config
index 7affb2459..62e854b60 100644
--- a/samples/Skia.WindowsDesktop.Demo/packages.config
+++ b/samples/Skia.WindowsDesktop.Demo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.WindowsDesktop.GLDemo/Skia.WindowsDesktop.GLDemo.csproj b/samples/Skia.WindowsDesktop.GLDemo/Skia.WindowsDesktop.GLDemo.csproj
index 107abc424..d9a56628c 100644
--- a/samples/Skia.WindowsDesktop.GLDemo/Skia.WindowsDesktop.GLDemo.csproj
+++ b/samples/Skia.WindowsDesktop.GLDemo/Skia.WindowsDesktop.GLDemo.csproj
@@ -83,7 +83,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
@@ -141,11 +141,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/samples/Skia.WindowsDesktop.GLDemo/packages.config b/samples/Skia.WindowsDesktop.GLDemo/packages.config
index d7d424f11..80f70e243 100644
--- a/samples/Skia.WindowsDesktop.GLDemo/packages.config
+++ b/samples/Skia.WindowsDesktop.GLDemo/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
   <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/Skia.tvOS.Demo/Info.plist b/samples/Skia.tvOS.Demo/Info.plist
index fc6f6968e..a582ee187 100644
--- a/samples/Skia.tvOS.Demo/Info.plist
+++ b/samples/Skia.tvOS.Demo/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.companyname.skia-tvos-demo</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54.0</string>
+	<string>1.54.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>MinimumOSVersion</key>
 	<string>9.0</string>
 	<key>UIDeviceFamily</key>
diff --git a/samples/Skia.tvOS.Demo/Skia.tvOS.Demo.csproj b/samples/Skia.tvOS.Demo/Skia.tvOS.Demo.csproj
index df3ff8a25..d53f8b207 100644
--- a/samples/Skia.tvOS.Demo/Skia.tvOS.Demo.csproj
+++ b/samples/Skia.tvOS.Demo/Skia.tvOS.Demo.csproj
@@ -88,7 +88,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.TVOS" />
     <Reference Include="SkiaSharp">
-      <HintPath>packages\SkiaSharp.1.54.0\lib\XamarintvOS\SkiaSharp.dll</HintPath>
+      <HintPath>packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/Skia.tvOS.Demo/packages.config b/samples/Skia.tvOS.Demo/packages.config
index 385d71a9f..902aecaaa 100644
--- a/samples/Skia.tvOS.Demo/packages.config
+++ b/samples/Skia.tvOS.Demo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarintvos10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.Android/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views.Android/Properties/AssemblyInfo.cs
deleted file mode 100644
index eb20268ea..000000000
--- a/views/SkiaSharp.Views.Android/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("SkiaSharp.Views.Android")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.Android")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
index 4afac66c3..1be3d9f08 100644
--- a/views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
+++ b/views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,12 +44,14 @@
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\MonoAndroid\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SKView.cs" />
     <Compile Include="SKGLSurfaceViewRenderer.cs" />
     <Compile Include="SKGLSurfaceView.cs" />
diff --git a/views/SkiaSharp.Views.Android/packages.config b/views/SkiaSharp.Views.Android/packages.config
index 25c7d4d54..5893b279f 100644
--- a/views/SkiaSharp.Views.Android/packages.config
+++ b/views/SkiaSharp.Views.Android/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="monoandroid23" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="monoandroid23" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.Desktop/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views.Desktop/Properties/AssemblyInfo.cs
deleted file mode 100644
index 570145765..000000000
--- a/views/SkiaSharp.Views.Desktop/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("SkiaSharp.Views.Desktop")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.Desktop")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj b/views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj
index b1150c6a2..f37baff90 100644
--- a/views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj
+++ b/views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj
@@ -41,8 +41,8 @@
       <HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -55,7 +55,9 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="SKControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -70,12 +72,12 @@
   <Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" />
   <Import Project="..\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/views/SkiaSharp.Views.Desktop/packages.config b/views/SkiaSharp.Views.Desktop/packages.config
index d7d424f11..80f70e243 100644
--- a/views/SkiaSharp.Views.Desktop/packages.config
+++ b/views/SkiaSharp.Views.Desktop/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
   <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
-  <package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.Mac/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views.Mac/Properties/AssemblyInfo.cs
deleted file mode 100644
index f9d9ed368..000000000
--- a/views/SkiaSharp.Views.Mac/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("SkiaSharp.Views.Mac")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.Mac")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
index 9eb19a251..44f30e499 100644
--- a/views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
+++ b/views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,7 +30,8 @@
     <HttpClientHandler>HttpClientHandler</HttpClientHandler>
     <TlsProvider>Default</TlsProvider>
     <LinkMode>None</LinkMode>
-    <XamMacArch></XamMacArch>
+    <XamMacArch>
+    </XamMacArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
@@ -46,19 +47,22 @@
     <HttpClientHandler>HttpClientHandler</HttpClientHandler>
     <TlsProvider>Default</TlsProvider>
     <LinkMode>None</LinkMode>
-    <XamMacArch></XamMacArch>
+    <XamMacArch>
+    </XamMacArch>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\XamarinMac\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="SKView.cs" />
     <Compile Include="SKGLView.cs" />
     <Compile Include="SKGLLayer.cs" />
@@ -69,5 +73,5 @@
   <Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.projitems" Label="Shared" />
   <Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="..\packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.Mac/packages.config b/views/SkiaSharp.Views.Mac/packages.config
index 4b14c3cc1..174f3eeb0 100644
--- a/views/SkiaSharp.Views.Mac/packages.config
+++ b/views/SkiaSharp.Views.Mac/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinmac20" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinmac20" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.UWP/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views.UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7fe1d8aa1..000000000
--- a/views/SkiaSharp.Views.UWP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("SkiaSharp.Views.UWP")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.UWP")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
index 663ff765b..1359496b5 100644
--- a/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
+++ b/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
@@ -43,8 +43,10 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="GlesInterop\PropertySetInterop.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="GlesInterop\Egl.cs" />
     <Compile Include="GlesInterop\Gles.cs" />
     <Compile Include="GlesContext.cs" />
diff --git a/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.nuget.targets b/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.nuget.targets
index 618af61cc..2c2206cfe 100644
--- a/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.nuget.targets
+++ b/views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.nuget.targets
@@ -4,6 +4,6 @@
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
   </PropertyGroup>
   <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0\build\uap10.0\SkiaSharp.targets')" />
+    <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.UWP/project.json b/views/SkiaSharp.Views.UWP/project.json
index f6749a1d3..4cb5d811c 100644
--- a/views/SkiaSharp.Views.UWP/project.json
+++ b/views/SkiaSharp.Views.UWP/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
-    "SkiaSharp": "1.54.0"
+    "SkiaSharp": "1.54.1"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
index 21d00477b..ae11e1060 100644
--- a/views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
+++ b/views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,7 +29,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchUseSGen>true</MtouchUseSGen>
@@ -44,7 +45,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\XamariniOS\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK-1.0" />
   </ItemGroup>
@@ -52,10 +53,12 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="..\SkiaSharp.Views.AppleiOS\SkiaSharp.Views.AppleiOS.projitems" Label="Shared" />
   <Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.projitems" Label="Shared" />
diff --git a/views/SkiaSharp.Views.iOS/packages.config b/views/SkiaSharp.Views.iOS/packages.config
index 586982bc4..526e5b34d 100644
--- a/views/SkiaSharp.Views.iOS/packages.config
+++ b/views/SkiaSharp.Views.iOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarinios10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarinios10" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.tvOS/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views.tvOS/Properties/AssemblyInfo.cs
deleted file mode 100644
index ea642b53a..000000000
--- a/views/SkiaSharp.Views.tvOS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("SkiaSharp.Views.tvOS")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.tvOS")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
index c7dc6737e..4781afb44 100644
--- a/views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
+++ b/views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,7 +44,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.TVOS" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.54.0\lib\XamarintvOS\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK-1.0" />
   </ItemGroup>
@@ -52,10 +52,12 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Compile Include="..\SkiaSharp.Views\Properties\SkiaSharpViewsAssemblyInfo.cs">
+      <Link>Properties\SkiaSharpViewsAssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="..\SkiaSharp.Views.AppleiOS\SkiaSharp.Views.AppleiOS.projitems" Label="Shared" />
   <Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.projitems" Label="Shared" />
diff --git a/views/SkiaSharp.Views.tvOS/packages.config b/views/SkiaSharp.Views.tvOS/packages.config
index 385d71a9f..902aecaaa 100644
--- a/views/SkiaSharp.Views.tvOS/packages.config
+++ b/views/SkiaSharp.Views.tvOS/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SkiaSharp" version="1.54.0" targetFramework="xamarintvos10" />
+  <package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
 </packages>
\ No newline at end of file
diff --git a/views/SkiaSharp.Views.iOS/Properties/AssemblyInfo.cs b/views/SkiaSharp.Views/Properties/SkiaSharpViewsAssemblyInfo.cs
similarity index 77%
rename from views/SkiaSharp.Views.iOS/Properties/AssemblyInfo.cs
rename to views/SkiaSharp.Views/Properties/SkiaSharpViewsAssemblyInfo.cs
index 3e6dc2c67..e074ce16c 100644
--- a/views/SkiaSharp.Views.iOS/Properties/AssemblyInfo.cs
+++ b/views/SkiaSharp.Views/Properties/SkiaSharpViewsAssemblyInfo.cs
@@ -3,11 +3,11 @@
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle ("SkiaSharp.Views.iOS")]
+[assembly: AssemblyTitle ("SkiaSharp.Views")]
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyConfiguration ("")]
 [assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("SkiaSharp.Views.iOS")]
+[assembly: AssemblyProduct ("SkiaSharp.Views")]
 [assembly: AssemblyCopyright ("Xamarin Inc.")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
@@ -16,9 +16,9 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.54.0.0")]
-[assembly: AssemblyFileVersion ("1.54.0.0")]
-[assembly: AssemblyInformationalVersion ("1.54.0.0-{GIT_SHA}")]
+[assembly: AssemblyVersion ("1.54.1.0")]
+[assembly: AssemblyFileVersion ("1.54.1.0")]
+[assembly: AssemblyInformationalVersion ("1.54.1.0-{GIT_SHA}")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.