From 486637f7af4b69b65402d8d3f5a8f03b91711ae7 Mon Sep 17 00:00:00 2001 From: Dave Kerr Date: Mon, 6 May 2019 22:32:59 +0800 Subject: [PATCH 1/4] chore: test new tag build --- appveyor.yml | 15 +++++++++++++++ source/SharpGL/SharedAssemblyInfo.cs | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c736d9b9..4d1052e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,3 +17,18 @@ build: # After the build as completed, analyse coverage and upload. on_success: - ps: ./source/SharpGL/coverage.ps1 + +# If we have a tag, deploy. +deploy: +- provider: NuGet + api_key: + secure: TWio+nDN8Ew7+OH7J3tLcEoM6DmxrIwfAr+2Ag8ROWJUEnXyoSAZ/I1GxBgB0qMd + on: + APPVEYOR_REPO_TAG: true +- provider: GitHub + auth_token: + secure: KTWUORrnJKPKLSf/3ROLY50T9UfgTMnKHf3OjBOv8tlY/DAxtlglRU3eM+j45fMt + artifact: SharpGL.nupkg, SharpGL.WPF.nuspec, SharpGL.WinForms.nuspec + on: + APPVEYOR_REPO_TAG: true + diff --git a/source/SharpGL/SharedAssemblyInfo.cs b/source/SharpGL/SharedAssemblyInfo.cs index 70a4ab83..e0732eb5 100644 --- a/source/SharpGL/SharedAssemblyInfo.cs +++ b/source/SharpGL/SharedAssemblyInfo.cs @@ -4,7 +4,7 @@ [assembly: AssemblyCompany("Dave Kerr")] [assembly: AssemblyProduct("SharpGL")] -[assembly: AssemblyCopyright("Copyright © Dave Kerr 2015")] +[assembly: AssemblyCopyright("Copyright © Dave Kerr 2019")] // Version information for an assembly consists of the following four values: // @@ -16,5 +16,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.1.0")] -[assembly: AssemblyFileVersion("2.4.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.1.1")] +[assembly: AssemblyFileVersion("2.4.1.1")] From c08fddbf0f00bf5fca228c8f22fb6d1dc3da5a51 Mon Sep 17 00:00:00 2001 From: Dave Kerr Date: Mon, 6 May 2019 23:02:08 +0800 Subject: [PATCH 2/4] docs: TOC fixes, deploy notes --- README.md | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7837c14e..c9f52dd0 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,16 @@ Check out the [Samples](https://github.com/dwmkerr/sharpgl/wiki/Samples), they'r - * [Getting Started](#getting-started) - * [Developer Guide](#developer-guide) - * [Sample Applications](#sample-applications) - * [Documentation](#documentation) - * [Credits, Sponsorship & Thanks](#credits-sponsorship--thanks) +* [Getting Started](#getting-started) +* [Developer Guide](#developer-guide) + * [Releasing](#releasing) +* [Sample Applications](#sample-applications) +* [Documentation](#documentation) +* [Credits, Sponsorship & Thanks](#credits-sponsorship--thanks) * [Built with SharpGL](#built-with-sharpgl) - * [Open Vogel](#open-vogel) - * [AgOpenGPS](#agopengps) - ## Getting Started Installing SharpGL is easy, just use NuGet: @@ -71,6 +69,16 @@ artifacts\ \coverage # Coverage Reports ``` +### Releasing + +To make and publish a release: + +1. Update the `SharedAssemblyInfo.cs` file with the version +2. Create the version tag (e.g. `git tag v3.2.1`) +3. Push the code and tags (e.g. `git push --follow-tags`) + +AppVeyor will automatically push the release to NuGet and GitHub. + ## Sample Applications There are a large number of sample applications that show how to use SharpGL. Check out the 'Samples' solution to see the samples that are available - they'll be documented soon. @@ -104,14 +112,14 @@ Many thanks to [Red Gate](http://www.red-gate.com/) who have kindly provided Sha Thanks for [JetBrains](http://www.jetbrains.com/) for sponsoring SharpGL with [Resharper](http://www.jetbrains.com/resharper/)! -# Built with SharpGL +## Built with SharpGL If you've got a project that uses SharpGL and you'd like to show it off, just add the details here in a PR! -## [Open Vogel](https://sites.google.com/site/gahvogel/) +**[Open Vogel](https://sites.google.com/site/gahvogel/)** Checkout https://sites.google.com/site/gahvogel/ to see a free, open source project which supports aerodynamics! -## [AgOpenGPS](https://github.com/farmerbriantee/AgOpenGPS) +**[AgOpenGPS](https://github.com/farmerbriantee/AgOpenGPS)** -This is the *very first* open source Precision Agricultural App! Built by [Brian Tischler](https://github.com/farmerbriantee), you can see (the discussions and excitement on this project with farmers across the world)[http://www.thecombineforum.com/forums/31-technology/278810-agopengps.html]! +This is the *very first* open source Precision Agricultural App! Built by [Brian Tischler](https://github.com/farmerbriantee), you can see [the discussions and excitement on this project with farmers across the world](http://www.thecombineforum.com/forums/31-technology/278810-agopengps.html)! From ee49387eed9f82994e03c53f2da5903068e09aef Mon Sep 17 00:00:00 2001 From: Dave Kerr Date: Mon, 6 May 2019 23:14:56 +0800 Subject: [PATCH 3/4] build: use nuspec --- release/README.md | 3 +++ .../Core/SharpGL.WPF/SharpGL.WPF.nuspec | 19 +++++++++++++++++++ .../SharpGL.WinForms/SharpGL.WinForms.nuspec | 19 +++++++++++++++++++ source/SharpGL/Core/SharpGL/SharpGL.nuspec | 16 ++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 release/README.md create mode 100644 source/SharpGL/Core/SharpGL.WPF/SharpGL.WPF.nuspec create mode 100644 source/SharpGL/Core/SharpGL.WinForms/SharpGL.WinForms.nuspec create mode 100644 source/SharpGL/Core/SharpGL/SharpGL.nuspec diff --git a/release/README.md b/release/README.md new file mode 100644 index 00000000..d152bdb0 --- /dev/null +++ b/release/README.md @@ -0,0 +1,3 @@ +# IMPORTANT + +All functionality and code in this folder is being deprecated. Releases will be handled by the scripts in the `source/SharpGL` folder and the AppVeyor. diff --git a/source/SharpGL/Core/SharpGL.WPF/SharpGL.WPF.nuspec b/source/SharpGL/Core/SharpGL.WPF/SharpGL.WPF.nuspec new file mode 100644 index 00000000..2e1e5b20 --- /dev/null +++ b/source/SharpGL/Core/SharpGL.WPF/SharpGL.WPF.nuspec @@ -0,0 +1,19 @@ + + + + $id$ + $version$ + SharpGL + Dave Kerr + Dave Kerr + https://github.com/dwmkerr/sharpgl + false + SharpGL wraps the popular OpenGL library. This package installs SharpGL and the WPF controls. + SharpGL wraps the popular OpenGL library. This package installs SharpGL and the WPF controls. + Copyright © Dave Kerr 2019 + SharpGL,OpenGL,WPF + + + + + diff --git a/source/SharpGL/Core/SharpGL.WinForms/SharpGL.WinForms.nuspec b/source/SharpGL/Core/SharpGL.WinForms/SharpGL.WinForms.nuspec new file mode 100644 index 00000000..372921ce --- /dev/null +++ b/source/SharpGL/Core/SharpGL.WinForms/SharpGL.WinForms.nuspec @@ -0,0 +1,19 @@ + + + + $id$ + $version$ + SharpGL for WinForms + Dave Kerr + Dave Kerr + https://github.com/dwmkerr/sharpgl + false + SharpGL wraps the popular OpenGL library. This package installs SharpGL and the WinForms controls. + SharpGL wraps the popular OpenGL library. This package installs SharpGL and the WinForms controls. + Copyright © Dave Kerr 2019 + SharpGL,OpenGL,WinForms + + + + + diff --git a/source/SharpGL/Core/SharpGL/SharpGL.nuspec b/source/SharpGL/Core/SharpGL/SharpGL.nuspec new file mode 100644 index 00000000..4e6f093c --- /dev/null +++ b/source/SharpGL/Core/SharpGL/SharpGL.nuspec @@ -0,0 +1,16 @@ + + + + $id$ + $version$ + SharpGL + Dave Kerr + Dave Kerr + https://github.com/dwmkerr/sharpgl + false + SharpGL is the core library for SharpGL. It provides wrappers for all OpenGL functions and also includes the Scene Graph classes. Installed as part of SharpGL for WinForms or SharpGL for WPF. + SharpGL is the core library for SharpGL. It provides wrappers for all OpenGL functions and also includes the Scene Graph classes. Installed as part of SharpGL for WinForms or SharpGL for WPF. + Copyright © Dave Kerr 2019 + SharpGL,OpenGL + + From c37db10ae7496554cc9bf8f19aa3a02d74229149 Mon Sep 17 00:00:00 2001 From: Dave Kerr Date: Tue, 7 May 2019 00:11:55 +0800 Subject: [PATCH 4/4] build: publish nuget --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 4d1052e1..7bb7570d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ before_build: build: project: source/SharpGL/SharpGL.sln + publish_nuget: true verbosity: minimal # After the build as completed, analyse coverage and upload.