From 9ff335b1f622624139d1b166f7826fe9c1ec1f68 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 24 Jul 2018 03:30:38 +0200
Subject: [PATCH 1/3] Update Xamarin.Forms to v3.0

---
 VERSIONS.txt                                         |  2 +-
 nuget/SkiaSharp.Views.Forms.nuspec                   | 12 ++++++------
 .../Tizen/SkiaSharpSample/SkiaSharpSample.csproj     |  2 +-
 .../SkiaSharpSample.Android.csproj                   |  2 +-
 .../SkiaSharpSample.Tizen.csproj                     |  2 +-
 .../SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj   |  6 +++---
 .../SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj   |  2 +-
 .../SkiaSharpSample.macOS.csproj                     |  2 +-
 .../SkiaSharpSample/SkiaSharpSample.csproj           |  2 +-
 samples/Gallery/Xamarin.Forms/Android/Android.csproj |  2 +-
 samples/Gallery/Xamarin.Forms/Core/Core.csproj       |  2 +-
 samples/Gallery/Xamarin.Forms/Mac/Mac.csproj         |  2 +-
 samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj   |  2 +-
 samples/Gallery/Xamarin.Forms/UWP/UWP.csproj         |  8 ++++----
 samples/Gallery/Xamarin.Forms/iOS/iOS.csproj         |  2 +-
 .../SkiaSharp.Views.Forms.Android.csproj             |  2 +-
 .../SkiaSharp.Views.Forms.Mac.csproj                 |  2 +-
 .../SkiaSharp.Views.Forms.Tizen.csproj               |  2 +-
 .../SkiaSharp.Views.Forms.UWP.csproj                 |  4 ++--
 .../SkiaSharp.Views.Forms.iOS.csproj                 |  2 +-
 .../SkiaSharp.Views.Forms.csproj                     |  2 +-
 21 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/VERSIONS.txt b/VERSIONS.txt
index 82b6eae6..f118b56a 100644
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -5,7 +5,7 @@ mdoc                    release     5.7.2
 harfbuzz                release     1.4.6
 skia                    release     m67
 xunit.runner.console    release     2.4.0
-Xamarin.Forms           release     2.5.0.280555
+Xamarin.Forms           release     3.0.0.561731
 Tizen.NET               release     4.0.0
 OpenTK.GLControl        release     1.1.2349.61993
 MSBuild.Sdk.Extras      release     1.6.41
diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec
index b8fd8efa..a2330f25 100644
--- a/nuget/SkiaSharp.Views.Forms.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.nuspec
@@ -28,31 +28,31 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
 
     <dependencies>
       <group>
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="MonoAndroid">
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="XamariniOS">
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="XamarinMac">
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="uap10.0">
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="tizen40">
-        <dependency id="Xamarin.Forms.Platform.Tizen" version="2.5.0.280555" />
+        <dependency id="Xamarin.Forms" version="3.0.0.561731" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
index 5f377486..23e5e013 100644
--- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
index 6d9a5f60..3bc2bfd6 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@@ -49,7 +49,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj">
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
index 3a43fbdf..f7215a56 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
index 2abeb335..ff4f9d14 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>SkiaSharpSample.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -92,7 +92,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
index e91c9c68..ada8a749 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@@ -70,7 +70,7 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj">
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
index 0ad71273..2e286fa2 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -55,7 +55,7 @@
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj">
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
index 3331d960..39b0f784 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj
index 3f680305..4a7b0e72 100644
--- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj
+++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj
@@ -51,7 +51,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj">
diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
index 061164e0..13dc641f 100644
--- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj
+++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
index 92eba355..575d63c8 100644
--- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
+++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
@@ -55,7 +55,7 @@
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj">
diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
index c3815135..63c5ebfe 100644
--- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
+++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
index 3e584b87..6dd994d8 100644
--- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
+++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>SkiaSharpSample.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -92,7 +92,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">
@@ -127,7 +127,7 @@
     <Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.10240.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
index abb5e462..b01727c6 100644
--- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
+++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
@@ -112,7 +112,7 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj">
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
index 07eaa5d8..1b477fa6 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
index a5d50717..d035e16b 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj
index 3a053446..4945fe1a 100755
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj
@@ -13,7 +13,7 @@
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
     <PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
index 1ff44e7f..2a64f6b9 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SkiaSharp.Build.props" />
   <PropertyGroup>
-    <TargetFramework>uap10.0.10240</TargetFramework>
+    <TargetFramework>uap10.0.16299</TargetFramework>
     <OutputTypeEx>library</OutputTypeEx>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>
     <AssemblyName>SkiaSharp.Views.Forms</AssemblyName>
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
   </ItemGroup>
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
index b5c388e2..8e55dedf 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
index d02e880b..21f04976 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="mdoc" Version="5.7.2" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>

From ae8679295b0d6b2bff90ab3695a17df5d2040234 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 24 Jul 2018 03:43:21 +0200
Subject: [PATCH 2/3] Xamarin.Forms v3.0 is based on .NET Standard 2.0

---
 .../Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj  | 2 +-
 samples/Gallery/Xamarin.Forms/Core/Core.csproj                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
index 39b0f784..2d3ae69d 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
index 13dc641f..0c62bec0 100644
--- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj
+++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
   </PropertyGroup>
 

From 0b756f188b9e824742849df9aadf1234be04b00c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 24 Jul 2018 04:06:39 +0200
Subject: [PATCH 3/3] Update the version of android being used for compilation

---
 samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj    | 2 +-
 .../SkiaSharpSample.Android/SkiaSharpSample.Android.csproj      | 2 +-
 samples/Gallery/Xamarin.Forms/Android/Android.csproj            | 2 +-
 .../SkiaSharp.Views.Forms.Android.csproj                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj
index 2645043d..657cff54 100644
--- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <AssemblyName>SkiaSharpSample</AssemblyName>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
index 3bc2bfd6..e7ee00be 100644
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SkiaSharpSample.Droid</RootNamespace>
     <AssemblyName>SkiaSharpSample.Android</AssemblyName>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj
index 4a7b0e72..7cc3129c 100644
--- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj
+++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj
@@ -17,7 +17,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
index 1b477fa6..ecb3ddb3 100644
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\SkiaSharp.Build.props" />
   <PropertyGroup>
-    <TargetFramework>monoandroid8.0</TargetFramework>
+    <TargetFramework>monoandroid8.1</TargetFramework>
     <OutputTypeEx>library</OutputTypeEx>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>
     <AssemblyName>SkiaSharp.Views.Forms</AssemblyName>