From 2e4c34d6a9a889d6c7b2f61540a5340ab064f84a Mon Sep 17 00:00:00 2001 From: Varon Date: Sat, 30 Apr 2016 12:17:45 +0200 Subject: [PATCH 1/4] Updated nuspecs to change package Id to OpenTK.Community --- Installers/Nuget/Build.Installer.Nuget.csproj | 16 ++++++++-------- ....nuspec => OpenTK.Community.GLControl.nuspec} | 4 +++- .../{OpenTK.nuspec => OpenTK.Community.nuspec} | 4 +++- 3 files changed, 14 insertions(+), 10 deletions(-) rename Installers/Nuget/{OpenTK.GLControl.nuspec => OpenTK.Community.GLControl.nuspec} (94%) rename Installers/Nuget/{OpenTK.nuspec => OpenTK.Community.nuspec} (95%) diff --git a/Installers/Nuget/Build.Installer.Nuget.csproj b/Installers/Nuget/Build.Installer.Nuget.csproj index 7a8f7630..0a5e221a 100644 --- a/Installers/Nuget/Build.Installer.Nuget.csproj +++ b/Installers/Nuget/Build.Installer.Nuget.csproj @@ -70,18 +70,18 @@ - - - - + + + + - + - + @@ -91,8 +91,8 @@ - - + + diff --git a/Installers/Nuget/OpenTK.GLControl.nuspec b/Installers/Nuget/OpenTK.Community.GLControl.nuspec similarity index 94% rename from Installers/Nuget/OpenTK.GLControl.nuspec rename to Installers/Nuget/OpenTK.Community.GLControl.nuspec index b694f900..406d38cf 100644 --- a/Installers/Nuget/OpenTK.GLControl.nuspec +++ b/Installers/Nuget/OpenTK.Community.GLControl.nuspec @@ -1,7 +1,7 @@ - OpenTK.GLControl + OpenTK.Community.GLControl $version$ The Open Toolkit Team The Open Toolkit Team @@ -13,6 +13,8 @@ Add OpenGL graphics to your Windows.Forms or WPF application + 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 accelerated 3d graphics to your Windows.Forms or Windows Presentation Foundation (WPF) application. diff --git a/Installers/Nuget/OpenTK.nuspec b/Installers/Nuget/OpenTK.Community.nuspec similarity index 95% rename from Installers/Nuget/OpenTK.nuspec rename to Installers/Nuget/OpenTK.Community.nuspec index a7249e0b..28e0aa13 100644 --- a/Installers/Nuget/OpenTK.nuspec +++ b/Installers/Nuget/OpenTK.Community.nuspec @@ -1,7 +1,7 @@ - OpenTK + OpenTK.Community $version$ The Open Toolkit Team The Open Toolkit Team @@ -13,6 +13,8 @@ The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES and OpenAL. + 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. It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality. From 630f34004a3064eac638d6bd8f399a178cf7bd81 Mon Sep 17 00:00:00 2001 From: Varon Date: Tue, 24 May 2016 18:45:33 +0200 Subject: [PATCH 2/4] Renamed OpenTK.Community to OpenTK.Next --- Installers/Nuget/Build.Installer.Nuget.csproj | 16 ++++++++-------- ...ntrol.nuspec => OpenTK.Next.GLControl.nuspec} | 2 +- ...penTK.Community.nuspec => OpenTK.Next.nuspec} | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) rename Installers/Nuget/{OpenTK.Community.GLControl.nuspec => OpenTK.Next.GLControl.nuspec} (98%) rename Installers/Nuget/{OpenTK.Community.nuspec => OpenTK.Next.nuspec} (98%) diff --git a/Installers/Nuget/Build.Installer.Nuget.csproj b/Installers/Nuget/Build.Installer.Nuget.csproj index 0a5e221a..1a779b1d 100644 --- a/Installers/Nuget/Build.Installer.Nuget.csproj +++ b/Installers/Nuget/Build.Installer.Nuget.csproj @@ -70,18 +70,18 @@ - - - - + + + + - + - + @@ -91,8 +91,8 @@ - - + + diff --git a/Installers/Nuget/OpenTK.Community.GLControl.nuspec b/Installers/Nuget/OpenTK.Next.GLControl.nuspec similarity index 98% rename from Installers/Nuget/OpenTK.Community.GLControl.nuspec rename to Installers/Nuget/OpenTK.Next.GLControl.nuspec index 406d38cf..7eb5af39 100644 --- a/Installers/Nuget/OpenTK.Community.GLControl.nuspec +++ b/Installers/Nuget/OpenTK.Next.GLControl.nuspec @@ -1,7 +1,7 @@ - OpenTK.Community.GLControl + OpenTK.Next.GLControl $version$ The Open Toolkit Team The Open Toolkit Team diff --git a/Installers/Nuget/OpenTK.Community.nuspec b/Installers/Nuget/OpenTK.Next.nuspec similarity index 98% rename from Installers/Nuget/OpenTK.Community.nuspec rename to Installers/Nuget/OpenTK.Next.nuspec index 28e0aa13..b3fbe019 100644 --- a/Installers/Nuget/OpenTK.Community.nuspec +++ b/Installers/Nuget/OpenTK.Next.nuspec @@ -1,7 +1,7 @@ - OpenTK.Community + OpenTK.Next $version$ The Open Toolkit Team The Open Toolkit Team From 2795b83526f71a1a330477890ad6e8c0ed40b24c Mon Sep 17 00:00:00 2001 From: Varon Date: Tue, 24 May 2016 19:06:20 +0200 Subject: [PATCH 3/4] Added NuGet to release build --- OpenTK.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenTK.sln b/OpenTK.sln index 5fbece57..75732ba4 100644 --- a/OpenTK.sln +++ b/OpenTK.sln @@ -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.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.Build.0 = Release|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.Build.0 = Debug|Any CPU From 23f719bad51a11c6faee0f5527d7caa849f71c28 Mon Sep 17 00:00:00 2001 From: Varon Date: Tue, 24 May 2016 19:13:55 +0200 Subject: [PATCH 4/4] updated nuget version to include '-pre' tag --- Source/Build.UpdateVersion/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Build.UpdateVersion/Program.cs b/Source/Build.UpdateVersion/Program.cs index ff6cc1dc..47c27b8e 100644 --- a/Source/Build.UpdateVersion/Program.cs +++ b/Source/Build.UpdateVersion/Program.cs @@ -69,7 +69,7 @@ namespace Build.UpdateVersion string minor = Minor; // 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("Build date: {0}", timestamp);