Merge pull request #261 from BUTR/dev

v2.6.1
BUTR · Dec 7, 2022 · 604c825 · 604c825
2 parents cde44ad + 4007390
commit 604c825
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,7 +23,7 @@ jobs:
       mod_description: ${{ steps.changelog.outputs.mod_description.test }}    
     steps:
     - name: Setup
-      uses: butr/actions-common-setup@v2.0
+      uses: butr/actions-common-setup@v2.1
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
 

diff --git a/build/common.props b/build/common.props
@@ -4,10 +4,10 @@
   <!--Development Variables-->
   <PropertyGroup>
     <!--Module Version-->
-    <Version>2.6.0</Version>
+    <Version>2.6.1</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <HarmonyExtensionsVersion>3.1.0.68</HarmonyExtensionsVersion>
+    <HarmonyExtensionsVersion>3.1.0.69</HarmonyExtensionsVersion>
     <HarmonyAnalyzerVersion>1.0.1.44</HarmonyAnalyzerVersion>
     <!--Microsoft Extension Libraries Version-->
     <!--Serilog depends on abstraction 2.0.0, and since we can't do app redirects, we're stuck with that-->

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.6.1
+Game Versions: v1.0.0,v1.0.1,v1.0.2
+* v1.0.2 stealth update fix. We ship Newtonsoft.Json 13 for backwards compatibility
+---------------------------------------------------------------------------------------------------
 Version: 2.6.0
 Game Versions: v1.0.0,v1.0.1,v1.0.2
 * StoryMode is now an optional dependency

diff --git a/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj b/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj
@@ -50,7 +50,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionVersion)" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" IncludeAssets="compile" />
+    <!-- The game did a ninja update from 11 to 13. We use the newer version and will ship it for 1.0.0 and 1.0.1 -->
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />