Merge branch 'master' into Cyberboss-patch-4

.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.\<major\>.\<minor\>.\<patch\> 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
 
@@ -158,3 +162,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

TGServiceInterface/TGServiceInterface.csproj

@@ -72,6 +72,7 @@
     <Content Include="tgs.ico" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="TGServiceInterface.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

TGServiceInterface/TGServiceInterface.nuspec

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>Cyberboss</authors>
+    <licenseUrl>https://github.com/tgstation/tgstation-server/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/tgstation/tgstation-server</projectUrl>
+    <iconUrl>https://tgstation.github.io/tgstation-server/tgs.ico</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Interface for managing /tg/station server</description>
+    <copyright>Copyright 2017</copyright>
+    <releaseNotes>https://github.com/tgstation/tgstation-server/releases/tag/tgstation-server-v$version$</releaseNotes>
+    <tags>tgstation game-server byond service toolset wcf ss13 client-lib tgstation-server api wcf-service soap</tags>
+  </metadata>
+  <files>
+    <file src="bin\x86\Release\TGServiceInterface.xml" target="lib\net452" />
+  </files>
+</package>

TGServiceInterface/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="UnmanagedExports" version="1.2.7" targetFramework="net452" />
-</packages>
+  <package id="UnmanagedExports" version="1.2.7" targetFramework="net452" developmentDependency="true" />
+</packages>

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.4")]
+[assembly: AssemblyFileVersion("3.1.6.4")]
+[assembly: AssemblyInformationalVersion("3.1.6.4")]

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:
@@ -24,17 +26,25 @@ 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."}
   - 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:
-    secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK
-  artifact: TGS3Server,MD5SHA1Server,TGS3Client,MD5SHA1Client
-  draft: false
-  on:
-    TGSDeploy: "Do it."
+  - 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."
+  - provider: NuGet
+    api_key:
+      secure: bedsYuLMqGREzkVkJqRx+BTMgOvDO76tgaNc8sW5E3Ao6iw8oGHdJ/BZov8y0iKa
+    skip_symbols: true
+    artifact: /.*\.nupkg/
+    on:
+      TGSDeploy: "Do it."