Merge pull request #437 from Aragas/dev

v5.10.0

.github/workflows/docfx.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: DocFX Setup
-      uses: butr/actions-docfx-setup@v3
+      uses: butr/actions-docfx-setup@v4
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
 
@@ -39,8 +39,7 @@ jobs:
         Copy-Item "README.md" -Destination "docs/index.md";
         New-Item -Type dir "docs/images";
         Copy-Item "resources/MCM-48.svg" -Destination "docs/images/MCM-48.svg";
-        docfx metadata docs/docfx.json;
-        docfx build docs/docfx.json;
+        docfx docs/docfx.json;
       shell: pwsh
 
     - name: Deploy DocFX

.github/workflows/refresh-nexusmods-credentials.yml

@@ -0,0 +1,20 @@
+name: Refresh NexusMods Credentials
+
+on:
+  schedule:
+    - cron: "0 0 */10 * *"
+  workflow_dispatch:
+
+env:
+  # Disable the .NET logo in the console output.
+  DOTNET_NOLOGO: true
+  # Disable the .NET first time experience to skip caching NuGet packages and speed up the build.
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  # Disable sending .NET CLI telemetry to Microsoft.
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+
+jobs:
+  aragas-unex-refresh-nexusmods:
+    uses: BUTR/workflows/.github/workflows/refresh-unex-nexusmods.yml@master
+    secrets:
+      NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }}

.github/workflows/test-and-publish.yml

@@ -43,8 +43,8 @@ jobs:
         github-token: ${{secrets.GITHUB_TOKEN}}
         steam-login: ${{secrets.STEAM_LOGIN}}
         steam-password: ${{secrets.STEAM_PASSWORD}}
-        stable-version: ${{secrets.SYNCED_GAME_STABLE_VERSION}}
-        beta-version: ${{secrets.SYNCED_GAME_BETA_VERSION}}
+        stable-version: ${{vars.GAME_VERSION_STABLE}}
+        beta-version: ${{vars.GAME_VERSION_BETA}}
         stable-directory: 'bannerlord-stable'
         beta-directory: 'bannerlord-beta'
 
@@ -60,8 +60,8 @@ jobs:
           dotnet build "tests/MCM.Tests/MCM.Tests.csproj" --configuration Beta_Debug -p:GameVersion=$beta_version -p:GameFolder="$PWD/bannerlord-beta";
           dotnet build "tests/MCM.Tests/MCM.Tests.csproj" --configuration Beta_Release -p:GameVersion=$beta_version -p:GameFolder="$PWD/bannerlord-beta";
       env:
-        STABLE_VERSION: ${{secrets.SYNCED_GAME_STABLE_VERSION}}
-        BETA_VERSION: ${{secrets.SYNCED_GAME_BETA_VERSION}}
+        STABLE_VERSION: ${{vars.GAME_VERSION_STABLE}}
+        BETA_VERSION: ${{vars.GAME_VERSION_BETA}}
       shell: pwsh
 
     - name: Test MCM with Coverage

.github/workflows/verify-unex-data.yml → .github/workflows/verify-nexusmods-credentials.yml

@@ -1,4 +1,4 @@
-name: Verify UNEX Data
+name: Verify NexusMods Credentials
 
 on:
   schedule:
@@ -14,15 +14,8 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
-  #verify-nexusmods:
-  #  uses: BUTR/workflows/.github/workflows/verify-nexusmods.yml@master
-  #  secrets:
-  #    NEXUSMODS_API_KEY: ${{ secrets.NEXUSMODS_APIKEY }}
-  #    NEXUSMODS_COOKIE_NEXUSID: ${{ secrets.ARAGAS_NEXUSMOD_COOKIE_NEXUSID }}
-  #    NEXUSMODS_COOKIE_SID_DEVELOP: ${{ secrets.ARAGAS_NEXUSMOD_COOKIE_SID_DEVELOP }}
-
   unex-verify-nexusmods:
     uses: BUTR/workflows/.github/workflows/verify-unex-nexusmods.yml@master
     secrets:
       NEXUSMODS_API_KEY: ${{ secrets.NEXUSMODS_APIKEY }}
-      NEXUSMODS_COOKIES: ${{ secrets.NEXUSMODS_COOKIES }}
+      NEXUSMODS_SESSION_COOKIE: ${{ secrets.NEXUSMODS_SESSION_COOKIE }}

build/common.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <GameVersion>1.0.0</GameVersion>
     <GameVersionWithPrefix>v$(GameVersion)</GameVersionWithPrefix>
-    <Version>5.9.2</Version>
+    <Version>5.10.0</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <ButterLibVersion>2.8.15</ButterLibVersion>
     <UIExtenderExVersion>2.8.1</UIExtenderExVersion>

changelog.txt

@@ -1,4 +1,11 @@
 ---------------------------------------------------------------------------------------------------
+Version: 5.10.0
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.x
+* Added Settings instance cache and cache invalidation
+* Fixed campaign settings not using the campaign id
+* Fixed redundant folder creation in the root settings folder
+* Fixed Fluent Campaign settings stored in the root settings folder
+---------------------------------------------------------------------------------------------------
 Version: 5.9.2
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.7
 * Switched to .NET 6 for Xbox