Simplify the main functions a bit, allow different hostfxr versions

Author: filmor

clr_loader/__init__.py

@@ -50,22 +50,22 @@ def __getitem__(self, path):
         return self.get_assembly(path)
 
 
-def get_mono(cls, domain=None):
+def get_mono(domain=None):
     from .mono import Mono
 
     impl = Mono(domain=domain)
-    return cls(impl)
+    return Runtime(impl)
 
 
-def get_coreclr(cls, runtime_config, dotnet_root=None):
+def get_coreclr(runtime_config, dotnet_root=None):
     from .hostfxr import HostFxr
 
     impl = HostFxr(runtime_config=runtime_config, dotnet_root=dotnet_root)
-    return cls(impl)
+    return Runtime(impl)
 
 
-def get_netfx(cls, name=None, config_file=None):
+def get_netfx(name=None, config_file=None):
     from .netfx import NetFx
 
     impl = NetFx(name=name, config_file=config_file)
-    return cls(impl)
+    return Runtime(impl)

clr_loader/ffi/__init__.py

@@ -1,6 +1,7 @@
-import sys
+import glob
 import os
 import shutil
+import sys
 
 import cffi
 
@@ -21,13 +22,16 @@ def load_coreclr(runtime):
 
 
 def load_hostfxr(dotnet_root):
-    hostfxr_version = "3.0.0"
     hostfxr_name = _get_dll_name("hostfxr")
-    hostfxr_path = os.path.join(
-        dotnet_root, "host", "fxr", hostfxr_version, hostfxr_name
-    )
+    hostfxr_path = os.path.join(dotnet_root, "host", "fxr", "3.*", hostfxr_name)
+
+    for hostfxr_path in reversed(sorted(glob.glob(hostfxr_path))):
+        try:
+            return ffi.dlopen(hostfxr_path)
+        except Exception:
+            pass
 
-    return ffi.dlopen(hostfxr_path)
+    raise RuntimeError(f"Could not find a suitable hostfxr library in {dotnet_root}")
 
 
 def load_mono(path=None, gc=None):