cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-21 21:13:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2023-05-20 23:43:21 +00:00
parent 0615da3dc6 294bbf8747
commit 3f91c060cd
6 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-suite.yml
+10 -2
View File
@@ -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]
src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+2 -2
View File
@@ -8,14 +8,14 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Cyberboss/Dominion</Authors>
<Company>/tg/station 13</Company>
<Description>API definitions for tgstation-server</Description>
<Description>API definitions for tgstation-server.</Description>
<PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageIcon>tgs.png</PackageIcon>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018-2023</Copyright>
<PackageTags>json web api tgstation-server tgstation ss13 byond</PackageTags>
<PackageTags>json web api tgstation-server tgstation ss13 byond http</PackageTags>
<PackageReleaseNotes>Minor documentation correction.</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+2 -2
View File
@@ -8,14 +8,14 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Cyberboss/Dominion</Authors>
<Company>/tg/station 13</Company>
<Description>Client library for tgstation-server</Description>
<Description>Client library for tgstation-server.</Description>
<PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageIcon>tgs.png</PackageIcon>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018-2023</Copyright>
<PackageTags>json web api tgstation-server tgstation ss13 byond client</PackageTags>
<PackageTags>json web api tgstation-server tgstation ss13 byond client http</PackageTags>
<PackageReleaseNotes>Added missing Dispose() call to the StringContents for requests with bodies and added missing ConfigureAwait(false) to async call.</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+16
View File
@@ -5,6 +5,20 @@
<TargetFramework>netstandard2.0</TargetFramework>
<DebugType>Full</DebugType>
<Version>$(TgsCoreVersion)</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Cyberboss/Dominion</Authors>
<Company>/tg/station 13</Company>
<Description>Common functions for tgstation-server.</Description>
<PackageProjectUrl>https://tgstation.github.io/tgstation-server</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageIcon>tgs.png</PackageIcon>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018-2023</Copyright>
<PackageTags>web tgstation-server tgstation ss13 byond client http</PackageTags>
<PackageReleaseNotes>Initial release.</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
@@ -27,5 +41,7 @@
<ItemGroup>
<AdditionalFiles Include="../../build/stylecop.json" />
<None Include="../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../build/tgs.png" Pack="true" PackagePath="" />
</ItemGroup>
</Project>
src/Tgstation.Server.Host/Core/Application.cs
+1 -1
View File
@@ -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();
src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
+1 -1
View File
@@ -62,7 +62,7 @@ namespace Tgstation.Server.Host.Extensions
.ApplicationServices
.GetRequiredService<Application>()
.Configure(
applicationBuilder,
applicationBuilder, // TODO: find a way to call this func and auto-resolve the services
applicationBuilder.ApplicationServices.GetRequiredService<IServerControl>(),
applicationBuilder.ApplicationServices.GetRequiredService<ITokenFactory>(),
applicationBuilder.ApplicationServices.GetRequiredService<IServerPortProvider>(),