Merge pull request #389 from BUTR/dev

v2.9.6

build/common.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.9.5</Version>
+    <Version>2.9.6</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.138</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.221</BUTRModuleManagerVersion>
-    <CrashReportVersion>13.0.0.72</CrashReportVersion>
+    <CrashReportVersion>13.0.0.78</CrashReportVersion>
   </PropertyGroup>
 
   <PropertyGroup>

changelog.txt

@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.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.x
+* More Crash Report related fixes. Fixed WinForms renderer
+---------------------------------------------------------------------------------------------------
 Version: 2.9.5
 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
 * More Crash Report related fixes. Involved modules were incorrectly rendered

src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj

@@ -3,12 +3,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>net472;net6.0-windows;netstandard2.0</TargetFrameworks>
+    <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
-    <Platform>x64</Platform>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
     <BUTRUploadUrl>$(BANNERLORD_BUTR_UPLOAD_URL)</BUTRUploadUrl>
     <DefineConstants>$(DefineConstants);BANNERLORDBUTRSHARED_BUTTERLIB;X64</DefineConstants>
     <SkipDependencies>false</SkipDependencies>
@@ -28,8 +27,6 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>Butter.png</PackageIcon>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Platforms>x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <None Include="../../resources/Butter.png" Pack="true" PackagePath="" />
@@ -83,14 +80,14 @@
   -->
 
   <ItemGroup Condition="$(TargetFramework) == 'net472'">
-    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression" PrivateAssets="all" />
   </ItemGroup>
 
   <!--Windows Forms-->
   <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="System.Windows.Forms" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net6'">
+  <ItemGroup Condition="$(TargetFramework) == 'net6.0-windows'">
     <FrameworkReference Include="Microsoft.WindowsDesktop.App" PrivateAssets="all" />
   </ItemGroup>
   <!--Windows Forms-->

src/Bannerlord.ButterLib/ExceptionHandler/ExceptionReporter.cs

@@ -67,7 +67,7 @@ public static void Show(Exception exception)
 #if NET472 || (NET6_0 && WINDOWS)
 
                 var forms = new CrashReportWinForms(crashReportModel, logSources, crashReportRendererUtilities);
-                forms.Show();
+                forms.ShowDialog();
 #endif
             }
             catch (Exception ex2)