Minor stuff, preparation for release

BUTR · Feb 4, 2024 · 4e32b09 · 4e32b09
1 parent 69a28e0
commit 4e32b09
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/build/common.props b/build/common.props
@@ -11,7 +11,7 @@
 
   <!--Development Variables-->
   <PropertyGroup>
-    <Version>1.4.11</Version>
+    <Version>1.4.12</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <BUTRSharedVersion>3.0.0.137</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>
@@ -50,7 +50,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,6 +1,7 @@
 ---------------------------------------------------------------------------------------------------
 Version: 1.4.12
-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.6
+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.9
+* Adapted to v1.2.9. Thanks to jzebedee!
 * Added Ukrainian and Japanese localization
 ---------------------------------------------------------------------------------------------------
 Version: 1.4.11

diff --git a/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs b/src/Bannerlord.BLSE.Shared/Utils/LauncherExceptionHandler.cs
@@ -44,7 +44,7 @@ private static void ExceptionInterceptorFeatureOnException(Exception exception)
         fs.SetLength(0);
         using var writer = new StreamWriter(fs);
         writer.Write($@"BLSE Exception:
-Version: {typeof(Program).Assembly.GetName().Version}
+Version: {typeof(LauncherExceptionHandler).Assembly.GetName().Version}
 {GetRecursiveException(exception)}");
     }
 

diff --git a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Save.cs
@@ -10,7 +10,7 @@
 
 namespace Bannerlord.LauncherEx
 {
-    internal partial class BUTRLauncherManagerHandler
+    partial class BUTRLauncherManagerHandler
     {
         public override SaveMetadata[] GetSaveFiles() => MBSaveLoad.GetSaveFiles().Where(x => x.MetaData is not null).Select(x =>
         {

diff --git a/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs b/src/Bannerlord.LauncherEx/BUTRLauncherManagerHandler.Utils.cs
@@ -7,7 +7,7 @@
 
 namespace Bannerlord.LauncherEx
 {
-    internal partial class BUTRLauncherManagerHandler
+    partial class BUTRLauncherManagerHandler
     {
         public void SetGameParametersLoadOrder(IEnumerable<IModuleViewModel> modules) => SaveLoadOrder(GetFromViewModel(modules));
 
@@ -23,10 +23,7 @@ internal partial class BUTRLauncherManagerHandler
         public Task<bool> ShowWarning(string title, string contentPrimary, string contentSecondary)
         {
             var tcs = new TaskCompletionSource<bool>();
-            base.ShowWarning(title, contentPrimary, contentSecondary, result =>
-            {
-                tcs.SetResult(result);
-            });
+            base.ShowWarning(title, contentPrimary, contentSecondary, tcs.SetResult);
             return tcs.Task;
         }
 

diff --git a/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs b/src/Bannerlord.LauncherEx/Helpers/ConfigReader.cs
@@ -8,9 +8,8 @@ namespace Bannerlord.LauncherEx.Helpers
 {
     internal static class ConfigReader
     {
-        private static readonly string BOMMarkUtf8 =
-            Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
-
+        private static readonly string BOMMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
+
         public static readonly string GameConfigPath =
             Path.Combine($@"{Environment.GetFolderPath(Environment.SpecialFolder.Personal)}", "Mount and Blade II Bannerlord", "Configs", "BannerlordConfig.txt");
         public static readonly string EngineConfigPath =

diff --git a/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs b/src/Bannerlord.LauncherEx/Helpers/ModuleChecker.cs
@@ -12,7 +12,6 @@
 using System.Linq;
 
 using TaleWorlds.Library;
-using TaleWorlds.MountAndBlade;
 
 namespace Bannerlord.LauncherEx.Helpers
 {
@@ -28,7 +27,7 @@ public static bool IsInstalledInMainAndExternalModuleDirectory(ModuleInfoExtende
         public static bool IsObfuscated(ModuleInfoExtendedWithPath moduleInfoExtended)
         {
             static bool CanBeLoaded(SubModuleInfoExtended x) =>
-                ModuleInfoHelper.CheckIfSubModuleCanBeLoaded(x, ApplicationPlatform.CurrentPlatform, ApplicationPlatform.CurrentRuntimeLibrary, DedicatedServerType.None, false);
+                ModuleInfoHelper.CheckIfSubModuleCanBeLoaded(x, ApplicationPlatform.CurrentPlatform, ApplicationPlatform.CurrentRuntimeLibrary, TaleWorlds.MountAndBlade.DedicatedServerType.None, false);
 
             foreach (var subModule in moduleInfoExtended.SubModules.Where(CanBeLoaded))
             {