Fix bundled .NET runtime config

Author: dertwist

RELEASE_NOTES.md

@@ -1,2 +1,3 @@
 ## 🔧 Main App
-* Added rename asset action.
+* Fixed Cleanup failing to open when the .NET Desktop Runtime config was missing.
+* Improved .NET runtime checks for bundled stable builds.

makefile.py

@@ -221,6 +221,11 @@ def build_app_pyinstaller(fast=False, channel='stable') -> None:
         _generate_pycparser_tables()
         tables = find_pycparser_tables()
 
+    runtime_config_dir = os.path.join(cur_dir, 'src', 'external', 'dotnet')
+    runtime_config_path = os.path.join(runtime_config_dir, 'Hammer5Tools.runtimeconfig.json')
+    if channel == 'stable':
+        generate_runtime_config(runtime_config_dir)
+
     pyinstaller_cmd = [
         sys.executable, '-m', 'PyInstaller',
         '--name=Hammer5Tools_Core',
@@ -269,14 +274,10 @@ def build_app_pyinstaller(fast=False, channel='stable') -> None:
         external,
         *( [f'--add-binary=src{os.sep}external{os.sep}{dll};external{os.sep}{dll}' for dll, _ in dotnet_dlls] if channel == 'stable' else [] ),
         *( get_dotnet_runtime_data() if channel == 'stable' else [] ),
-        '--add-data=src/external/dotnet;dotnet/' if os.path.exists('src/external/dotnet') else '',
+        f'--add-data={runtime_config_path};dotnet' if channel == 'stable' and os.path.exists(runtime_config_path) else '',
         'src/main.py'
     ]
     pyinstaller_cmd = [arg for arg in pyinstaller_cmd if arg]
-    
-    # Ensure runtime config exists for bundling
-    if channel == 'stable':
-        generate_runtime_config(os.path.join(cur_dir, 'src', 'external', 'dotnet'))
 
     if tables:
         lextab_path, yacctab_path = tables

src/common.py

@@ -46,7 +46,7 @@ def generate_unique_name(base_name: str, existing_names: Set[str], separator: st
 from pathlib import Path
 
 # Versions
-app_version = '5.1.1'
+app_version = '5.1.2'
 
 def get_channel() -> str:
     """
@@ -385,4 +385,4 @@ def fast_deepcopy(obj):
 
 def get_cs2_path():
     from src.settings.common import get_cs2_path as _get_cs2_path
-    return _get_cs2_path()
+    return _get_cs2_path()

src/dotnet.py

@@ -16,6 +16,7 @@
 from PySide6.QtWidgets import QMessageBox
 
 tests_path = Path(__file__).parent.parent / 'tests'
+RUNTIME_CONFIG_NAME = 'Hammer5Tools.runtimeconfig.json'
 
 
 class DotNetPaths:
@@ -57,21 +58,28 @@ def _init_pythonnet(self):
 
         try:
             from pythonnet import load
-            
+
+            runtime_config = None
+
             # Check for bundled runtime in frozen (PyInstaller) state
             if getattr(sys, 'frozen', False):
                 bundled_dotnet = os.path.join(sys._MEIPASS, 'dotnet')
                 if os.path.exists(bundled_dotnet):
                     # Set DOTNET_ROOT to help clr_loader find the bundled runtime
                     os.environ["DOTNET_ROOT"] = bundled_dotnet
+                    os.environ["DOTNET_ROOT_X64"] = bundled_dotnet
                     # Point to the runtime config if it exists
-                    runtime_config = os.path.join(bundled_dotnet, 'Hammer5Tools.runtimeconfig.json')
-                    if os.path.exists(runtime_config):
-                        load("coreclr", runtime_config=runtime_config)
-                    else:
-                        load("coreclr")
-                else:
-                    load("coreclr")
+                    bundled_config = os.path.join(bundled_dotnet, RUNTIME_CONFIG_NAME)
+                    if os.path.exists(bundled_config):
+                        runtime_config = bundled_config
+
+            if runtime_config is None:
+                local_config = Path(__file__).parent / 'external' / 'dotnet' / RUNTIME_CONFIG_NAME
+                if local_config.exists():
+                    runtime_config = str(local_config)
+
+            if runtime_config:
+                load("coreclr", runtime_config=runtime_config)
             else:
                 load("coreclr")
 
@@ -80,6 +88,11 @@ def _init_pythonnet(self):
             self._initialized = True
         except ImportError as e:
             raise RuntimeError("Python.NET not available. Install with: pip install pythonnet") from e
+        except Exception as e:
+            raise RuntimeError(
+                ".NET Desktop Runtime 9.0 or newer is required for this tool. "
+                "Install it from https://dotnet.microsoft.com/download/dotnet/9.0"
+            ) from e
 
     def _load_assembly(self, path: Path) -> None:
         """Load a .NET assembly with error handling."""
@@ -347,7 +360,7 @@ def check_runtime(self, show_dialog: bool = True) -> bool:
         # 1. Check for bundled runtime first (in frozen state)
         if getattr(sys, 'frozen', False):
             bundled_dotnet = os.path.join(sys._MEIPASS, 'dotnet')
-            if os.path.exists(bundled_dotnet):
+            if self._bundled_runtime_is_complete(bundled_dotnet):
                 return True
 
         try:
@@ -384,6 +397,26 @@ def check_runtime(self, show_dialog: bool = True) -> bool:
                 setup_keyvalues2()
             return False
 
+    def _bundled_runtime_is_complete(self, bundled_dotnet: str) -> bool:
+        """Validate the bundled runtime enough to avoid pythonnet hostfxr crashes."""
+        if not os.path.isdir(bundled_dotnet):
+            return False
+
+        runtime_config = os.path.join(bundled_dotnet, RUNTIME_CONFIG_NAME)
+        if not os.path.isfile(runtime_config):
+            return False
+
+        shared = os.path.join(bundled_dotnet, "shared")
+        for framework in ("Microsoft.NETCore.App", "Microsoft.WindowsDesktop.App"):
+            framework_dir = os.path.join(shared, framework)
+            if not os.path.isdir(framework_dir):
+                return False
+            versions = [v for v in os.listdir(framework_dir) if v.startswith(self.min_version)]
+            if not versions:
+                return False
+
+        return True
+
     def _show_download_dialog(self):
         """Show dialog to download .NET runtime."""
         try: