diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml
index d8e8574ccb..9253d15ddd 100644
--- a/.github/workflows/ci-suite.yml
+++ b/.github/workflows/ci-suite.yml
@@ -849,7 +849,7 @@ jobs:
with:
ref: "refs/pull/${{ github.event.number }}/merge"
- - name: Publish API to NuGet
+ - name: Publish Tgstation.Server.Api to NuGet
uses: alirezanet/publish-nuget@v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
@@ -857,7 +857,7 @@ jobs:
INCLUDE_SYMBOLS: true
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
- - name: Publish Client to NuGet
+ - name: Publish Tgstation.Server.Common to NuGet
uses: alirezanet/publish-nuget@v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -865,6 +865,14 @@ jobs:
INCLUDE_SYMBOLS: true
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
+ - name: Publish Tgstation.Server.Client to NuGet
+ uses: alirezanet/publish-nuget@v3.0.0
+ with:
+ PROJECT_FILE_PATH: src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+ TAG_COMMIT: false
+ INCLUDE_SYMBOLS: true
+ NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
+
ensure-release:
name: Ensure TGS Release is Latest GitHub Release
needs: [deploy-dm, deploy-http]
diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
index 84f4161f87..7ec7093552 100644
--- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
@@ -7,14 +7,14 @@
true
Cyberboss/Dominion
/tg/station 13
- API definitions for tgstation-server
+ API definitions for tgstation-server.
https://tgstation.github.io/tgstation-server
LICENSE
tgs.png
Git
https://github.com/tgstation/tgstation-server
2018-2023
- json web api tgstation-server tgstation ss13 byond
+ json web api tgstation-server tgstation ss13 byond http
Minor documentation correction.
true
snupkg
diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
index 79b89e4cf2..9ef4f87f93 100644
--- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -7,19 +7,18 @@
true
Cyberboss/Dominion
/tg/station 13
- Client library for tgstation-server
+ Client library for tgstation-server.
https://tgstation.github.io/tgstation-server
LICENSE
tgs.png
Git
https://github.com/tgstation/tgstation-server
2018-2023
- json web api tgstation-server tgstation ss13 byond client
+ json web api tgstation-server tgstation ss13 byond client http
Added missing Dispose() call to the StringContents for requests with bodies and added missing ConfigureAwait(false) to async call.
true
snupkg
enable
- bin\$(Configuration)\netstandard2.0\Tgstation.Server.Client.xml
true
../../build/analyzers.ruleset
bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml
diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
index 33573ee708..6b16443795 100644
--- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
@@ -4,6 +4,21 @@
netstandard2.0
$(TgsCoreVersion)
+ true
+ Cyberboss/Dominion
+ /tg/station 13
+ Common functions for tgstation-server.
+ https://tgstation.github.io/tgstation-server
+ LICENSE
+ tgs.png
+ Git
+ https://github.com/tgstation/tgstation-server
+ 2018-2023
+ web tgstation-server tgstation ss13 byond client http
+ Initial release.
+ true
+ snupkg
+ enable
true
../../build/analyzers.ruleset
bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml
@@ -24,5 +39,7 @@
+
+
diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs
index 0daf42748d..c2b4547e7d 100644
--- a/src/Tgstation.Server.Host/Core/Application.cs
+++ b/src/Tgstation.Server.Host/Core/Application.cs
@@ -247,7 +247,7 @@ namespace Tgstation.Server.Host.Core
if (postSetupServices.GeneralConfiguration.HostApiDocumentation)
{
string GetDocumentationFilePath(string assemblyLocation) => ioManager.ConcatPath(ioManager.GetDirectoryName(assemblyLocation), String.Concat(ioManager.GetFileNameWithoutExtension(assemblyLocation), ".xml"));
- var assemblyDocumentationPath = GetDocumentationFilePath(typeof(Application).Assembly.Location);
+ var assemblyDocumentationPath = GetDocumentationFilePath(GetType().Assembly.Location);
var apiDocumentationPath = GetDocumentationFilePath(typeof(ApiHeaders).Assembly.Location);
services.AddSwaggerGen(genOptions => SwaggerConfiguration.Configure(genOptions, assemblyDocumentationPath, apiDocumentationPath));
services.AddSwaggerGenNewtonsoftSupport();
diff --git a/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs b/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
index d93bbff7a7..e7b82e192a 100644
--- a/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
+++ b/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
@@ -62,7 +62,7 @@ namespace Tgstation.Server.Host.Extensions
.ApplicationServices
.GetRequiredService()
.Configure(
- applicationBuilder,
+ applicationBuilder, // TODO: find a way to call this func and auto-resolve the services
applicationBuilder.ApplicationServices.GetRequiredService(),
applicationBuilder.ApplicationServices.GetRequiredService(),
applicationBuilder.ApplicationServices.GetRequiredService(),