From b529a603aa97a85172238055bb5a4f02c743939a Mon Sep 17 00:00:00 2001
From: Miepee <janbidler00@protonmail.com>
Date: Sun, 29 Sep 2024 01:32:17 +0200
Subject: [PATCH] Release version 2.9.0-rc3

---
 YAMS-LIB/YAMS-LIB.csproj |  2 +-
 am2r_yams/wrapper.py     | 33 +++++++++++++++++++++++++++++++++
 pyproject.toml           |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/YAMS-LIB/YAMS-LIB.csproj b/YAMS-LIB/YAMS-LIB.csproj
index 495ac4a..29904cb 100644
--- a/YAMS-LIB/YAMS-LIB.csproj
+++ b/YAMS-LIB/YAMS-LIB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>2.9.0-rc2</Version>
+        <Version>2.9.0-rc3</Version>
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/am2r_yams/wrapper.py b/am2r_yams/wrapper.py
index fafcc37..bf29ddb 100644
--- a/am2r_yams/wrapper.py
+++ b/am2r_yams/wrapper.py
@@ -15,8 +15,41 @@
 # 2. While we figured out how to deal with non system installations via the DOTNET_ROOT env var,
 #    should we also provide a way to just pass a `dotnet_root` param to the wrapper which gets
 #    passed to pythonnet?
+dotnet_os = "unknown"
+dotnet_arch = "unknown"
+system = platform.system()
+if system == "Windows":
+    dotnet_os = "win"
+elif system == "Darwin":
+    dotnet_os = "osx"
+elif system == "Linux":
+    dotnet_os = "linux"  # Might break for musl, I dont care.
+else:
+    raise ValueError("Couldn't determine the OS handle for dotnet cleanup!")
+
+arch = platform.machine()
+if arch == "AMD64" or arch == "x86_64":
+    dotnet_arch = "x64"
+elif arch == "arm64" or arch == "aarch64":
+    dotnet_arch = "arm64"
+else:
+    raise ValueError("Couldn't determine the architecture handle for dotnet cleanup!")
+
+dotnet_rid = dotnet_os + "-" + dotnet_arch
+
 yams_path = os.fspath(Path(__file__).with_name(name="yams"))
 sys.path.append(yams_path)
+for os_dir in Path(__file__).parent.joinpath("yams", "runtimes").iterdir():
+    if not os_dir.is_dir():
+        continue
+    if os_dir.name != dotnet_rid:
+        continue
+
+    for dll in os_dir.iterdir():
+        if not dll.is_file():
+            continue
+        sys.path.append(os.fspath(dll))
+
 from pythonnet import load, unload
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 3b6aefb..04334e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "am2r_yams"
-version = "2.9.0-rc2"
+version = "2.9.0-rc3"
 authors = [
     {name = "Miepee"},
 ]