Fix native library loading for osx-arm64 (#17495)

Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
PowerShell · Jun 7, 2022 · d8d1d78 · d8d1d78
1 parent f518f0b
commit d8d1d78
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -232,6 +232,9 @@ internal IEnumerable<Assembly> GetAssembly(string namespaceQualifiedTypeName)
         ///                     |
         ///                     |--- 'osx-x64' subfolder
         ///                     |       |--- native.dylib
+        ///                     |
+        ///                     |--- 'osx-arm64' subfolder
+        ///                     |       |--- native.dylib
         /// </summary>
         internal static IntPtr NativeDllHandler(Assembly assembly, string libraryName)
         {
@@ -552,7 +555,7 @@ private static string GetNativeDllSubFolderName(out string ext)
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                folderName = "osx-x64";
+                folderName = "osx-" + processArch;
                 ext = ".dylib";
             }