Skip to content

Commit

Permalink
[WPF] Platform and Maps nuget package (xamarin#1445)
Browse files Browse the repository at this point in the history 
* Change OpenTK version to latest stable

* Add Platform and Maps nuspec

* Restore sln
  • Loading branch information
@mohachouch @rmarinho
mohachouch authored and rmarinho committed Dec 21, 2017
1 parent 640e355 commit da439af
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 20 deletions.
29 changes: 29 additions & 0 deletions .nuspec/Xamarin.Forms.Maps.WPF.nuspec
View file
@@ -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>
30 changes: 30 additions & 0 deletions .nuspec/Xamarin.Forms.Platform.WPF.nuspec
View file
@@ -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>
12 changes: 10 additions & 2 deletions Xamarin.Forms.ControlGallery.WPF/App.config
View file
@@ -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>
14 changes: 7 additions & 7 deletions Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
View file
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Xamarin.Forms.ControlGallery.WPF/packages.config
View file
@@ -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>
1 change: 1 addition & 0 deletions Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
View file
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions Xamarin.Forms.Maps.WPF/app.config
View file
@@ -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>
15 changes: 8 additions & 7 deletions Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
View file
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions Xamarin.Forms.Platform.WPF/app.config
View file
@@ -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>
4 changes: 2 additions & 2 deletions Xamarin.Forms.Platform.WPF/packages.config
View file
@@ -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>
2 changes: 2 additions & 0 deletions Xamarin.Forms.sln
View file
Expand Up @@ -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
Expand Down

0 comments on commit da439af

Please sign in to comment.