Merge pull request #255 from BUTR/dev

v2.8.0
BUTR · Mar 31, 2023 · ccac153 · ccac153
2 parents faac1ed + 769adb6
commit ccac153
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -82,7 +82,6 @@ jobs:
 #          STEAM          #
 ###########################
   publish-on-steam:
-    if: false
     needs: ["build-module"]
     uses: BUTR/workflows/.github/workflows/release-steam.yml@master
     with:

diff --git a/build/common.props b/build/common.props
@@ -4,9 +4,9 @@
   <!--Development Variables-->
   <PropertyGroup>
     <!--Module Version-->
-    <Version>2.7.0</Version>
+    <Version>2.8.0</Version>
     <!--Harmony Version-->
-    <HarmonyVersion>2.10.1</HarmonyVersion>
+    <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
     <HarmonyAnalyzerVersion>1.0.1.44</HarmonyAnalyzerVersion>
     <BuildResourcesVersion>1.0.1.92</BuildResourcesVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.8.0
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2
+* Switched back to Lib.Harmony
+* Added support for v1.1.2
+---------------------------------------------------------------------------------------------------
 Version: 2.7.0
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1
 * Support for Game Pass PC

diff --git a/src/Bannerlord.UIExtenderEx/Bannerlord.UIExtenderEx.csproj b/src/Bannerlord.UIExtenderEx/Bannerlord.UIExtenderEx.csproj
@@ -10,7 +10,7 @@
     <BuildForWindowsStore>true</BuildForWindowsStore>
 
     <Configurations>Stable_Debug;Stable_Release;Beta_Debug;Beta_Release</Configurations>
-    <DefineConstants>$(DefineConstants);HARMONYEXTENSIONS_HARMONYX</DefineConstants>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
   <!--Module Creation-->
@@ -37,7 +37,7 @@
   <!--NuGet Package-->
 
   <ItemGroup>
-    <PackageReference Include="HarmonyX" Version="$(HarmonyVersion)" PrivateAssets="all" IncludeAssets="compile" />
+    <PackageReference Include="Bannerlord.Lib.Harmony" Version="$(HarmonyVersion)-beta3" PrivateAssets="all" IncludeAssets="compile" />
     <PackageReference Include="Bannerlord.ReferenceAssemblies.Core" Version="$(GameVersion).*" PrivateAssets="all" IncludeAssets="compile" GeneratePathProperty="true" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" />
 

diff --git a/tests/Bannerlord.UIExtenderEx.Tests/Bannerlord.UIExtenderEx.Tests.csproj b/tests/Bannerlord.UIExtenderEx.Tests/Bannerlord.UIExtenderEx.Tests.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
-    <PackageReference Include="HarmonyX" Version="$(HarmonyVersion)" />
+    <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)-beta3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>