From 6d771412b3172f98dcf38da246267e33ce98c0ca Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 14:06:28 +0000
Subject: [PATCH] downgraded SkiaSharp to 1.60.3 (bug in 1.68).

---
 DeathSocket/DeathSocket.fsproj       | 2 +-
 DeathSocket/ImageServices.fs         | 1 -
 DeathSocketCLI/DeathSocketCLI.fsproj | 6 +++---
 DeathSocketCLI/packages.config       | 2 +-
 TestCentre/LibraryTests.fs           | 4 ++--
 TestCentre/TestCentre.fsproj         | 6 +++---
 TestCentre/packages.config           | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 5004753..ab27a1b 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp" Version="1.60.3" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
 
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 6b2d748..2562a7d 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -76,7 +76,6 @@
     let drawSkiaRGBGrid spec =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
-        use t = new SKBitmap ()
         use bitmap = SKBitmap.Decode (skStream)
         use shader =
             SKShader.CreateBitmap (bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror)
diff --git a/DeathSocketCLI/DeathSocketCLI.fsproj b/DeathSocketCLI/DeathSocketCLI.fsproj
index 5bd45b7..cf3d00a 100644
--- a/DeathSocketCLI/DeathSocketCLI.fsproj
+++ b/DeathSocketCLI/DeathSocketCLI.fsproj
@@ -66,7 +66,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -86,12 +86,12 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\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.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\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/DeathSocketCLI/packages.config b/DeathSocketCLI/packages.config
index cdbffca..d59a998 100644
--- a/DeathSocketCLI/packages.config
+++ b/DeathSocketCLI/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Console.Waterworks" version="0.1.0.0-alpha1" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index da33cf0..d6cc027 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -105,7 +105,6 @@
         open DeathSocket.GridPainter
         open TestingHelpers
         open FsCheck.Xunit
-        open SkiaSharp
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the
@@ -176,7 +175,7 @@
             let result = determineVerticalLines (newNum()) (newNum()) (newNum())
             result.Length > 0
 
-        // Not working since update NuGet to 1.68
+        // This test fails when using SkiaSharp 1.68
         [<Property>]
         let ``Can apply grid to image and save it using SkiaSpec`` () =
             resetSavingTestArea()
@@ -192,6 +191,7 @@
             |> Async.RunSynchronously
             (File.Exists sPath) = true
 
+        // This test fails when using SkiaSharp 1.68
         [<Property>]
         let ``Can apply grid to image and save it using SkiaRGBSpec`` () =
             resetSavingTestArea()
diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj
index cd30cdd..51259fd 100644
--- a/TestCentre/TestCentre.fsproj
+++ b/TestCentre/TestCentre.fsproj
@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="SmoulderingBeachBall">
       <HintPath>..\packages\SmoulderingBeachBall.0.4.0-alpha1\lib\netstandard2.0\SmoulderingBeachBall.dll</HintPath>
@@ -110,10 +110,10 @@
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets'))" />
   </Target>
   <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
-  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" />
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/TestCentre/packages.config b/TestCentre/packages.config
index 3a9ef92..9c7fe0d 100644
--- a/TestCentre/packages.config
+++ b/TestCentre/packages.config
@@ -3,7 +3,7 @@
   <package id="FsCheck" version="2.13.0" targetFramework="net471" />
   <package id="FsCheck.Xunit" version="2.13.0" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
   <package id="SmoulderingBeachBall" version="0.4.0-alpha1" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />