chore(release): merge dev into main for v0.4.48

Author: BAKAOLC

scripts/release_lib/nuget.py

@@ -61,8 +61,11 @@ def snapshot_bundle_variant_after_pack(
 
     manifest_dest = bundle_staging_root / MOD_MANIFEST_NAME
     if compat_target == latest_compat or not manifest_dest.is_file():
-        obj_dir = ritsulib_root / GODOT_MONO_OBJ_PREFIX / configuration
-        gen = obj_dir / "mod_manifest.generated.json"
+        gen = generated_manifest_path(
+            ritsulib_root,
+            configuration=configuration,
+            compat_target=compat_target,
+        )
         if gen.is_file():
             shutil.copy2(gen, manifest_dest)
         copy_viewer_dist_to(bundle_staging_root, ritsulib_root=ritsulib_root)
@@ -503,11 +506,14 @@ def create_github_zip(
 ) -> Path:
     output_dir.mkdir(parents=True, exist_ok=True)
     out_bin = ritsulib_root / GODOT_MONO_BIN_PREFIX / configuration
-    out_obj = ritsulib_root / GODOT_MONO_OBJ_PREFIX / configuration
     dll_path = out_bin / ritsulib_built_dll_name()
     doc_xml_path = out_bin / ritsulib_built_doc_xml_name()
     pdb_path = out_bin / ritsulib_built_pdb_name()
-    manifest_generated = out_obj / "mod_manifest.generated.json"
+    manifest_generated = generated_manifest_path(
+        ritsulib_root,
+        configuration=configuration,
+        compat_target=compat_target,
+    )
     manifest_path = manifest_generated if manifest_generated.is_file() else (ritsulib_root / MOD_MANIFEST_NAME)
     if not dll_path.is_file():
         msg = f"Could not find built DLL for zip packaging: {dll_path}"
@@ -535,6 +541,19 @@ def create_github_zip(
     return zip_path
 
 
+def generated_manifest_path(
+    ritsulib_root: Path,
+    *,
+    configuration: str,
+    compat_target: str,
+) -> Path:
+    obj_root = ritsulib_root / GODOT_MONO_OBJ_PREFIX / configuration
+    compat_manifest = obj_root / compat_target / "mod_manifest.generated.json"
+    if compat_manifest.is_file():
+        return compat_manifest
+    return obj_root / "mod_manifest.generated.json"
+
+
 def run_push(package: Path, *, source: str, api_key: str) -> None:
     subprocess.run(
         [

src/Diagnostics/Patches/SentryGdExtensionShutdown1071WorkaroundPatch.cs

@@ -12,12 +12,12 @@
 namespace STS2RitsuLib.Diagnostics.Patches
 {
     /// <summary>
-    ///     Temporary workaround for STS2 0.107.1 native crashes when modded startup shuts down Sentry's
+    ///     Temporary workaround for STS2 0.107.1+ native crashes when modded startup shuts down Sentry's
     ///     GDExtension before process exit. Remove this patch after the host game fixes the shutdown path.
     /// </summary>
     internal sealed class SentryGdExtensionShutdown1071WorkaroundPatch : IPatchMethod
     {
-        private static readonly Version AffectedHostVersion = new(0, 107, 1);
+        private static readonly Version AffectedHostMinVersion = new(0, 107, 1);
 
         private static readonly MethodInfo SkipMethod =
             AccessTools.DeclaredMethod(typeof(SentryGdExtensionShutdown1071WorkaroundPatch),
@@ -28,7 +28,7 @@ internal sealed class SentryGdExtensionShutdown1071WorkaroundPatch : IPatchMetho
         public static string PatchId => "sentry_gdextension_shutdown_01071_workaround";
 
         public static string Description =>
-            "Skip STS2 0.107.1 native Sentry GDExtension shutdown while preserving .NET Sentry shutdown";
+            "Skip STS2 0.107.1+ native Sentry GDExtension shutdown while preserving .NET Sentry shutdown";
 
         public static bool IsCritical => false;
 
@@ -55,7 +55,7 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
 
         private static bool IsAffectedHost()
         {
-            return Sts2HostVersion.Numeric == AffectedHostVersion;
+            return Sts2HostVersion.Numeric >= AffectedHostMinVersion;
         }
 
         private static bool IsGodotObjectCall(MethodInfo method)
@@ -72,7 +72,7 @@ private static Variant SkipNativeGdExtensionShutdown(GodotObject instance, Strin
                 return default;
 
             PatchLog.For<SentryGdExtensionShutdown1071WorkaroundPatch>().Info(
-                "[SentryCompat] Skipped native Sentry GDExtension shutdown for STS2 0.107.1 workaround.");
+                "[SentryCompat] Skipped native Sentry GDExtension shutdown for STS2 0.107.1+ workaround.");
             return default;
         }
     }