Merge branch 'dev' into V7Initial

.github/workflows/ci-pipeline.yml

@@ -2351,64 +2351,11 @@ jobs:
           asset_content_type: application/octet-stream
 
   update-nix:
-    name: Update Nix SHA
+    name: Nix Deployment
     needs: changelog-regen
-    runs-on: ubuntu-latest
     if: (!(cancelled() || failure())) && needs.changelog-regen.result == 'success'
-    steps:
-      - name: Install Native Packages # Name checked in rerunFlakyTests.js
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y xmlstarlet
-
-      - name: Setup Nix
-        uses: cachix/install-nix-action@v30
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Generate App Token
-        id: app-token-generation
-        uses: actions/create-github-app-token@v1
-        with:
-          repositories: tgstation-ppa
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - name: Clone
-        run: git clone -b master --single-branch "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" --depth 1 .
-
-      - name: Parse TGS version
-        run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV
-
-      - name: Retrieve ServerConsole.zip Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: server-console-release
-          path: server-console-release
-
-      - name: Regenerate Nix Hash
-        run: |
-          nix hash path ./server-console-release > build/package/nix/ServerConsole.sha256
-          cat build/package/nix/ServerConsole.sha256
-
-      - name: Commit
-        run: |
-          git config --global push.default simple
-          git config user.name "tgstation-server-ci[bot]"
-          git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com"
-          git add build/package/nix/ServerConsole.sha256
-          git commit -m "Update nix SHA256 for TGS v${{ env.TGS_VERSION }}"
-
-      - name: Re-tag
-        run: |
-          git tag -d tgstation-server-v${{ env.TGS_VERSION }}
-          git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }}
-
-      - name: Push Commit
-        run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server"
-
-      - name: Force Push Tags
-        run: git push -f origin tag tgstation-server-v${{ env.TGS_VERSION }}
+    uses: ./.github/workflows/nix-deployment.yml
+    secrets: inherit
 
   changelog-regen:
     name: Regenerate Changelog

.github/workflows/nix-deployment.yml

@@ -0,0 +1,68 @@
+name: Nix Deployment
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  update-nix:
+    name: Update Nix SHA (master)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Native Packages # Name checked in rerunFlakyTests.js
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xmlstarlet
+
+      - name: Setup Nix
+        uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Generate App Token
+        id: app-token-generation
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token-generation.outputs.token }}
+          ref: master
+          fetch-depth: 0
+          # fetch-tags: true Doesn't work, see https://github.com/actions/checkout/issues/1471
+
+      - name: Parse TGS version
+        run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV
+
+      - name: Retrieve ServerConsole.zip Artifact
+        run: |
+          curl -L https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v${{ env.TGS_VERSION }}/ServerConsole.zip -f -o ServerConsole.zip
+          unzip ServerConsole.zip -d release
+
+      - name: Regenerate Nix Hash
+        run: |
+          nix hash path ./release > build/package/nix/ServerConsole.sha256
+          cat build/package/nix/ServerConsole.sha256
+          rm -rf ./release ServerConsole.zip
+
+      - name: Commit
+        run: |
+          git config --global push.default simple
+          git config user.name "tgstation-server-ci[bot]"
+          git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com"
+          git add build/package/nix/ServerConsole.sha256
+          git commit -m "Update nix SHA256 for TGS v${{ env.TGS_VERSION }}"
+
+      - name: Re-tag
+        run: |
+          git tag -d tgstation-server-v${{ env.TGS_VERSION }}
+          git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }}
+
+      - name: Push Commit
+        run: git push
+
+      - name: Force Push Tags
+        run: git push -f origin tag tgstation-server-v${{ env.TGS_VERSION }}

build/WebpanelVersion.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- This is in it's own file to help incremental building, changing it causes a complete rebuild of the web panel -->
-    <TgsWebpanelVersion>6.9.5</TgsWebpanelVersion>
+    <TgsWebpanelVersion>6.10.0</TgsWebpanelVersion>
   </PropertyGroup>
 </Project>

build/package/nix/ServerConsole.sha256

@@ -1 +1 @@
-sha256-6Wkdb1U2Xmw239zKJTbKcStdAV/G7aMa2oeCsGaSucA=
+sha256-LX9Hq1pefHFWlzncaRW+OCmxBQeCxn0g+p3eE3UCeMs=

build/package/nix/tgstation-server.nix

@@ -162,8 +162,9 @@ in
       ];
       restartIfChanged = false; # So that the TGS service doesn't just get restarted whenever it's updated, and boots players
       wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
       after = [
-        "network.target"
+        "network-online.target"
         "mysql.service"
         "mariadb.service"
         "postgresql.service"

build/tgstation-server.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=tgstation-server
-After=network.target
+Wants=network-online.target
+After=network-online.target
 After=mysql.service
 After=mariadb.service
 After=postgresql.service

src/Tgstation.Server.Api/Tgstation.Server.Api.csproj

@@ -28,7 +28,7 @@
     <!-- Usage: HTTP constants reference -->
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.3.0" />
     <!-- Usage: Decoding the 'nbf' property of JWTs -->
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.7.0" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.8.0" />
     <!-- Usage: Data model annotating -->
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>

src/Tgstation.Server.Common/Tgstation.Server.Common.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <!-- Usage: ValueTask netstandard backport  -->
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.2" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
   </ItemGroup>
 
   <Target Name="IconGeneration" BeforeTargets="ResolveAssemblyReferences" Inputs="../../build/logo.svg" Outputs="../../artifacts/tgs.ico;../../artifacts/tgs.png;../../tools/Tgstation.Server.LogoGenerator/Program.cs">

src/Tgstation.Server.Host/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "9.0.3",
+      "version": "9.0.4",
       "commands": [
         "dotnet-ef"
       ]

src/Tgstation.Server.Host/Tgstation.Server.Host.csproj

@@ -118,19 +118,19 @@
     <!-- 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="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
     <!-- Usage: Automatic migration generation using command line -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <!-- Usage: Sqlite ORM plugin -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
     <!-- Usage: MSSQL ORM plugin -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
     <!-- Usage: Database connectivity health check -->
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.15" />
     <!-- Usage: OIDC support prerequisite. See https://stackoverflow.com/a/78650835/3976486 -->
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.7.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.8.0" />
     <!-- Usage: POSIX support for syscalls, signals, and symlinks -->
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <!-- Usage: Cron string parsing -->
@@ -156,13 +156,13 @@
     <!-- Usage: File logging plugin -->
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <!-- Usage: OpenAPI spec generator -->
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <!-- Usage: Newtonsoft.Json plugin for OpenAPI spec generator -->
-    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="8.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="8.1.1" />
     <!-- Usage: Windows authentication plugin allowing searching for users by name -->
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="10.0.0-preview.2.25163.2" />
     <!-- Usage: Identifying owning user of Windows Process objects -->
-    <PackageReference Include="System.Management" Version="9.0.3" />
+    <PackageReference Include="System.Management" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <!-- Usage: Creating mock database implementations -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>