Fix passing properties to .NET Core init and add type hints

Author: filmor

clr_loader/__init__.py

@@ -33,7 +33,7 @@ def get_coreclr(
 
     impl = DotnetCoreRuntime(runtime_config=runtime_config, dotnet_root=dotnet_root)
     if properties:
-        for key, value in properties:
+        for key, value in properties.items():
             impl[key] = value
 
     return Runtime(impl)

clr_loader/hostfxr.py

@@ -16,11 +16,11 @@ def __init__(self, runtime_config: str, dotnet_root: str):
         self._load_func = _get_load_func(self._dll, self._handle)
 
     @property
-    def dotnet_root(self):
+    def dotnet_root(self) -> str:
         return self._dotnet_root
 
     @property
-    def is_finalized(self):
+    def is_finalized(self) -> bool:
         return self._is_finalized
 
     def __getitem__(self, key: str) -> str:
@@ -58,7 +58,7 @@ def __iter__(self):
         for i in range(size_ptr[0]):
             yield (decode(keys_ptr[i]), decode(values_ptr[i]))
 
-    def get_callable(self, assembly_path, typename, function):
+    def get_callable(self, assembly_path: str, typename: str, function: str):
         # TODO: Maybe use coreclr_get_delegate as well, supported with newer API
         # versions of hostfxr
         self._is_finalized = True
@@ -79,7 +79,7 @@ def get_callable(self, assembly_path, typename, function):
         check_result(res)
         return ffi.cast("component_entry_point_fn", delegate_ptr[0])
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         if self._handle is not None:
             self._dll.hostfxr_close(self._handle)
             self._handle = None
@@ -88,7 +88,7 @@ def __del__(self):
         self.shutdown()
 
 
-def _get_handle(dll, dotnet_root, runtime_config):
+def _get_handle(dll, dotnet_root: str, runtime_config: str):
     params = ffi.new("hostfxr_initialize_parameters*")
     params.size = ffi.sizeof("hostfxr_initialize_parameters")
     # params.host_path = ffi.new("char_t[]", encode(sys.executable))

clr_loader/mono.py

@@ -87,12 +87,12 @@ def initialize(config_file: str, libmono: str) -> None:
         _MONO = load_mono(libmono)
 
         if config_file is None:
-            config_file = ffi.NULL
+            config_bytes = ffi.NULL
         else:
-            config_file = config_file.encode("utf8")
+            config_bytes = config_file.encode("utf8")
 
         _ROOT_DOMAIN = _MONO.mono_jit_init(b"clr_loader")
-        _MONO.mono_config_parse(config_file)
+        _MONO.mono_config_parse(config_bytes)
         _check_result(_ROOT_DOMAIN, "Failed to initialize Mono")
         atexit.register(_release)
 

clr_loader/netfx.py

@@ -1,17 +1,18 @@
 import atexit
+from typing import Optional, Any
 from .ffi import ffi, load_netfx
 
-_FW = None
+_FW: Optional[Any] = None
 
 
 class NetFx:
-    def __init__(self, name=None, config_file=None):
+    def __init__(self, name: Optional[str] = None, config_file: Optional[str] = None):
         initialize()
         self._domain = _FW.pyclr_create_appdomain(
             name or ffi.NULL, config_file or ffi.NULL
         )
 
-    def get_callable(self, assembly_path, typename, function):
+    def get_callable(self, assembly_path: str, typename: str, function: str):
         func = _FW.pyclr_get_function(
             self._domain,
             assembly_path.encode("utf8"),