Merge pull request #387 from BUTR/dev

v2.9.4

.github/workflows/test-full.yml

@@ -86,7 +86,7 @@ jobs:
         path: coveragereport
 
     - name: Upload ReportGenerator to CodeCov
-      uses: codecov/codecov-action@v4.2.0
+      uses: codecov/codecov-action@v4.3.0
       with:
         token: ${{secrets.CODECOV_TOKEN}}
         file: coveragereport/Cobertura.xml

.github/workflows/test.yml

@@ -92,7 +92,7 @@ jobs:
         path: coveragereport
 
     - name: Upload ReportGenerator to CodeCov
-      uses: codecov/codecov-action@v4.2.0
+      uses: codecov/codecov-action@v4.3.0
       with:
         token: ${{secrets.CODECOV_TOKEN}}
         file: coveragereport/Cobertura.xml

build/common.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.9.3</Version>
+    <Version>2.9.4</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.68</CrashReportVersion>
+    <CrashReportVersion>13.0.0.69</CrashReportVersion>
   </PropertyGroup>
 
   <PropertyGroup>

changelog.txt

@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.4
+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. Improved the Html renderer
+---------------------------------------------------------------------------------------------------
 Version: 2.9.3
 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. Improved the Html renderer

src/Bannerlord.ButterLib/CrashUploader/BUTRCrashUploader.cs

@@ -22,8 +22,7 @@ public async Task<CrashUploaderResult> UploadAsync(CrashReportModel crashReportM
     {
         try
         {
-            var assembly = Assembly.GetExecutingAssembly();
-            var uploadUrlAttr = assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(a => a.Key == "BUTRUploadUrl");
+            var uploadUrlAttr = typeof(BUTRCrashUploader).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>().FirstOrDefault(a => a.Key == "BUTRUploadUrl");
             if (uploadUrlAttr is null)
                 return CrashUploaderResult.MetadataNotFound();
 
@@ -32,7 +31,7 @@ public async Task<CrashUploaderResult> UploadAsync(CrashReportModel crashReportM
             var httpWebRequest = WebRequest.CreateHttp(uploadUrlAttr.Value);
             httpWebRequest.Method = "POST";
             httpWebRequest.ContentType = "application/json";
-            httpWebRequest.UserAgent = $"ButterLib CrashUploader v{assembly.GetName().Version}";
+            httpWebRequest.UserAgent = $"ButterLib CrashUploader v{typeof(BUTRCrashUploader).Assembly.GetName().Version}";
             httpWebRequest.Headers.Add("Content-Encoding", "gzip,deflate");
 
             using var writeStream = await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false);
@@ -43,7 +42,7 @@ public async Task<CrashUploaderResult> UploadAsync(CrashReportModel crashReportM
             if (response is not HttpWebResponse httpWebResponse)
                 return CrashUploaderResult.ResponseIsNotHttpWebResponse();
 
-            if (httpWebResponse.StatusCode is not HttpStatusCode.OK or HttpStatusCode.Created)
+            if (httpWebResponse.StatusCode is not HttpStatusCode.OK and not HttpStatusCode.Created)
                 return CrashUploaderResult.WrongStatusCode(httpWebResponse.StatusCode.ToString());
 
             using var stream = response.GetResponseStream();