WIP

imazen · Aug 29, 2024 · 81dcdaf · 81dcdaf
1 parent c01a7ab
commit 81dcdaf
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 43 deletions.
diff --git a/src/Imageflow.AllPlatforms/packages.lock.json b/src/Imageflow.AllPlatforms/packages.lock.json
@@ -45,8 +45,8 @@
       },
       "Microsoft.IO.RecyclableMemoryStream": {
         "type": "Transitive",
-        "resolved": "3.0.0",
-        "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==",
+        "resolved": "3.0.1",
+        "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g==",
         "dependencies": {
           "System.Memory": "4.5.5"
         }
@@ -150,14 +150,14 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.2, )",
-        "resolved": "8.0.2",
-        "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A=="
+        "requested": "[8.0.5, )",
+        "resolved": "8.0.5",
+        "contentHash": "4ISW1Ndgz86FkIbu5rVlMqhhtojdy5rUlxC/N+9kPh9qbYcvHiCvYbHKzAPVIx9OPYIjT9trXt7JI42Y5Ukq6A=="
       },
       "Microsoft.IO.RecyclableMemoryStream": {
         "type": "Transitive",
-        "resolved": "3.0.0",
-        "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg=="
+        "resolved": "3.0.1",
+        "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",

diff --git a/src/Imageflow/Bindings/NativeLibraryLoading.cs b/src/Imageflow/Bindings/NativeLibraryLoading.cs
@@ -154,20 +154,23 @@ internal static class RuntimeFileLocator
 
     internal static readonly Lazy<string> SharedLibraryExtension = new Lazy<string>(() =>
     {
-        switch (Environment.OSVersion.Platform)
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
-            case PlatformID.MacOSX:
-                return "dylib";
-            case PlatformID.Unix:
-                return "so";
-            case PlatformID.Win32NT:
-            case PlatformID.Win32S:
-            case PlatformID.Win32Windows:
-            case PlatformID.WinCE:
-            case PlatformID.Xbox:
-                return "dll";
-            default:
-                return "dll";
+            return "dylib";
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
+                 RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD))
+        {
+            return "so";
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return "dll";
+        }
+        else
+        {
+            // Default to dll for unknown platforms
+            return "dll";
         }
     }, LazyThreadSafetyMode.PublicationOnly);
 
@@ -196,22 +199,37 @@ internal static class RuntimeFileLocator
     /// </summary>
     internal static readonly Lazy<string> ArchitectureSubdir = new Lazy<string>(() =>
     {
-        // ReSharper disable once InvertIf
-        if (!IsUnix)
+        var processArchitecture = RuntimeInformation.ProcessArchitecture;
+        var archString = processArchitecture switch
         {
-            var architecture = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
-            if (string.Equals(architecture, "ia64", StringComparison.OrdinalIgnoreCase))
-            {
-                return "ia64";
-            }
-            if (string.Equals(architecture, "arm", StringComparison.OrdinalIgnoreCase))
-            {
-                return Environment.Is64BitProcess ? "arm64" : "arm";
-            }
-            // We don't currently support unlisted/unknown architectures. We default to x86/x64 as backup
+            Architecture.X86 => "x86",
+            Architecture.X64 => "x64",
+            Architecture.Arm => "arm",
+            Architecture.Arm64 => "arm64",
+            Architecture.Armv6 => "armv6",
+            Architecture.LoongArch64 => "loongarch64",
+            Architecture.Ppc64le => "ppc64le",
+            Architecture.S390x => "s390x",
+            Architecture.Wasm => "wasm",
+            _ => null
+        };
+
+        if (archString != null)
+        {
+            return archString;
         }
-        //TODO: Add support for arm/arm64 on linux
-        return Environment.Is64BitProcess ? "x64" : "x86";
+
+        // Fallback to environment variable if RuntimeInformation.ProcessArchitecture is not conclusive
+        var envArchitecture = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
+        return envArchitecture?.ToUpperInvariant() switch
+        {
+            "AMD64" => "x64",
+            "IA64" => "ia64",
+            "ARM64" => "arm64",
+            "EM64T" => "x64", // Treating EM64T as x64
+            "X86" => "x86",
+            _ => Environment.Is64BitProcess ? "x64" : "x86" // Default fallback
+        };
     }, LazyThreadSafetyMode.PublicationOnly);
 
     /// <summary>

diff --git a/src/Imageflow/packages.lock.json b/src/Imageflow/packages.lock.json
@@ -5,8 +5,8 @@
       "Microsoft.IO.RecyclableMemoryStream": {
         "type": "Direct",
         "requested": "[3.*, 4.0.0)",
-        "resolved": "3.0.0",
-        "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg==",
+        "resolved": "3.0.1",
+        "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g==",
         "dependencies": {
           "System.Memory": "4.5.5"
         }
@@ -124,8 +124,8 @@
       "Microsoft.IO.RecyclableMemoryStream": {
         "type": "Direct",
         "requested": "[3.*, 4.0.0)",
-        "resolved": "3.0.0",
-        "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg=="
+        "resolved": "3.0.1",
+        "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
       },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
@@ -221,14 +221,14 @@
       "Microsoft.IO.RecyclableMemoryStream": {
         "type": "Direct",
         "requested": "[3.*, 4.0.0)",
-        "resolved": "3.0.0",
-        "contentHash": "irv0HuqoH8Ig5i2fO+8dmDNdFdsrO+DoQcedwIlb810qpZHBNQHZLW7C/AHBQDgLLpw2T96vmMAy/aE4Yj55Sg=="
+        "resolved": "3.0.1",
+        "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.2, )",
-        "resolved": "8.0.2",
-        "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A=="
+        "requested": "[8.0.5, )",
+        "resolved": "8.0.5",
+        "contentHash": "4ISW1Ndgz86FkIbu5rVlMqhhtojdy5rUlxC/N+9kPh9qbYcvHiCvYbHKzAPVIx9OPYIjT9trXt7JI42Y5Ukq6A=="
       },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",