From c0952f90363253683b5ffa051ff76acd18d203ec Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 25 Aug 2020 04:46:29 +0200
Subject: [PATCH] Use the version of OpenTK that is correctly sn (#1480)

Fixes #1479
---
 VERSIONS.txt                                              | 4 ++--
 nuget/SkiaSharp.Views.Forms.GTK.nuspec                    | 2 +-
 nuget/SkiaSharp.Views.Forms.WPF.nuspec                    | 4 ++--
 nuget/SkiaSharp.Views.WindowsForms.nuspec                 | 8 ++++----
 .../Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj  | 4 ++--
 samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj  | 4 ++--
 .../Desktop/SkiaSharpSample/SkiaSharpSample.csproj        | 4 ++--
 .../Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj    | 4 ++--
 .../SkiaSharp.Views.WindowsForms.csproj                   | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/VERSIONS.txt b/VERSIONS.txt
index f73a87aca..94a7e67bb 100644
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -9,8 +9,8 @@ Xamarin.Forms.Platform.WPF                      release     4.5.0.725
 Xamarin.Forms.Platform.GTK                      release     4.5.0.725
 Tizen.NET                                       release     4.0.0
 Tizen.NET.Sdk                                   release     1.0.9
-OpenTK                                          release     3.0.1
-OpenTK.GLControl                                release     3.0.1
+OpenTK                                          release     3.1.0
+OpenTK.GLControl                                release     3.1.0
 MSBuild.Sdk.Extras                              release     2.0.54
 Cake                                            release     0.38.4
 GtkSharp                                        release     3.22.24.37
diff --git a/nuget/SkiaSharp.Views.Forms.GTK.nuspec b/nuget/SkiaSharp.Views.Forms.GTK.nuspec
index d062a5907..13d847887 100644
--- a/nuget/SkiaSharp.Views.Forms.GTK.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.GTK.nuspec
@@ -34,7 +34,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
         <dependency id="SkiaSharp.Views.Gtk2" version="1.0.0" />
         <dependency id="SkiaSharp.Views.Forms" version="1.0.0" />
-        <dependency id="OpenTK" version="3.0.1" />
+        <dependency id="OpenTK" version="3.1.0" />
       </group>
     </dependencies>
 
diff --git a/nuget/SkiaSharp.Views.Forms.WPF.nuspec b/nuget/SkiaSharp.Views.Forms.WPF.nuspec
index be17ea38b..e8961656b 100644
--- a/nuget/SkiaSharp.Views.Forms.WPF.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.WPF.nuspec
@@ -35,8 +35,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp.Views.WindowsForms" version="1.0.0" />
         <dependency id="SkiaSharp.Views.WPF" version="1.0.0" />
         <dependency id="SkiaSharp.Views.Forms" version="1.0.0" />
-        <dependency id="OpenTK" version="3.0.1" />
-        <dependency id="OpenTK.GLControl" version="3.0.1" />
+        <dependency id="OpenTK" version="3.1.0" />
+        <dependency id="OpenTK.GLControl" version="3.1.0" />
       </group>
     </dependencies>
 
diff --git a/nuget/SkiaSharp.Views.WindowsForms.nuspec b/nuget/SkiaSharp.Views.WindowsForms.nuspec
index bfa15bea7..305b7c924 100644
--- a/nuget/SkiaSharp.Views.WindowsForms.nuspec
+++ b/nuget/SkiaSharp.Views.WindowsForms.nuspec
@@ -30,14 +30,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net462">
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
-        <dependency id="OpenTK" version="3.0.1" />
-        <dependency id="OpenTK.GLControl" version="3.0.1" />
+        <dependency id="OpenTK" version="3.1.0" />
+        <dependency id="OpenTK.GLControl" version="3.1.0" />
       </group>
       <group targetFramework="netcoreapp3.0">
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
-        <dependency id="OpenTK" version="3.0.1" />
-        <dependency id="OpenTK.GLControl" version="3.0.1" />
+        <dependency id="OpenTK" version="3.1.0" />
+        <dependency id="OpenTK.GLControl" version="3.1.0" />
       </group>
     </dependencies>
 
diff --git a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
index 2bdce4ba7..04073d122 100644
--- a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
@@ -51,8 +51,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
+    <PackageReference Include="OpenTK" Version="3.1.0" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">
       <Project>{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}</Project>
       <Name>SkiaSharp</Name>
diff --git a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj
index 9a56f476c..222105e7e 100644
--- a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj
@@ -54,8 +54,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
+    <PackageReference Include="OpenTK" Version="3.1.0" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">
       <Project>{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}</Project>
       <Name>SkiaSharp</Name>
diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
index ec872974f..ec9712823 100644
--- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
@@ -89,8 +89,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
+    <PackageReference Include="OpenTK" Version="3.1.0" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj">
       <Project>{2ae5d8c5-eac6-4515-89f2-a4994b41c925}</Project>
       <Name>HarfBuzzSharp</Name>
diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj
index 1bfe9d283..7f2f23fe5 100644
--- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj
@@ -97,8 +97,8 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
+    <PackageReference Include="OpenTK" Version="3.1.0" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
     <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj">
       <Project>{2ae5d8c5-eac6-4515-89f2-a4994b41c925}</Project>
       <Name>HarfBuzzSharp</Name>
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj
index 8122d03ab..b838764db 100644
--- a/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.WindowsForms/SkiaSharp.Views.WindowsForms.csproj
@@ -8,8 +8,8 @@
     <DefineConstants>$(DefineConstants);__DESKTOP__;__WINFORMS__</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.0.1" NoWarn="NU1701" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" NoWarn="NU1701" />
+    <PackageReference Include="OpenTK" Version="3.1.0" NoWarn="NU1701" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" NoWarn="NU1701" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.Windows.Forms" />