Merge pull request #392 from varon/nuget-package-dev

Add a pre-release NuGet package
This commit is contained in:
varon 2016-05-25 23:51:05 +02:00
commit aa41971b3b
5 changed files with 16 additions and 11 deletions

View file

@ -70,18 +70,18 @@
<Output TaskParameter="Lines" ItemName="Version" /> <Output TaskParameter="Lines" ItemName="Version" />
</ReadLinesFromFile> </ReadLinesFromFile>
<!-- Execute nuget script --> <!-- Execute nuget script -->
<Exec Command="nuget.exe pack OpenTK.nuspec -Version @(Version)" Condition="$(OS) == 'Windows_NT'" /> <Exec Command="nuget.exe pack OpenTK.Next.nuspec -Version @(Version)" Condition="$(OS) == 'Windows_NT'" />
<Exec Command="nuget.exe pack OpenTK.GLControl.nuspec -Version @(Version)" Condition="$(OS) == 'Windows_NT'" /> <Exec Command="nuget.exe pack OpenTK.Next.GLControl.nuspec -Version @(Version)" Condition="$(OS) == 'Windows_NT'" />
<Exec Command="mono nuget.exe pack OpenTK.nuspec -Version @(Version)" Condition="$(OS) != 'Windows_NT'" /> <Exec Command="mono nuget.exe pack OpenTK.Next.nuspec -Version @(Version)" Condition="$(OS) != 'Windows_NT'" />
<Exec Command="mono nuget.exe pack OpenTK.GLControl.nuspec -Version @(Version)" Condition="$(OS) != 'Windows_NT'" /> <Exec Command="mono nuget.exe pack OpenTK.Next.GLControl.nuspec -Version @(Version)" Condition="$(OS) != 'Windows_NT'" />
<!-- Copy the nuget archive to the root directory and add a date stamp --> <!-- Copy the nuget archive to the root directory and add a date stamp -->
<CreateItem Include="OpenTK*.nupkg"> <CreateItem Include="OpenTK.Next*.nupkg">
<Output TaskParameter="Include" ItemName="NugetPackage" /> <Output TaskParameter="Include" ItemName="NugetPackage" />
</CreateItem> </CreateItem>
<Copy SourceFiles="@(NugetPackage)" DestinationFolder="../../" /> <Copy SourceFiles="@(NugetPackage)" DestinationFolder="../../" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CreateItem Include="OpenTK.*.nupkg;lib/**"> <CreateItem Include="OpenTK.Next.*.nupkg;lib/**">
<Output TaskParameter="Include" ItemName="FilesToDelete" /> <Output TaskParameter="Include" ItemName="FilesToDelete" />
</CreateItem> </CreateItem>
<Delete Files="@(FilesToDelete)" /> <Delete Files="@(FilesToDelete)" />
@ -91,8 +91,8 @@
<CallTarget Targets="Build" /> <CallTarget Targets="Build" />
</Target> </Target>
<ItemGroup> <ItemGroup>
<None Include="OpenTK.nuspec" /> <None Include="OpenTK.Next.nuspec" />
<None Include="OpenTK.GLControl.nuspec" /> <None Include="OpenTK.Next.GLControl.nuspec" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="nuget.exe" /> <Content Include="nuget.exe" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>OpenTK.GLControl</id> <id>OpenTK.Next.GLControl</id>
<version>$version$</version> <version>$version$</version>
<authors>The Open Toolkit Team</authors> <authors>The Open Toolkit Team</authors>
<owners>The Open Toolkit Team</owners> <owners>The Open Toolkit Team</owners>
@ -13,6 +13,8 @@
Add OpenGL graphics to your Windows.Forms or WPF application Add OpenGL graphics to your Windows.Forms or WPF application
</summary> </summary>
<description> <description>
This package is community-run and supercedes the old OpenTK.GLControl package.
OpenTK.GLControl is a Windows.Forms Control with OpenGL rendering capabilities. Use it to add OpenTK.GLControl is a Windows.Forms Control with OpenGL rendering capabilities. Use it to add
accelerated 3d graphics to your Windows.Forms or Windows Presentation Foundation (WPF) application. accelerated 3d graphics to your Windows.Forms or Windows Presentation Foundation (WPF) application.

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>OpenTK</id> <id>OpenTK.Next</id>
<version>$version$</version> <version>$version$</version>
<authors>The Open Toolkit Team</authors> <authors>The Open Toolkit Team</authors>
<owners>The Open Toolkit Team</owners> <owners>The Open Toolkit Team</owners>
@ -13,6 +13,8 @@
The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES and OpenAL. The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES and OpenAL.
</summary> </summary>
<description> <description>
This package is community-run and supercedes the old OpenTK package.
The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES and OpenAL. The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES and OpenAL.
It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality. It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality.

View file

@ -195,6 +195,7 @@ Global
{ADC34399-7613-44D2-90B2-19250F12FE7B}.Nsis|Any CPU.ActiveCfg = Nsis|Any CPU {ADC34399-7613-44D2-90B2-19250F12FE7B}.Nsis|Any CPU.ActiveCfg = Nsis|Any CPU
{ADC34399-7613-44D2-90B2-19250F12FE7B}.Nsis|Any CPU.Build.0 = Nsis|Any CPU {ADC34399-7613-44D2-90B2-19250F12FE7B}.Nsis|Any CPU.Build.0 = Nsis|Any CPU
{ADC34399-7613-44D2-90B2-19250F12FE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADC34399-7613-44D2-90B2-19250F12FE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ADC34399-7613-44D2-90B2-19250F12FE7B}.Release|Any CPU.Build.0 = Release|Any CPU
{ADC34399-7613-44D2-90B2-19250F12FE7B}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|Any CPU {ADC34399-7613-44D2-90B2-19250F12FE7B}.ReleaseMinimal|Any CPU.ActiveCfg = ReleaseMinimal|Any CPU
{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C426C9D1-8857-4E52-BAC7-4C05EE6070AB}.Debug|Any CPU.Build.0 = Debug|Any CPU

View file

@ -69,7 +69,7 @@ namespace Build.UpdateVersion
string minor = Minor; string minor = Minor;
// Version is defined as {Major}.{Minor}.{Build}.{Revision} // Version is defined as {Major}.{Minor}.{Build}.{Revision}
string version = String.Format("{0}.{1}.{2}.{3}", major, minor, build, revision); string version = String.Format("{0}.{1}.{2}.{3}-pre", major, minor, build, revision);
Console.WriteLine("API compatibility key: {0}.{1}", major, minor); Console.WriteLine("API compatibility key: {0}.{1}", major, minor);
Console.WriteLine("Build date: {0}", timestamp); Console.WriteLine("Build date: {0}", timestamp);