From da439af0d48ccfacd845deab772038723d568f81 Mon Sep 17 00:00:00 2001
From: Mohamed CHOUCHANE <mohamed.chouchane1990@gmail.com>
Date: Thu, 21 Dec 2017 20:40:07 +0100
Subject: [PATCH] [WPF] Platform and Maps nuget package (#1445)

* Change OpenTK version to latest stable

* Add Platform and Maps nuspec

* Restore sln
---
 .nuspec/Xamarin.Forms.Maps.WPF.nuspec         | 29 ++++++++++++++++++
 .nuspec/Xamarin.Forms.Platform.WPF.nuspec     | 30 +++++++++++++++++++
 Xamarin.Forms.ControlGallery.WPF/App.config   | 12 ++++++--
 .../Xamarin.Forms.ControlGallery.WPF.csproj   | 14 ++++-----
 .../packages.config                           |  4 +--
 .../Xamarin.Forms.Maps.WPF.csproj             |  1 +
 Xamarin.Forms.Maps.WPF/app.config             | 11 +++++++
 .../Xamarin.Forms.Platform.WPF.csproj         | 15 +++++-----
 Xamarin.Forms.Platform.WPF/app.config         | 11 +++++++
 Xamarin.Forms.Platform.WPF/packages.config    |  4 +--
 Xamarin.Forms.sln                             |  2 ++
 11 files changed, 113 insertions(+), 20 deletions(-)
 create mode 100644 .nuspec/Xamarin.Forms.Maps.WPF.nuspec
 create mode 100644 .nuspec/Xamarin.Forms.Platform.WPF.nuspec
 create mode 100644 Xamarin.Forms.Maps.WPF/app.config
 create mode 100644 Xamarin.Forms.Platform.WPF/app.config

diff --git a/.nuspec/Xamarin.Forms.Maps.WPF.nuspec b/.nuspec/Xamarin.Forms.Maps.WPF.nuspec
new file mode 100644
index 00000000000..30f0655416c
--- /dev/null
+++ b/.nuspec/Xamarin.Forms.Maps.WPF.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Xamarin.Forms.Maps.WPF$IdAppend$</id>
+    <version>$version$</version>
+    <authors>Xamarin, Inc.</authors>
+    <owners>Xamarin, Inc.</owners>
+    <tags>xamarin forms maps xamarinforms xamarinformsmaps xamarin.forms.maps wpf</tags>
+    <licenseUrl>http://aka.ms/xamarin-forms-license</licenseUrl>
+    <iconUrl>http://xamarin.com/content/images/nuget/xamarin.png</iconUrl>
+    <projectUrl>http://xamarin.com/forms</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Xamarin.Forms.Maps Renderer for WPF</description>
+    <copyright>Copyright 2013-2017</copyright>
+    <dependencies>
+      <group>
+        <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
+        <dependency id="Xamarin.Forms.Maps$IdAppend$" version="$version$"/>
+      </group>
+      <group targetFramework="net45">
+        <dependency id="Microsoft.Maps.MapControl.WPF" version="1.0.0.3"/>
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.dll" target="lib\net45" />
+    <file src="..\Xamarin.Forms.Maps.WPF\bin\$Configuration$\Xamarin.Forms.Maps.WPF.*pdb" target="lib\net45" />
+  </files>
+</package>
diff --git a/.nuspec/Xamarin.Forms.Platform.WPF.nuspec b/.nuspec/Xamarin.Forms.Platform.WPF.nuspec
new file mode 100644
index 00000000000..3c64caa2de2
--- /dev/null
+++ b/.nuspec/Xamarin.Forms.Platform.WPF.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>Xamarin.Forms.Platform.WPF$IdAppend$</id>
+    <version>$version$</version>
+    <authors>Xamarin, Inc.</authors>
+    <owners>Xamarin, Inc.</owners>
+    <tags>xamarin forms xamarinforms xamarin.forms wpf</tags>
+    <licenseUrl>http://aka.ms/xamarin-forms-license</licenseUrl>
+    <iconUrl>http://xamarin.com/content/images/nuget/xamarin.png</iconUrl>
+    <projectUrl>http://xamarin.com/forms</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Xamarin Forms Renderer to build native UIs for WPF</description>
+    <copyright>Copyright 2013-2017</copyright>
+    <dependencies>
+      <group>
+        <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
+      </group>
+      <group targetFramework="net45">
+        <dependency id="WpfLightToolkit" version="1.0.1"/>
+        <dependency id="OpenTK" version="2.0.0"/>
+        <dependency id="OpenTK.GLControl" version="1.1.2349.61993"/>
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.dll" target="lib\net45" />
+    <file src="..\Xamarin.Forms.Platform.WPF\bin\$Configuration$\Xamarin.Forms.Platform.WPF.*pdb" target="lib\net45" />
+  </files>
+</package>
diff --git a/Xamarin.Forms.ControlGallery.WPF/App.config b/Xamarin.Forms.ControlGallery.WPF/App.config
index bae5d6d8145..ad0aecd4146 100644
--- a/Xamarin.Forms.ControlGallery.WPF/App.config
+++ b/Xamarin.Forms.ControlGallery.WPF/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj b/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
index 4382117f5e9..273699def6e 100644
--- a/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
+++ b/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
@@ -39,13 +39,11 @@
     <Reference Include="Microsoft.Maps.MapControl.WPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Maps.MapControl.WPF.1.0.0.3\lib\net40-Client\Microsoft.Maps.MapControl.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK.GLControl, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.GLControl.3.0.0-pre\lib\net20\OpenTK.GLControl.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -103,7 +101,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="OpenTK.dll.config" />
+    <None Include="OpenTK.dll.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/Xamarin.Forms.ControlGallery.WPF/packages.config b/Xamarin.Forms.ControlGallery.WPF/packages.config
index 917794424a9..287b9cdf5c6 100644
--- a/Xamarin.Forms.ControlGallery.WPF/packages.config
+++ b/Xamarin.Forms.ControlGallery.WPF/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Maps.MapControl.WPF" version="1.0.0.3" targetFramework="net45" />
-  <package id="OpenTK" version="3.0.0-pre" targetFramework="net45" />
-  <package id="OpenTK.GLControl" version="3.0.0-pre" targetFramework="net45" />
+  <package id="OpenTK" version="2.0.0" targetFramework="net461" />
+  <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net461" />
   <package id="WpfLightToolkit" version="1.0.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj b/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
index 10f35574fce..0702e1baa06 100644
--- a/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
+++ b/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
@@ -73,6 +73,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Xamarin.Forms.Maps.WPF/app.config b/Xamarin.Forms.Maps.WPF/app.config
new file mode 100644
index 00000000000..d4f722e0552
--- /dev/null
+++ b/Xamarin.Forms.Maps.WPF/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj b/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
index 759ffcc3089..9db81a8f084 100644
--- a/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
+++ b/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
@@ -34,13 +34,11 @@
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK.GLControl, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.GLControl.3.0.0-pre\lib\net20\OpenTK.GLControl.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -150,7 +148,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="OpenTK.dll.config" />
+    <None Include="app.config" />
+    <None Include="OpenTK.dll.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Xamarin.Forms.Platform.WPF/app.config b/Xamarin.Forms.Platform.WPF/app.config
new file mode 100644
index 00000000000..d4f722e0552
--- /dev/null
+++ b/Xamarin.Forms.Platform.WPF/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.WPF/packages.config b/Xamarin.Forms.Platform.WPF/packages.config
index 930cb634eab..b8e4b1a1741 100644
--- a/Xamarin.Forms.Platform.WPF/packages.config
+++ b/Xamarin.Forms.Platform.WPF/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK" version="3.0.0-pre" targetFramework="net45" />
-  <package id="OpenTK.GLControl" version="3.0.0-pre" targetFramework="net45" />
+  <package id="OpenTK" version="2.0.0" targetFramework="net461" />
+  <package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net461" />
   <package id="WpfLightToolkit" version="1.0.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index b38fdaf0414..9700db40fa9 100644
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -34,9 +34,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12
 		.nuspec\Xamarin.Forms.DefaultItems.props = .nuspec\Xamarin.Forms.DefaultItems.props
 		.nuspec\Xamarin.Forms.DefaultItems.targets = .nuspec\Xamarin.Forms.DefaultItems.targets
 		.nuspec\Xamarin.Forms.Maps.nuspec = .nuspec\Xamarin.Forms.Maps.nuspec
+		.nuspec\Xamarin.Forms.Maps.WPF.nuspec = .nuspec\Xamarin.Forms.Maps.WPF.nuspec
 		.nuspec\Xamarin.Forms.nuspec = .nuspec\Xamarin.Forms.nuspec
 		.nuspec\Xamarin.Forms.Pages.Azure.nuspec = .nuspec\Xamarin.Forms.Pages.Azure.nuspec
 		.nuspec\Xamarin.Forms.Pages.nuspec = .nuspec\Xamarin.Forms.Pages.nuspec
+		.nuspec\Xamarin.Forms.Platform.WPF.nuspec = .nuspec\Xamarin.Forms.Platform.WPF.nuspec
 		.nuspec\Xamarin.Forms.props = .nuspec\Xamarin.Forms.props
 		.nuspec\Xamarin.Forms.targets = .nuspec\Xamarin.Forms.targets
 	EndProjectSection