cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-22 12:37:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/tgstation/tgstation-server into 2097-OIDC

Browse Source
This commit is contained in:
Jordan Dominion
2025-03-15 11:29:13 -04:00
parent 7a0f893f22 bac2200915
commit 2e5870d3b3
16 changed files with 4595 additions and 3530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-pipeline.yml
+15 -7
View File
@@ -38,7 +38,7 @@ env:
OD_MIN_COMPAT_DOTNET_VERSION: 7
OD_DOTNET_VERSION: 9
TGS_DOTNET_QUALITY: ga
TGS_WEBPANEL_NODE_VERSION: 20.x
TGS_NODE_VERSION: 20.x
TGS_TEST_GITHUB_TOKEN: ${{ secrets.LIVE_TESTS_TOKEN }}
PACKAGING_PRIVATE_KEY_PASSPHRASE: ${{ secrets.PACKAGING_PRIVATE_KEY_PASSPHRASE }}
@@ -109,6 +109,14 @@ jobs:
dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Enable Corepack
run: corepack enable
- name: Checkout (Branch)
uses: actions/checkout@v4
if: github.event_name == 'push' || github.event_name == 'schedule'
@@ -475,7 +483,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Checkout (Branch)
uses: actions/checkout@v4
@@ -542,7 +550,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Checkout (Branch)
uses: actions/checkout@v4
@@ -624,7 +632,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Set TGS_TEST_DUMP_API_SPEC
if: ${{ matrix.configuration == 'Release' && matrix.watchdog-type == 'Advanced' && matrix.database-type == 'SqlServer' }}
@@ -882,7 +890,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Set Sqlite Connection Info
if: ${{ matrix.database-type == 'Sqlite' }}
@@ -1461,7 +1469,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Checkout (Branch)
uses: actions/checkout@v4
@@ -2031,7 +2039,7 @@ jobs:
- name: Setup Node.JS
uses: actions/setup-node@v4
with:
node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }}
node-version: ${{ env.TGS_NODE_VERSION }}
- name: Checkout
uses: actions/checkout@v4
.gitignore
+2 -1
View File
@@ -21,6 +21,7 @@ artifacts/
/src/Tgstation.Server.Host/wwwroot
/src/Tgstation.Server.Host/--applicationName
/src/Tgstation.Server.Host/ClientApp
/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.yarn
/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/node_modules
/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/schema.graphql
/tools/Tgstation.Server.ReleaseNotes/release_notes.md
@@ -31,4 +32,4 @@ changelog.yml
*.sqlite3
packaging/
yarn-error.log*
.graphqlrc.json
.graphqlrc.json
src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<ItemGroup>
<!-- GraphQL connector and code generator -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.3" />
<PackageReference Include="StrawberryShake.Server" Version="15.0.3" />
</ItemGroup>
src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+2 -2
View File
@@ -11,9 +11,9 @@
<ItemGroup>
<!-- Usage: Connecting to SignalR hubs in API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
<!-- Usage: Using target JSON serializer for API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.3" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj
+2 -2
View File
@@ -13,9 +13,9 @@
<ItemGroup>
<!-- Usage: Identifying if we're running under SystemD -->
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.3" />
<!-- Usage: Console logging plugin -->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
+3 -3
View File
@@ -23,19 +23,19 @@
<!-- Usage: Identifies when we are running in the context of the Windows SCM -->
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.2" />
<!-- Usage: Windows event log logging plugin -->
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.3" />
<!-- Usage: Console logging plugin -->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.2" />
<!-- Usage: Updated transitive dependency of Core.System.ServiceProcess -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<!-- Usage: Updated transitive dependency of Core.System.ServiceProcess -->
<PackageReference Include="System.Drawing.Common" Version="9.0.2" />
<PackageReference Include="System.Drawing.Common" Version="9.0.3" />
<!-- Usage: Updated transitive dependency, unable to tell what of -->
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<!-- Usage: OS identification -->
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<!-- Usage: Windows Service Manager intergration -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.3" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.yarnrc.yml
+15
View File
@@ -0,0 +1,15 @@
compressionLevel: mixed
enableGlobalCache: false
enableScripts: false
logFilters:
- code: YN0004
level: discard
- code: YN0062
level: discard
nodeLinker: node-modules
preferInteractive: true
src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj
+6 -1
View File
@@ -9,7 +9,12 @@
<Target Name="InstallApollo" Inputs="package.json;yarn.lock" Outputs="node_modules/.bin/apollo">
<Message Text="Installing Apollo..." Importance="high" />
<Exec Command="yarn install --immutable --ignore-engines" />
<Exec Command="yarn install --immutable" />
</Target>
<Target Name="CleanApollo" AfterTargets="Clean">
<RemoveDir Directories="node_modules" />
<RemoveDir Directories=".yarn" />
</Target>
<Target Name="GetApi" DependsOnTargets="InstallApollo" Inputs="node_modules/.bin/apollo" Outputs="../../artifacts/gitlab-api.graphql">
src/Tgstation.Server.Host.Utils.GitLab.GraphQL/package.json
+1 -1
View File
@@ -2,5 +2,5 @@
"devDependencies": {
"apollo": "^2.34.0"
},
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
"packageManager": "yarn@4.7.0"
}
src/Tgstation.Server.Host.Utils.GitLab.GraphQL/yarn.lock
+4531 -3496
View File
File diff suppressed because it is too large Load Diff
src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<ItemGroup>
<!-- Usage: Logging abstractions -->
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
<!-- Usage: POSIX support for signals -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
src/Tgstation.Server.Host/.config/dotnet-tools.json
+1 -1
View File
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "8.0.13",
"version": "8.0.14",
"commands": [
"dotnet-ef"
]
src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+12 -11
View File
@@ -112,23 +112,24 @@
<!-- Usage: OpenID Connect support -->
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.13" />
<!-- Usage: Support ""legacy"" Newotonsoft.Json in HTTP pipeline. The rest of our codebase uses Newtonsoft. -->
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.14" />
<!-- Usage: Using target JSON serializer for API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.3" />
<!-- Usage: Generating dumps of dotnet engine processes -->
<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.607501" />
<!-- Usage: Database ORM -->
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
<!-- Usage: Automatic migration generation using command line -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.14">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Sqlite ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.14" />
<!-- Usage: MSSQL ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
<!-- Usage: Database connectivity health check -->
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.13" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.14" />
<!-- Usage: OIDC support prerequisite. See https://stackoverflow.com/a/78650835/3976486 -->
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.0" />
<!-- Usage: POSIX support for syscalls, signals, and symlinks -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
@@ -139,7 +140,7 @@
<!-- Usage: PostgresSQL ORM plugin -->
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<!-- Usage: MYSQL/MariaDB ORM plugin -->
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
<!-- Usage: Publishing Prometheus metrics -->
<PackageReference Include="prometheus-net.AspNetCore.HealthChecks" Version="8.2.1" />
<!-- Usage: Discord interop -->
@@ -159,11 +160,11 @@
<!-- Usage: Newtonsoft.Json plugin for OpenAPI spec generator -->
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="7.3.1" />
<!-- Usage: Windows authentication plugin allowing searching for users by name -->
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.2" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.3" />
<!-- Usage: Identifying owning user of Windows Process objects -->
<PackageReference Include="System.Management" Version="9.0.2" />
<PackageReference Include="System.Management" Version="9.0.3" />
<!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
<PackageReference Include="System.Security.Permissions" Version="9.0.2" />
<PackageReference Include="System.Security.Permissions" Version="9.0.3" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<ItemGroup>
<!-- Usage: JWT injection into HTTP pipeline -->
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.14" />
<!-- Usage: GitHub.com interop -->
<PackageReference Include="Octokit" Version="14.0.0" />
<!-- Usage: YAML conversion of Version objects -->
tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.3" />
</ItemGroup>
<ItemGroup>
tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.3" />
</ItemGroup>
<ItemGroup>