Merge pull request #415 from BUTR/dev

v2.9.15
BUTR · Oct 4, 2024 · e2efdb2 · e2efdb2
2 parents 2c04bdc + 98b2786
commit e2efdb2
Show file tree

Hide file tree

Showing 29 changed files with 178 additions and 224 deletions.
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.9.14</Version>
+    <Version>2.9.15</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
@@ -18,7 +18,7 @@
     <BuildResourcesVersion>1.1.0.104</BuildResourcesVersion>
     <BUTRSharedVersion>3.0.0.142</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.226</BUTRModuleManagerVersion>
-    <CrashReportVersion>14.0.0.91</CrashReportVersion>
+    <CrashReportVersion>14.0.0.93</CrashReportVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.15
+Game Versions: v1.0.x,v1.1.x,v1.2.x
+* Fixed a regression that prevented crash reports from being shown
+---------------------------------------------------------------------------------------------------
 Version: 2.9.14
 Game Versions: v1.0.x,v1.1.x,v1.2.x
 * Fixed a possible crash related to trace logging

diff --git a/src/Bannerlord.ButterLib.Implementation/Bannerlord.ButterLib.Implementation.csproj b/src/Bannerlord.ButterLib.Implementation/Bannerlord.ButterLib.Implementation.csproj
@@ -5,7 +5,6 @@
     <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
-    <Platform>x64</Platform>
     <BuildForWindows>false</BuildForWindows>
     <BuildForWindowsStore>false</BuildForWindowsStore>
 

diff --git a/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixSubSystem.cs b/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixSubSystem.cs
@@ -51,11 +51,11 @@ public void Disable()
         IsEnabled = false;
     }
 
-    public IReadOnlyCollection<SubSystemSettingsDeclaration<DistanceMatrixSubSystem>> Declarations { get; } = new SubSystemSettingsDeclaration<DistanceMatrixSubSystem>[]
-    {
+    public IReadOnlyCollection<SubSystemSettingsDeclaration<DistanceMatrixSubSystem>> Declarations { get; } =
+    [
         new SubSystemSettingsPropertyBool<DistanceMatrixSubSystem>(
             "{=MSJe8ih4yp}Consider Villages",
             "{=kvR54SiOFn}Allow villages to be used for built-in distance matrix calculations. May negatively affect performance.",
-            x => x.ConsiderVillages),
-    };
+            x => x.ConsiderVillages)
+    ];
 }
diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyCategoryContainer.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyCategoryContainer.cs
@@ -24,15 +24,15 @@ internal sealed class HotKeyCategoryContainer : GameKeyContext
     public HotKeyCategoryContainer(string categoryId, string categoryName, IEnumerable<HotKeyBase> keys) : base(categoryId, ListCapacity)
     {
         var keyCategoryName = Module.CurrentModule.GlobalTextManager.AddGameText("str_key_category_name");
-        keyCategoryName.AddVariationWithId(categoryId, new TextObject(categoryName), new List<GameTextManager.ChoiceTag>());
+        keyCategoryName.AddVariationWithId(categoryId, new TextObject(categoryName), []);
 
         var keyName = Module.CurrentModule.GlobalTextManager.AddGameText("str_key_name");
         var keyDesc = Module.CurrentModule.GlobalTextManager.AddGameText("str_key_description");
         foreach (var key in keys)
         {
             var variationId = $"{categoryId}_{(GameKeyDefinition) key.Id}";
-            keyName.AddVariationWithId(variationId, new TextObject(key.DisplayName), new List<GameTextManager.ChoiceTag>());
-            keyDesc.AddVariationWithId(variationId, new TextObject(key.Description), new List<GameTextManager.ChoiceTag>());
+            keyName.AddVariationWithId(variationId, new TextObject(key.DisplayName), []);
+            keyDesc.AddVariationWithId(variationId, new TextObject(key.Description), []);
             RegisterGameKey(new GameKey(key.Id, key.Uid, categoryId, key.DefaultKey, key.Category));
         }
     }

diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs
@@ -17,13 +17,13 @@ namespace Bannerlord.ButterLib.Implementation.HotKeys;
 
 internal sealed class HotKeyManagerImplementation : HotKeyManager
 {
-    internal static readonly List<HotKeyCategoryContainer> GlobalContainerStorage = new();
-    internal static readonly List<HotKeyBase> GlobalHotKeyStorage = new();
+    internal static readonly List<HotKeyCategoryContainer> GlobalContainerStorage = [];
+    internal static readonly List<HotKeyBase> GlobalHotKeyStorage = [];
 
     private int _currentId = 0; // To prevent collision with the game
     private readonly string _modName;
     private readonly string _categoryName;
-    private readonly List<HotKeyBase> _instanceHotKeys = new();
+    private readonly List<HotKeyBase> _instanceHotKeys = [];
 
     internal HotKeyManagerImplementation(string modName, string categoryName = "")
     {
@@ -54,7 +54,7 @@ public override IReadOnlyList<HotKeyBase> Build()
 #if v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116
         TWHotKeyManager.RegisterInitialContexts(new[] { hotKeyCategoryContainer }, true);
 #elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210 || v1211
-        TWHotKeyManager.RegisterInitialContexts(TWHotKeyManager.GetAllCategories().ToList().Concat(new[] { hotKeyCategoryContainer }), true);
+        TWHotKeyManager.RegisterInitialContexts(TWHotKeyManager.GetAllCategories().ToList().Concat([hotKeyCategoryContainer]), true);
 #else
 #error DEFINE
 #endif

diff --git a/...Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/Patches/MBGameManagerPatch.cs b/...Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/Patches/MBGameManagerPatch.cs
@@ -68,14 +68,20 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
         {
             case "OnGameStart":
                 miToSearchFor = miMBSubModuleBaseOnGameStartEvent!;
-                ciToAdd = new CodeInstruction[] { new(opcode: OpCodes.Ldarg_1),
-                                                      new(opcode: OpCodes.Ldarg_2),
-                                                      new(opcode: OpCodes.Call, operand: miDelayedOnGameStartEventCaller) };
+                ciToAdd =
+                [
+                    new(opcode: OpCodes.Ldarg_1),
+                    new(opcode: OpCodes.Ldarg_2),
+                    new(opcode: OpCodes.Call, operand: miDelayedOnGameStartEventCaller)
+                ];
                 break;
             case "OnGameEnd":
                 miToSearchFor = miMBSubModuleBaseOnGameEndEvent!;
-                ciToAdd = new CodeInstruction[] { new(opcode: OpCodes.Ldarg_1),
-                                                      new(opcode: OpCodes.Call, operand: miDelayedOnGameEndEventCaller) };
+                ciToAdd =
+                [
+                    new(opcode: OpCodes.Ldarg_1),
+                    new(opcode: OpCodes.Call, operand: miDelayedOnGameEndEventCaller)
+                ];
                 break;
             default:
                 _log.LogError("Error while applying Harmony transpiler for {Method} - unexpected target method!", originalMethodName);

diff --git a/src/Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/Patches/ModulePatch.cs b/src/Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/Patches/ModulePatch.cs
@@ -81,10 +81,11 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
             }
             else
             {
-                codes.InsertRange(finallyIndex + 1, new CodeInstruction[] {
+                codes.InsertRange(finallyIndex + 1,
+                [
                     new CodeInstruction(opcode: OpCodes.Ldarg_0),
                     new CodeInstruction(opcode: OpCodes.Call, operand: miDelayedScreenAsRootEventCaller)
-                });
+                ]);
                 codes[finallyIndex + 1].MoveLabelsFrom(codes[finallyIndex + 3]);
             }
 

diff --git a/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/DefinitionContextPatch.cs b/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/DefinitionContextPatch.cs
@@ -55,12 +55,12 @@ internal static bool Disable(Harmony harmony)
     private delegate bool IsContainerDelegate(Type type);
 
     private static readonly IsContainerDelegate? IsContainer =
-        AccessTools2.GetDelegate<IsContainerDelegate>("TaleWorlds.SaveSystem.TypeExtensions:IsContainer", new[] { typeof(Type) });
+        AccessTools2.GetDelegate<IsContainerDelegate>("TaleWorlds.SaveSystem.TypeExtensions:IsContainer", [typeof(Type)]);
 
     private static MethodInfo? TargetTypeMethod(string name) => AccessTools2.Method($"TaleWorlds.SaveSystem.Definition.DefinitionContext:{name}");
 
-    private static readonly Patch[] Patches = new Patch[]
-    {
+    private static readonly Patch[] Patches =
+    [
         new PrefixPatch(nameof(AddBasicTypeDefinitionPrefix),     TargetTypeMethod("AddBasicTypeDefinition")),
         new PrefixPatch(nameof(AddClassDefinitionPrefix),         TargetTypeMethod("AddClassDefinition")),
         new PrefixPatch(nameof(AddContainerDefinitionPrefix),     TargetTypeMethod("AddContainerDefinition")),
@@ -70,8 +70,8 @@ internal static bool Disable(Harmony harmony)
         new PrefixPatch(nameof(AddInterfaceDefinitionPrefix),     TargetTypeMethod("AddInterfaceDefinition")),
         new PrefixPatch(nameof(AddRootClassDefinitionPrefix),     TargetTypeMethod("AddRootClassDefinition")),
         new PrefixPatch(nameof(AddStructDefinitionPrefix),        TargetTypeMethod("AddStructDefinition")),
-        new ConstructContainerDefinitionPrefixPatch(),
-    };
+        new ConstructContainerDefinitionPrefixPatch()
+    ];
 
     // PATCH METHODS
 

diff --git a/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/TypeExtensionsPatch.cs b/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/TypeExtensionsPatch.cs
@@ -51,7 +51,7 @@ internal static bool Disable(Harmony harmony)
     }
 
     private static readonly Type? TargetType = AccessTools2.TypeByName("TaleWorlds.SaveSystem.TypeExtensions");
-    private static readonly Type[] TargetMethodParams = { typeof(Type), typeof(ContainerType).MakeByRefType() };
+    private static readonly Type[] TargetMethodParams = [typeof(Type), typeof(ContainerType).MakeByRefType()];
     private static readonly MethodInfo? TargetMethod = AccessTools2.Method(TargetType!, "IsContainer", TargetMethodParams);
     private static readonly MethodInfo? PatchMethod = SymbolExtensions2.GetMethodInfo((Type x, ContainerType y, bool z) => IsContainerPrefix(x, out y, ref z));
 

diff --git a/src/Bannerlord.ButterLib.sln b/src/Bannerlord.ButterLib.sln
@@ -148,60 +148,60 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MBSubModuleBaseExtended", "
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Beta_Debug|x64 = Beta_Debug|x64
-		Beta_Release|x64 = Beta_Release|x64
-		Stable_Debug|x64 = Stable_Debug|x64
-		Stable_Release|x64 = Stable_Release|x64
+		Beta_Release|Any CPU = Beta_Release|Any CPU
+		Stable_Release|Any CPU = Stable_Release|Any CPU
+		Stable_Debug|Any CPU = Stable_Debug|Any CPU
+		Beta_Debug|Any CPU = Beta_Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Debug|x64.ActiveCfg = Beta_Debug|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Debug|x64.Build.0 = Beta_Debug|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Release|x64.ActiveCfg = Beta_Release|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Release|x64.Build.0 = Beta_Release|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Debug|x64.ActiveCfg = Stable_Debug|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Debug|x64.Build.0 = Stable_Debug|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Release|x64.ActiveCfg = Stable_Release|Any CPU
-		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Release|x64.Build.0 = Stable_Release|Any CPU
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Debug|x64.ActiveCfg = Debug|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Debug|x64.Build.0 = Debug|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Release|x64.ActiveCfg = Release|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Release|x64.Build.0 = Release|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Debug|x64.ActiveCfg = Debug|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Debug|x64.Build.0 = Debug|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Release|x64.ActiveCfg = Release|x64
-		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Release|x64.Build.0 = Release|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Debug|x64.ActiveCfg = Beta_Debug|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Debug|x64.Build.0 = Beta_Debug|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Release|x64.ActiveCfg = Beta_Release|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Release|x64.Build.0 = Beta_Release|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Debug|x64.ActiveCfg = Stable_Debug|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Debug|x64.Build.0 = Stable_Debug|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Release|x64.ActiveCfg = Stable_Release|x64
-		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Release|x64.Build.0 = Stable_Release|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Debug|x64.ActiveCfg = Beta_Debug|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Debug|x64.Build.0 = Beta_Debug|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Release|x64.ActiveCfg = Beta_Release|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Release|x64.Build.0 = Beta_Release|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Debug|x64.ActiveCfg = Stable_Debug|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Debug|x64.Build.0 = Stable_Debug|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Release|x64.ActiveCfg = Stable_Release|x64
-		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Release|x64.Build.0 = Stable_Release|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Debug|x64.ActiveCfg = Beta_Debug|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Debug|x64.Build.0 = Beta_Debug|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Release|x64.ActiveCfg = Beta_Release|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Release|x64.Build.0 = Beta_Release|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Debug|x64.ActiveCfg = Stable_Debug|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Debug|x64.Build.0 = Stable_Debug|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Release|x64.ActiveCfg = Stable_Release|x64
-		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Release|x64.Build.0 = Stable_Release|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Debug|x64.ActiveCfg = Beta_Debug|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Debug|x64.Build.0 = Beta_Debug|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Release|x64.ActiveCfg = Beta_Release|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Release|x64.Build.0 = Beta_Release|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Debug|x64.ActiveCfg = Stable_Debug|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Debug|x64.Build.0 = Stable_Debug|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Release|x64.ActiveCfg = Stable_Release|x64
-		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Release|x64.Build.0 = Stable_Release|x64
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Release|Any CPU.ActiveCfg = Stable_Release|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Release|Any CPU.Build.0 = Stable_Release|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Release|Any CPU.ActiveCfg = Beta_Release|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Release|Any CPU.Build.0 = Beta_Release|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Debug|Any CPU.ActiveCfg = Stable_Debug|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Stable_Debug|Any CPU.Build.0 = Stable_Debug|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Debug|Any CPU.ActiveCfg = Beta_Debug|Any CPU
+		{5C1705E2-CC31-4215-A4CE-7A8AFF6D9BC3}.Beta_Debug|Any CPU.Build.0 = Beta_Debug|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Release|Any CPU.ActiveCfg = Stable_Release|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Release|Any CPU.Build.0 = Stable_Release|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Release|Any CPU.ActiveCfg = Beta_Release|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Release|Any CPU.Build.0 = Beta_Release|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Debug|Any CPU.ActiveCfg = Stable_Debug|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Stable_Debug|Any CPU.Build.0 = Stable_Debug|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Debug|Any CPU.ActiveCfg = Beta_Debug|Any CPU
+		{1339A1C0-C2F0-4491-91BB-D49C00332F68}.Beta_Debug|Any CPU.Build.0 = Beta_Debug|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Release|Any CPU.ActiveCfg = Stable_Release|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Release|Any CPU.Build.0 = Stable_Release|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Release|Any CPU.ActiveCfg = Beta_Release|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Release|Any CPU.Build.0 = Beta_Release|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Debug|Any CPU.ActiveCfg = Stable_Debug|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Stable_Debug|Any CPU.Build.0 = Stable_Debug|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Debug|Any CPU.ActiveCfg = Beta_Debug|Any CPU
+		{CC56F4AA-1C6F-4B20-9DA3-79A30E1F6734}.Beta_Debug|Any CPU.Build.0 = Beta_Debug|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Release|Any CPU.ActiveCfg = Stable_Release|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Release|Any CPU.Build.0 = Stable_Release|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Release|Any CPU.ActiveCfg = Beta_Release|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Release|Any CPU.Build.0 = Beta_Release|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Debug|Any CPU.ActiveCfg = Stable_Debug|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Stable_Debug|Any CPU.Build.0 = Stable_Debug|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Debug|Any CPU.ActiveCfg = Beta_Debug|Any CPU
+		{451849FC-0522-493D-B0DF-9538ABDBE56D}.Beta_Debug|Any CPU.Build.0 = Beta_Debug|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Release|Any CPU.ActiveCfg = Stable_Release|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Release|Any CPU.Build.0 = Stable_Release|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Release|Any CPU.ActiveCfg = Beta_Release|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Release|Any CPU.Build.0 = Beta_Release|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Debug|Any CPU.ActiveCfg = Stable_Debug|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Stable_Debug|Any CPU.Build.0 = Stable_Debug|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Debug|Any CPU.ActiveCfg = Beta_Debug|Any CPU
+		{C2FEF2CB-356C-4045-948D-F0755ABA6378}.Beta_Debug|Any CPU.Build.0 = Beta_Debug|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Beta_Release|Any CPU.Build.0 = Release|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17BE8506-B22B-4705-A777-C862888DA1F5}.Stable_Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj b/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;net6.0-windows;netstandard2.0</TargetFrameworks>
-    <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/Bannerlord.ButterLib/ButterLibSubModule.Services.cs b/src/Bannerlord.ButterLib/ButterLibSubModule.Services.cs
@@ -10,7 +10,7 @@ namespace Bannerlord.ButterLib;
 public sealed partial class ButterLibSubModule
 {
     public static bool CanBeConfigured { get; private set; } = true;
-    private static List<Action<IServiceCollection>> BeforeInitialization { get; } = new();
+    private static List<Action<IServiceCollection>> BeforeInitialization { get; } = [];
 
     /// <summary>
     /// The only way to inject your stuff before ButterLib will start it's initialization