From 972a06060b60fdd6660821472811723a7f554360 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 19:16:06 -0400 Subject: [PATCH 01/11] Documents the versioning system --- .github/CONTRIBUTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f750428a65..50b3827b1e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -90,7 +90,11 @@ Instead you can use object orientation, or simply placing repeated code in a fun This means stuff like having a "mode" variable for an object set to "1" or "2" with no clear indicator of what that means. Make these #defines with a name that more clearly states what it's for. This is clearer and enhances readability of your code! Get used to doing it! ### Do not commit modifications to Version.cs -This file will be updated by maintainers when they deem it prudent to release a new version +This file will be updated by maintainers when they deem it prudent to release a new version. For reference here is the version format we use 3.... The criteria for changing a version number is as follows + +- Major: A breaking change to the DMAPI +- Minor: Additions or changes to the interface or DMAPI +- Patch: Non-breaking changes internal to each of the 3 modules (Service, Interface, DMAPI) ### Formatting From c90d9a30b11da5edc935b7e288c0d57e10aa3074 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 19:17:30 -0400 Subject: [PATCH 02/11] Proper formatting --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 50b3827b1e..b20123d9fd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -90,7 +90,7 @@ Instead you can use object orientation, or simply placing repeated code in a fun This means stuff like having a "mode" variable for an object set to "1" or "2" with no clear indicator of what that means. Make these #defines with a name that more clearly states what it's for. This is clearer and enhances readability of your code! Get used to doing it! ### Do not commit modifications to Version.cs -This file will be updated by maintainers when they deem it prudent to release a new version. For reference here is the version format we use 3.... The criteria for changing a version number is as follows +This file will be updated by maintainers when they deem it prudent to release a new version. For reference here is the version format we use 3.\.\.\ The criteria for changing a version number is as follows - Major: A breaking change to the DMAPI - Minor: Additions or changes to the interface or DMAPI From 0bd7669f90e6375c04e1a5933587c8b1f5b5f697 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 20:41:10 -0400 Subject: [PATCH 03/11] Caches nuget packages --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 8b30349763..3e0b4e6c8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,8 @@ artifacts: name: TGS3Client - path: MD5-SHA1-Client-v*.txt name: MD5SHA1Client +cache: + - packages -> **\packages.config install: - choco install fciv doxygen.portable graphviz.portable before_build: From b3e6905e268e2d201c7c9323b8e9ecb78df30dfd Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 31 Oct 2017 20:57:49 -0400 Subject: [PATCH 04/11] Adds a nuget package for the interface --- .github/CONTRIBUTING.md | 4 ++++ TGServiceInterface/TGServiceInterface.csproj | 1 + TGServiceInterface/TGServiceInterface.nuspec | 24 ++++++++++++++++++++ appveyor.yml | 23 ++++++++++++------- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 TGServiceInterface/TGServiceInterface.nuspec diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f750428a65..05be7c55cf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -158,3 +158,7 @@ Just becuase something isn't on this list doesn't mean that it's acceptable. Use Yes, we know that the files have a tonne of mixed Windows and Linux line endings. Attempts to fix this have been met with less than stellar success, and as such we have decided to give up caring until there comes a time when it matters. Therefore, EOF settings of main repo are forbidden territory one must avoid wandering into, at risk of losing body and/or mind to the Git gods. + +## Other Notes + +* Feel free to add your nuget account to TGServiceInterface/Packages.nuspec authors list if you modify the interface \ No newline at end of file diff --git a/TGServiceInterface/TGServiceInterface.csproj b/TGServiceInterface/TGServiceInterface.csproj index ea546a5b8a..1690c9acb1 100644 --- a/TGServiceInterface/TGServiceInterface.csproj +++ b/TGServiceInterface/TGServiceInterface.csproj @@ -72,6 +72,7 @@ + diff --git a/TGServiceInterface/TGServiceInterface.nuspec b/TGServiceInterface/TGServiceInterface.nuspec new file mode 100644 index 0000000000..714b50e1bb --- /dev/null +++ b/TGServiceInterface/TGServiceInterface.nuspec @@ -0,0 +1,24 @@ + + + + TGStation.Server.Interface + $version$ + Cyberboss + Cyberboss + https://github.com/tgstation/tgstation-server/blob/master/LICENSE + https://github.com/tgstation/tgstation-server + https://tgstation.github.io/tgstation-server/tgs.ico + false + Interface for managing /tg/station server + Copyright 2017 + tgstation game-server byond service toolset wcf ss13 client-lib tgstation-server api wcf-service soap + + + + + + + + + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 8b30349763..8476355bcc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,12 +29,19 @@ after_build: - ps: if($env:APPVEYOR_REPO_COMMIT_MESSAGE -match "\[TGSDeploy\]"){$env:TGSDeploy = "Do it."} - ps: $env:TGSVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$env:APPVEYOR_BUILD_FOLDER/TGServerService/bin/x86/Release/TGServerService.exe").FileVersion deploy: - release: "tgstation-server-v$(TGSVersion)" - description: 'The /tg/station server suite' - provider: GitHub - auth_token: + - provider: GitHub + release: "tgstation-server-v$(TGSVersion)" + description: 'The /tg/station server suite' + auth_token: secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK - artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client - draft: false - on: - TGSDeploy: "Do it." + artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client + draft: false + on: + TGSDeploy: "Do it." + - provider: NuGet + api_key: + secure: bedsYuLMqGREzkVkJqRx+BTMgOvDO76tgaNc8sW5E3Ao6iw8oGHdJ/BZov8y0iKa + skip_symbols: true + artifact: /.*\.nupkg/ + on: + TGSDeploy: "Do it." From 082cb4a42135e8dffd0fec90597543f8398799ae Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 31 Oct 2017 21:21:50 -0400 Subject: [PATCH 05/11] Make nuget things a little better --- TGServiceInterface/TGServiceInterface.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TGServiceInterface/TGServiceInterface.nuspec b/TGServiceInterface/TGServiceInterface.nuspec index 714b50e1bb..1fcc57fd2a 100644 --- a/TGServiceInterface/TGServiceInterface.nuspec +++ b/TGServiceInterface/TGServiceInterface.nuspec @@ -1,16 +1,16 @@ - TGStation.Server.Interface + $id$ $version$ Cyberboss - Cyberboss https://github.com/tgstation/tgstation-server/blob/master/LICENSE https://github.com/tgstation/tgstation-server https://tgstation.github.io/tgstation-server/tgs.ico false Interface for managing /tg/station server Copyright 2017 + https://github.com/tgstation/tgstation-server/releases/tag/tgstation-server-v$version$ tgstation game-server byond service toolset wcf ss13 client-lib tgstation-server api wcf-service soap From 858f34eb7f9956ed14f6988eb2f3c55954f5ddf2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 21:43:53 -0400 Subject: [PATCH 06/11] Version bump to 3.1.6.3 [TGSDeploy] --- Version.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version.cs b/Version.cs index 857215dc2e..a2cab3979f 100644 --- a/Version.cs +++ b/Version.cs @@ -12,6 +12,6 @@ using System.Reflection; // [assembly: AssemblyVersion("1.0.*")] //It's impossible to make these a define, don't say I didn't warn you -[assembly: AssemblyVersion("3.1.6.2")] -[assembly: AssemblyFileVersion("3.1.6.2")] -[assembly: AssemblyInformationalVersion("3.1.6.2")] +[assembly: AssemblyVersion("3.1.6.3")] +[assembly: AssemblyFileVersion("3.1.6.3")] +[assembly: AssemblyInformationalVersion("3.1.6.3")] From 084f202315b94ef1a540a4166477aa0b26666194 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 22:03:23 -0400 Subject: [PATCH 07/11] Fix github release token [TGSDeploy] --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5546814415..ac90a6dabb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,7 @@ deploy: release: "tgstation-server-v$(TGSVersion)" description: 'The /tg/station server suite' auth_token: - secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK + secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client draft: false on: From 7f70509b224f6b44178041dcba466f14b09605ef Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 22:42:47 -0400 Subject: [PATCH 08/11] Fixes nuget not packing --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index ac90a6dabb..11c3ad0381 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,6 +26,7 @@ build: project: TGStationServer3.sln parallel: true verbosity: minimal + publish_nuget: true after_build: - ps: .\Tools\TGS3Build.ps1 - ps: if($env:APPVEYOR_REPO_COMMIT_MESSAGE -match "\[TGSDeploy\]"){$env:TGSDeploy = "Do it."} From b2a4d4d212724efe9292396c42fa8bde061fbe09 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 23:12:01 -0400 Subject: [PATCH 09/11] Removes the unmanaged exports nuget dependency [TGSDeploy] --- TGServiceInterface/TGServiceInterface.nuspec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/TGServiceInterface/TGServiceInterface.nuspec b/TGServiceInterface/TGServiceInterface.nuspec index 1fcc57fd2a..43fb6d2479 100644 --- a/TGServiceInterface/TGServiceInterface.nuspec +++ b/TGServiceInterface/TGServiceInterface.nuspec @@ -12,13 +12,8 @@ Copyright 2017 https://github.com/tgstation/tgstation-server/releases/tag/tgstation-server-v$version$ tgstation game-server byond service toolset wcf ss13 client-lib tgstation-server api wcf-service soap - - - - - - \ No newline at end of file + From 5eb74832b43790a7ce1f33e5af845dd3e0cc7fc9 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 31 Oct 2017 23:21:19 -0400 Subject: [PATCH 10/11] Version bump to 3.1.6.4 [TGSDeploy] --- Version.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version.cs b/Version.cs index a2cab3979f..459e6ec13c 100644 --- a/Version.cs +++ b/Version.cs @@ -12,6 +12,6 @@ using System.Reflection; // [assembly: AssemblyVersion("1.0.*")] //It's impossible to make these a define, don't say I didn't warn you -[assembly: AssemblyVersion("3.1.6.3")] -[assembly: AssemblyFileVersion("3.1.6.3")] -[assembly: AssemblyInformationalVersion("3.1.6.3")] +[assembly: AssemblyVersion("3.1.6.4")] +[assembly: AssemblyFileVersion("3.1.6.4")] +[assembly: AssemblyInformationalVersion("3.1.6.4")] From f132d70f17fa00ad29b260f61d2e6f17bdf94636 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 1 Nov 2017 09:58:17 -0400 Subject: [PATCH 11/11] Removes UnmanagedExports nupkg dependency for real --- TGServiceInterface/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TGServiceInterface/packages.config b/TGServiceInterface/packages.config index bfd9f475da..cb56911aa6 100644 --- a/TGServiceInterface/packages.config +++ b/TGServiceInterface/packages.config @@ -1,4 +1,4 @@  - - \ No newline at end of file + +