Project changes to v1.60

samples/FormsSample/Android/Android.csproj

@@ -54,11 +54,11 @@
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
     <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
   </ItemGroup>
   <ItemGroup>

samples/FormsSample/Core/Core.csproj

@@ -35,10 +35,10 @@
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
     <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
   </ItemGroup>
   <ItemGroup>

samples/FormsSample/Mac/Mac.csproj

@@ -56,12 +56,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
     <PackageReference Include="SkiaSharp.Extended" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
     <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
   </ItemGroup>
   <ItemGroup>

samples/FormsSample/UWP/UWP.csproj

@@ -17,7 +17,7 @@
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <PackageCertificateKeyFile>..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>A9102DF7FB3501F23B65D59B624A9CB05C065366</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
@@ -96,10 +96,10 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.0.0" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj">

samples/FormsSample/iOS/iOS.csproj

@@ -115,11 +115,11 @@
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
     <PackageReference Include="Xamarin.Forms" Version="2.4.0.18342" />
   </ItemGroup>
   <ItemGroup>

samples/MacSample/MacSample/MacSample.csproj

@@ -54,10 +54,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />

samples/TvSample/TvSample/TvSample.csproj

@@ -87,10 +87,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

samples/UWPSample/UWPSample/UWPSample.csproj

@@ -92,10 +92,10 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.0.0" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="WindowsDesktop, Version=10.0.10240.0">

samples/WPFSample/WPFSample/WPFSample.csproj

@@ -98,10 +98,10 @@
     <PackageReference Include="OpenTK.GLControl" Version="1.1.2349.61993" />
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">

samples/WindowsSample/WindowsSample/WindowsSample.csproj

@@ -92,10 +92,10 @@
     <PackageReference Include="OpenTK.GLControl" Version="1.1.2349.61993" />
     <PackageReference Include="HarfBuzzSharp" Version="1.4.6" />
     <PackageReference Include="PCLStorage" Version="1.0.2" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.59.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">

source/SkiaSharpSource.Mac.sln

@@ -3,6 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "..\Binding\Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\Binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\Binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\Binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "..\Binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\Binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Portable", "..\Binding\SkiaSharp.Portable\SkiaSharp.Portable.csproj", "{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}"
+EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Forms.Shared", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.shproj", "{314FB505-9858-4E03-B799-91B0BA627D05}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Android", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}"
@@ -27,20 +41,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.AppleiOS",
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Shared", "SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.shproj", "{5A67972C-1C04-4913-9950-06A03BFE9533}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "..\Binding\Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\Binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\Binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\Binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "..\Binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\Binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Portable", "..\Binding\SkiaSharp.Portable\SkiaSharp.Portable.csproj", "{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{C335869B-7CC8-4239-B4A5-8031AA9758D3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{F19E1537-81B2-4D4F-A69E-78DC73ACC141}"

tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj

@@ -14,8 +14,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.6.1" />
-    <PackageReference Include="SkiaSharp" Version="1.59.2" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.59.0-beta" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.0-beta" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Tests\*.cs" Link="%(FileName)%(Extension)" />