Merge pull request #360 from BUTR/dev

v2.9.0
BUTR · Apr 7, 2024 · d4dd084 · d4dd084
2 parents 5fcda3b + f1e4bb4
commit d4dd084
Show file tree

Hide file tree

Showing 159 changed files with 7,591 additions and 9,736 deletions.
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -11,6 +11,7 @@ on:
       - 'src/Bannerlord.ButterLib/**.cs'
       - 'docs/**'
       - 'README.md'
+  workflow_dispatch:
 
 env:
   # Disable the .NET logo in the console output.
@@ -26,7 +27,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 +40,7 @@ jobs:
         Copy-Item "README.md" -Destination "docs/index.md";
         New-Item -Type dir "docs/images";
         Copy-Item "resources/BUTR48.svg" -Destination "docs/images/BUTR48.svg";
-        docfx metadata docs/docfx.json;
-        docfx build docs/docfx.json;
+        docfx docs/docfx.json;
       shell: pwsh
 
     - name: Deploy DocFX

diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml
@@ -71,7 +71,7 @@ jobs:
       shell: pwsh
 
     - name: ReportGenerator
-      uses: danielpalme/ReportGenerator-GitHub-Action@5.1.26
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
       with:
         reports: '*.xml'
         targetdir: 'coveragereport'
@@ -80,13 +80,13 @@ jobs:
         tag: '${{ github.run_number }}_${{ github.run_id }}' # Optional tag or build version.
 
     - name: Upload ReportGenerator to GitHub
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-report
         path: coveragereport
 
     - name: Upload ReportGenerator to CodeCov
-      uses: codecov/codecov-action@v3.1.4
+      uses: codecov/codecov-action@v4.2.0
       with:
         token: ${{secrets.CODECOV_TOKEN}}
         file: coveragereport/Cobertura.xml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.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'
         steam-depotid: '261551 261552'
@@ -62,8 +62,8 @@ jobs:
           dotnet test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Debug -p:BetaVersion=$beta_version -p:GameFolder="$PWD/bannerlord-beta";
           dotnet test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Release -p:BetaVersion=$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 Coverage
@@ -77,7 +77,7 @@ jobs:
       shell: pwsh
 
     - name: ReportGenerator
-      uses: danielpalme/ReportGenerator-GitHub-Action@5.1.26
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
       with:
         reports: 'coverage_butterlib_stable_debug.xml;coverage_butterlib_stable_release.xml;coverage_butterlib_impl_stable_debug.xml;coverage_butterlib_impl_stable_release.xml;coverage_butterlib_impl_beta_debug.xml;coverage_butterlib_impl_beta_release.xml;'
         targetdir: 'coveragereport'
@@ -86,13 +86,13 @@ jobs:
         tag: '${{ github.run_number }}_${{ github.run_id }}' # Optional tag or build version.
 
     - name: Upload ReportGenerator to GitHub
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-report
         path: coveragereport
 
     - name: Upload ReportGenerator to CodeCov
-      uses: codecov/codecov-action@v3.1.4
+      uses: codecov/codecov-action@v4.2.0
       with:
         token: ${{secrets.CODECOV_TOKEN}}
         file: coveragereport/Cobertura.xml

diff --git a/.gitmodules b/.gitmodules
diff --git a/build/common.props b/build/common.props
@@ -3,8 +3,9 @@
 
   <!--Development Variables-->
   <PropertyGroup>
+    <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.8.16</Version>
+    <Version>2.9.0</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
@@ -15,8 +16,11 @@
     <ExtensionVersion>2.0.0</ExtensionVersion>
     <!--BuildResources Version-->
     <BuildResourcesVersion>1.1.0.104</BuildResourcesVersion>
-    <BUTRSharedVersion>3.0.0.137</BUTRSharedVersion>
-    <BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>
+    <BUTRSharedVersion>3.0.0.138</BUTRSharedVersion>
+    <BUTRModuleManagerVersion>5.0.221</BUTRModuleManagerVersion>
+    <CrashReportVersion>13.0.0.61</CrashReportVersion>
+    <GLFWVersion>3.3.9.2</GLFWVersion>
+    <ImGuiVersion>1.90.1.1</ImGuiVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,21 +29,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionVersion)" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Serilog" Version="3.0.1" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.Logging" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.Options" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="Microsoft.Extensions.Primitives" Version="$(ExtensionVersion)" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="System.Memory" Version="4.5.4" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Condition="$(SkipDependencies) == 'false'" Include="System.Reflection.Metadata" Version="1.8.1" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
+  <ItemGroup Condition="$(TargetFramework) == 'net6'">
     <FrameworkReference Include="Microsoft.AspNetCore.App"  />
   </ItemGroup>
 
@@ -129,7 +133,7 @@
   </PropertyGroup>
   <!--SorceLink-->
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <!--CI Builds-->
   <ItemGroup Condition="$(TargetFramework) == 'net472' AND $(OS) != 'Windows_NT'">

diff --git a/changelog.txt b/changelog.txt
@@ -1,7 +1,13 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.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
+* BETA release!
+* Added new Crash Report system
+* Added Ukrainian and German localization
+---------------------------------------------------------------------------------------------------
 Version: 2.8.16
 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
-* Fixed an issue with the new JsonSerializer overload
+* Switched the order of IsPressed and IsDown hotkey checks
 ---------------------------------------------------------------------------------------------------
 Version: 2.8.15
 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.4

diff --git a/docs/_template/dark-theme/partials/affix.tmpl.partial b/docs/_template/dark-theme/partials/affix.tmpl.partial
diff --git a/docs/_template/dark-theme/partials/class.header.tmpl.partial b/docs/_template/dark-theme/partials/class.header.tmpl.partial