Merge 4.1 to master

.dockerignore

@@ -0,0 +1,24 @@
+# Build Outputs
+**/bin/
+**/obj/
+
+# VCS/IDE/CI metadata
+.git/
+.github/
+.idea/
+.vs/
+.vscode/
+
+# Do it live!
+Testing/
+
+# Runtime state
+**/user/
+**/logs/
+
+# Docker & Docs
+Dockerfile
+.dockerignore
+compose.yaml
+docker-compose.yml
+**/*.md

.editorconfig

@@ -149,6 +149,7 @@ resharper_member_can_be_made_static_global_highlighting = none
 resharper_possible_multiple_enumeration_highlighting = none
 resharper_collection_never_updated_global_highlighting = none
 resharper_unused_auto_property_accessor_global_highlighting = none
+resharper_convert_to_auto_property_highlighting = none
 
 # Ignored warnings
 dotnet_diagnostic.CS1591.severity = none

.github/CODEOWNERS

@@ -0,0 +1,11 @@
+# CODEOWNERS
+# https://docs.github.com/articles/about-code-owners
+
+# GitHub Workflows
+/.github/workflows/ @Refringe
+
+# Docker Container Build-out
+/Dockerfile @Refringe
+/.dockerignore @Refringe
+/compose.yaml @Refringe
+/docker/ @Refringe

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -1,5 +1,5 @@
-name: "Bug Report"
-description: "Report a bug in the SPT project."
+name: "Bug Report - Stable 4.0"
+description: "Report a bug in the current stable (4.0) release of the SPT project."
 labels: ["triage"]
 body:
   - type: markdown
@@ -59,7 +59,7 @@ body:
     id: log_server
     attributes:
       label: "Server Log"
-      description: "Upload a copy of your *entire* server log: `SPT/user/logs/spt/spt.txt`."
+      description: "Upload your *entire* server log for the affected session from `SPT/user/logs/spt/`. Files are named `spt<date>.log`."
       placeholder: "Attach the log file. Do not paste the contents."
     validations:
       required: true

.github/ISSUE_TEMPLATE/2-bug-report-4-1.yml

@@ -0,0 +1,109 @@
+name: "Bug Report - Bleeding Edge 4.1"
+description: "Report a bug in a pre-release (4.1) version of the SPT project."
+labels: ["triage", "bleeding edge"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Thank you for taking the time to fill out a bug report!
+
+        You are reporting against a **pre-release (bleeding-edge) 4.1 build**. These builds are unstable and change frequently, so please note the following requirements:
+
+        - You must be able to replicate the issue with a fresh profile, running no mods. If you can't, we can't fix it.
+        - If you are using a profile from an older version, please make a fresh profile and replicate the issue before submitting.
+        - You must upload all the required log files, even if you think they are useless.
+        - Failure to comply with any of the above requirements will result in your issue being closed without notice.
+  - type: dropdown
+    id: version
+    attributes:
+      label: SPT Version
+      description: What version of SPT are you using?
+      options:
+        - "4.1"
+    validations:
+      required: true
+  - type: input
+    id: build
+    attributes:
+      label: "Build Name"
+      description: "The exact build name you're running. This can be found in the #dev-builds channel where you downloaded the BE build. This is critical."
+      placeholder: "e.g. SPT-BLEEDINGEDGE-4.1.0-40743-9185fc2-20260704"
+    validations:
+      required: true
+  - type: dropdown
+    id: projects
+    attributes:
+      label: "Project Type"
+      description: "If known, which part of the project is involved in this bug report?"
+      options:
+        - "Server"
+        - "Modules"
+        - "Launcher"
+      multiple: true
+    validations:
+      required: false
+  - type: textarea
+    id: result_expected
+    attributes:
+      label: "Expected Result"
+      description: "What you expect to happen?"
+    validations:
+      required: true
+  - type: textarea
+    id: result_actual
+    attributes:
+      label: "Actual Result"
+      description: "What actually happened?"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: "Steps To Reproduce"
+      description: "Describe in point form the steps we can take to reproduce the issue on our end."
+    validations:
+      required: true
+  - type: textarea
+    id: log_server
+    attributes:
+      label: "Server Log"
+      description: "Upload your *entire* server log for the affected session from `SPT_Runtime/user/logs/spt/`. Files are named `spt<date>.log`."
+      placeholder: "Attach the log file. Do not paste the contents."
+    validations:
+      required: true
+  - type: textarea
+    id: log_bepinex
+    attributes:
+      label: "BepinEx Log"
+      description: "Upload a copy of your *entire* BepinEx log: `/BepinEx/LogOutput.log`."
+      placeholder: "Attach the log file. Do not paste the contents."
+    validations:
+      required: true
+  - type: textarea
+    id: log_client
+    attributes:
+      label: "Client Log"
+      description: "Upload a copy of your *entire* client log: `/Logs/log_<date>_<version>/<date>_<version> traces.log`."
+      placeholder: "Attach the log file. Do not paste the contents."
+    validations:
+      required: true
+  - type: textarea
+    id: profile
+    attributes:
+      label: "Player Profile"
+      description: "If helpful, upload a copy of your *entire* player profile: `SPT_Runtime/user/profiles/<profileId>.json`."
+      placeholder: "Attach the profile file. Do not paste the contents."
+    validations:
+      required: false
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: "Screenshots"
+      description: "If helpful, upload any screenshots or videos you think would help us identify the issue."
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        ## BEFORE YOU SUBMIT
+        Ensure that your logs are attached. **No logs = Issue deleted**

.github/workflows/docker-release.yml

@@ -0,0 +1,104 @@
+name: Docker Release
+
+on:
+  push:
+    tags:
+      # Stable, e.g. 4.1.0 -> RELEASE
+      - '[0-9]+.[0-9]+.[0-9]+'
+      # Bleeding edge, e.g. 4.1.0-BE-20260704 -> BLEEDINGEDGE
+      - '[0-9]+.[0-9]+.[0-9]+-BE-[0-9]+'
+      # Bleeding edge + mods, e.g. 4.1.0-BEM-20260704 -> BLEEDINGEDGEMODS
+      - '[0-9]+.[0-9]+.[0-9]+-BEM-[0-9]+'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  docker:
+    name: Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          lfs: false
+
+      - name: Configure Git LFS
+        run: |
+          git lfs install
+          git config -f .lfsconfig lfs.url https://spt-lfs.sp-tarkov.com/sp-tarkov/server-csharp
+          git config -f .lfsconfig lfs.locksverify false
+          git lfs pull
+
+      # Determine the release channel from the tag and map it onto the MSBuild version props.
+      #   channel:    release | edge | edge-mods
+      #   stable:     true only for a plain X.Y.Z tag (drives latest/major tags)
+      #   buildtype:  RELEASE | BLEEDINGEDGE | BLEEDINGEDGEMODS
+      #   sptversion: numeric core ONLY (e.g. 4.1.0).
+      - name: Build Metadata
+        id: vars
+        run: |
+          TAG="${GITHUB_REF#refs/tags/}"
+          case "$TAG" in
+            *-BEM-*) CHANNEL=edge-mods; BUILDTYPE=BLEEDINGEDGEMODS; STABLE=false ;;
+            *-BE-*)  CHANNEL=edge;      BUILDTYPE=BLEEDINGEDGE;     STABLE=false ;;
+            *)       CHANNEL=release;   BUILDTYPE=RELEASE;          STABLE=true  ;;
+          esac
+          CORE="${TAG%%-*}"
+          {
+            echo "sptversion=${CORE}"
+            echo "channel=${CHANNEL}"
+            echo "stable=${STABLE}"
+            echo "buildtype=${BUILDTYPE}"
+            echo "commit=$(git rev-parse --short=7 HEAD)"
+            echo "buildtime=$(date +%s)"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v4
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate Image Metadata
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ghcr.io/${{ github.repository }}
+          flavor: |
+            latest=false
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ steps.vars.outputs.stable == 'true' }}
+            type=semver,pattern={{major}},enable=${{ steps.vars.outputs.stable == 'true' && !startsWith(github.ref, 'refs/tags/0.') }}
+            type=raw,value=latest,enable=${{ steps.vars.outputs.stable == 'true' }}
+            type=raw,value=edge,enable=${{ steps.vars.outputs.channel == 'edge' }}
+            type=raw,value=edge-mods,enable=${{ steps.vars.outputs.channel == 'edge-mods' }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            SptVersion=${{ steps.vars.outputs.sptversion }}
+            SptCommit=${{ steps.vars.outputs.commit }}
+            SptBuildTime=${{ steps.vars.outputs.buildtime }}
+            SptBuildType=${{ steps.vars.outputs.buildtype }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/format.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.BYPASS_WORKFLOW_PAT || github.token }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0
+          dotnet-version: 10.0
 
       - name: Restore Tool Dependencies
         run: dotnet tool install -g csharpier
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.BYPASS_WORKFLOW_PAT || github.token }}
 
@@ -156,7 +156,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.BYPASS_WORKFLOW_PAT || github.token }}
 

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           lfs: false
 
@@ -23,9 +23,9 @@ jobs:
           git lfs pull
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0
+          dotnet-version: 10.0
 
       - name: Restore Dependencies
         run: dotnet restore

.gitignore

@@ -424,8 +424,11 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+# Ceciler tool output
+/Ceciler/
+
 # Automatically generated file containing metadata on build
 Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.Generated.cs
 
 # Not necessary to be included in the repo
-Testing/**/Properties/launchSettings.json
+Testing/**/Properties/launchSettings.json