Update Samples (#1313)

* Update samples (new things, AndroidX, updated versions)
* Update icons
* Move away from all obsolete uses
* Temporary workaround for https://developercommunity.visualstudio.com/content/problem/1057547/incorrect-file-validation-for-the-installappleprov.html
* Fix the API diff

VERSIONS.txt

@@ -4,9 +4,9 @@ harfbuzz                                        release     2.6.1
 skia                                            release     m80
 xunit                                           release     2.4.1
 xunit.runner.console                            release     2.4.1
-Xamarin.Forms                                   release     4.4.0.991757
-Xamarin.Forms.Platform.WPF                      release     4.4.0.991757
-Xamarin.Forms.Platform.GTK                      release     4.4.0.991757
+Xamarin.Forms                                   release     4.5.0.725
+Xamarin.Forms.Platform.WPF                      release     4.5.0.725
+Xamarin.Forms.Platform.GTK                      release     4.5.0.725
 Tizen.NET                                       release     4.0.0
 OpenTK                                          release     3.0.1
 OpenTK.GLControl                                release     3.0.1
@@ -22,6 +22,7 @@ SharpVk                                         release     0.4.2
 
 # additional references used by the tooling
 OpenTK.GLControl                                reference   1.1.2349.61993
+Xamarin.Forms                                   reference   4.4.0.991757
 
 # native sonames
 libSkiaSharp            soname      80.0.0
@@ -53,3 +54,8 @@ SkiaSharp.HarfBuzz                              nuget       2.80.0
 SkiaSharp.Vulkan.SharpVk                        nuget       2.80.0
 HarfBuzzSharp                                   nuget       2.6.1.5
 HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1.5
+
+# nuget replacement versions
+Xamarin.Forms                                   nuget       4.6.0.772
+Xamarin.Forms.Platform.WPF                      nuget       4.6.0.772
+Xamarin.Forms.Platform.GTK                      nuget       4.6.0.772

binding/Binding/Definitions.cs

@@ -275,7 +275,7 @@ namespace SkiaSharp
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		[Obsolete]
-		public SKTransferFunctionBehavior UnpremulBehavior {
+		public SKTransferFunctionBehavior PremulBehavior {
 			readonly get => SKTransferFunctionBehavior.Respect;
 			set { }
 		}

cake/UtilsManaged.cake

@@ -155,7 +155,6 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     comparer.SearchPaths.AddRange(GetReferenceSearchPaths());
     comparer.PackageCache = PACKAGE_CACHE_PATH.FullPath;
 
-    await AddDep("OpenTK.GLControl", "NET40", "reference");
     await AddDep("OpenTK.GLControl", "NET40");
     await AddDep("Tizen.NET", "netstandard2.0");
     await AddDep("Xamarin.Forms", "netstandard2.0");
@@ -163,7 +162,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     await AddDep("Xamarin.Forms", "Xamarin.iOS10");
     await AddDep("Xamarin.Forms", "Xamarin.Mac");
     await AddDep("Xamarin.Forms", "tizen40");
-    await AddDep("Xamarin.Forms", "uap10.0");
+    await AddDep("Xamarin.Forms", "uap10.0.16299");
     await AddDep("Xamarin.Forms.Platform.WPF", "net45");
     await AddDep("Xamarin.Forms.Platform.GTK", "net45");
     await AddDep("GtkSharp", "netstandard2.0");
@@ -172,6 +171,11 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     await AddDep("AtkSharp", "netstandard2.0");
     await AddDep("System.Memory", "netstandard2.0");
 
+    await AddDep("OpenTK.GLControl", "NET40", "reference");
+    await AddDep("Xamarin.Forms", "Xamarin.iOS10", "reference");
+    await AddDep("Xamarin.Forms", "Xamarin.Mac", "reference");
+    await AddDep("Xamarin.Forms", "uap10.0", "reference");
+
     return comparer;
 
     async Task AddDep(string id, string platform, string type = "release")

cake/samples.cake

@@ -83,7 +83,10 @@ void CreateSamplesDirectory(DirectoryPath samplesDirPath, DirectoryPath outputDi
                     var packageId = projItem.Attribute("Include").Value;
                     var version = GetVersion(packageId);
                     if (!string.IsNullOrWhiteSpace(version)) {
-                        version += suffix;
+                        // only add the suffix for our nugets
+                        if (packageId.StartsWith("SkiaSharp") || packageId.StartsWith("HarfBuzzSharp")) {
+                            version += suffix;
+                        }
                         Debug($"Substituting package version {packageId} for {version}.");
                         projItem.Attribute("Version").Value = version;
                     } else if (packageId.StartsWith("SkiaSharp") || packageId.StartsWith("HarfBuzzSharp")) {

nuget/SkiaSharp.Views.Forms.GTK.nuspec

@@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
 
     <dependencies>
-      <dependency id="Xamarin.Forms" version="4.4.0.991757" />
-      <dependency id="Xamarin.Forms.Platform.GTK" version="4.4.0.991757" />
+      <dependency id="Xamarin.Forms" version="4.5.0.725" />
+      <dependency id="Xamarin.Forms.Platform.GTK" version="4.5.0.725" />
       <dependency id="SkiaSharp" version="1.0.0" />
       <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
       <dependency id="SkiaSharp.Views.Gtk2" version="1.0.0" />

nuget/SkiaSharp.Views.Forms.WPF.nuspec

@@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
 
     <dependencies>
-      <dependency id="Xamarin.Forms" version="4.4.0.991757" />
-      <dependency id="Xamarin.Forms.Platform.WPF" version="4.4.0.991757" />
+      <dependency id="Xamarin.Forms" version="4.5.0.725" />
+      <dependency id="Xamarin.Forms.Platform.WPF" version="4.5.0.725" />
       <dependency id="SkiaSharp" version="1.0.0" />
       <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
       <dependency id="SkiaSharp.Views.WindowsForms" version="1.0.0" />

nuget/SkiaSharp.Views.Forms.nuspec

@@ -28,40 +28,40 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
 
     <dependencies>
       <group targetFramework="netstandard1.3">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="monoandroid1.0">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="xamarinios1.0">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="xamarinmac2.0">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <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="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="tizen40">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>
       <group targetFramework="net45">
-        <dependency id="Xamarin.Forms" version="4.4.0.991757" />
+        <dependency id="Xamarin.Forms" version="4.5.0.725" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
     </dependencies>

samples/Basic/Android/SkiaSharpSample/MainActivity.cs

@@ -1,6 +1,6 @@
 using Android.App;
 using Android.OS;
-using Android.Support.V7.App;
+using AndroidX.AppCompat.App;
 
 using SkiaSharp;
 using SkiaSharp.Views.Android;
@@ -16,13 +16,25 @@ namespace SkiaSharpSample
 		{
 			base.OnCreate(savedInstanceState);
 
-			SetContentView(Resource.Layout.Main);
+			SetContentView(Resource.Layout.main);
 
 			skiaView = FindViewById<SKCanvasView>(Resource.Id.skiaView);
+		}
+
+		protected override void OnResume()
+		{
+			base.OnResume();
 
 			skiaView.PaintSurface += OnPaintSurface;
 		}
 
+		protected override void OnPause()
+		{
+			skiaView.PaintSurface -= OnPaintSurface;
+
+			base.OnPause();
+		}
+
 		private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
 		{
 			// the the canvas and properties
@@ -50,11 +62,5 @@ namespace SkiaSharpSample
 			var coord = new SKPoint(scaledSize.Width / 2, (scaledSize.Height + paint.TextSize) / 2);
 			canvas.DrawText("SkiaSharp", coord, paint);
 		}
-
-		protected override void OnDestroy()
-		{
-			skiaView.PaintSurface -= OnPaintSurface;
-			base.OnDestroy();
-		}
 	}
 }

samples/Basic/Android/SkiaSharpSample/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:versionName="1.0" package="com.companyname.skiasharpsample" android:versionCode="1">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
-	<application android:allowBackup="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" android:hardwareAccelerated="true"></application>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" android:hardwareAccelerated="true"></application>
 </manifest>

samples/Basic/Android/SkiaSharpSample/Resources/drawable/ic_launcher_background.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

samples/Basic/Android/SkiaSharpSample/Resources/layout/main.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <skiasharp.views.android.SKCanvasView
+    <SkiaSharp.Views.Android.SKCanvasView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/skiaView" />

samples/Basic/Android/SkiaSharpSample/Resources/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

samples/Basic/Android/SkiaSharpSample/Resources/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

samples/Basic/Android/SkiaSharpSample/Resources/values/Strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">SkiaSharp Sample</string>
+    <string name="app_name">SkiaSharp</string>
 </resources>

samples/Basic/Android/SkiaSharpSample/Resources/values/ic_launcher_background.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<resources>
+    <color name="ic_launcher_background">#F8F8F8</color>
+</resources>

samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.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>
@@ -8,29 +8,30 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <AssemblyName>SkiaSharpSample</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidUseIntermediateDesignerFile>true</AndroidUseIntermediateDesignerFile>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <AndroidDexTool>d8</AndroidDexTool>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
@@ -48,36 +49,17 @@
     <Reference Include="Mono.Android" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Arch.Core.Common" Version="1.0.0" />
-    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.Common" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Android.Arch.Lifecycle.Runtime" Version="1.0.0" />
-    <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Annotations" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Compat" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Core.UI" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Fragment" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Media.Compat" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.0.1" />
-    <PackageReference Include="Xamarin.Build.Download" Version="0.4.7" />
+    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
+    <AndroidResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj">

samples/Basic/Desktop/SkiaSharpSample/Form1.Designer.cs

@@ -28,6 +28,7 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
 			this.skiaView = new SkiaSharp.Views.Desktop.SKControl();
 			this.SuspendLayout();
 			// 
@@ -47,8 +48,9 @@
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(774, 529);
 			this.Controls.Add(this.skiaView);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.Name = "Form1";
-			this.Text = "Form1";
+			this.Text = "SkiaSharp";
 			this.ResumeLayout(false);
 
 		}

samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj

@@ -12,11 +12,14 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -25,17 +28,13 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -107,6 +106,9 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\net45\SkiaSharp.targets')" />
 </Project>

samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj

@@ -4,13 +4,7 @@
     <TargetFramework>tizen40</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj

@@ -8,9 +8,10 @@
     <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <RootNamespace>SkiaSharpSample</RootNamespace>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>

samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/NetCore/WPF/SkiaSharpSample/MainWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:SkiaSharpSample"
         xmlns:skia="clr-namespace:SkiaSharp.Views.WPF;assembly=SkiaSharp.Views.WPF"
         mc:Ignorable="d"
-        Title="MainWindow" Height="350" Width="525">
+        Title="SkiaSharp" Height="350" Width="525" Icon="/icon.ico">
     <Grid>
         <skia:SKElement PaintSurface="OnPaintSurface" />
     </Grid>

samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj

@@ -4,8 +4,15 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWPF>true</UseWPF>
+    <LangVersion>8.0</LangVersion>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="icon.ico" />
+    <Resource Include="icon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj" />

samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj

@@ -4,19 +4,11 @@
     <TargetFramework>tizen40</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <OutputPath>bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-    <OutputPath>bin\Release\</OutputPath>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
+    <PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
   </ItemGroup>
 
   <ItemGroup>

samples/Basic/UWP/SkiaSharpSample.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30126.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{91B64285-C797-49FD-8252-EAD97BA38E27}"
 EndProject
@@ -13,10 +13,12 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -25,6 +27,8 @@ Global
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{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|ARM64.ActiveCfg = Debug|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM64.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
@@ -33,6 +37,8 @@ Global
 		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{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|ARM64.ActiveCfg = Release|Any CPU
+		{8BB20362-91A2-4206-944D-634070EAC6F3}.Release|ARM64.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
@@ -41,6 +47,8 @@ Global
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -49,6 +57,8 @@ Global
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.ActiveCfg = Release|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.Build.0 = Release|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.Build.0 = Release|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.Build.0 = Release|Any CPU
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.ActiveCfg = Release|Any CPU
@@ -59,6 +69,9 @@ Global
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM.ActiveCfg = Debug|ARM
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM.Build.0 = Debug|ARM
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM.Deploy.0 = Debug|ARM
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM64.Build.0 = Debug|ARM64
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|x64.ActiveCfg = Debug|x64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|x64.Build.0 = Debug|x64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Debug|x64.Deploy.0 = Debug|x64
@@ -71,6 +84,9 @@ Global
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM.ActiveCfg = Release|ARM
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM.Build.0 = Release|ARM
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM.Deploy.0 = Release|ARM
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM64.ActiveCfg = Release|ARM64
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM64.Build.0 = Release|ARM64
+		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|ARM64.Deploy.0 = Release|ARM64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|x64.ActiveCfg = Release|x64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|x64.Build.0 = Release|x64
 		{91B64285-C797-49FD-8252-EAD97BA38E27}.Release|x64.Deploy.0 = Release|x64