Address eserscor review feedback: add debug logging, tighten shell guard, fix brace style

Author: tianleiwu

csharp/src/Microsoft.ML.OnnxRuntime/NativeMethods.shared.cs

@@ -932,21 +932,30 @@ private static IntPtr DllImportResolver(string libraryName, Assembly assembly, D
                         // Probe the specific RID first, then common fallbacks for the current OS
                         string[] ridsToTry;
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                        {
                             ridsToTry = new[] { rid, "win-x64", "win-arm64" };
+                        }
                         else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                        {
                             ridsToTry = new[] { rid, "linux-x64", "linux-arm64" };
+                        }
                         else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                        {
                             // We no longer provide osx-x64 in official package since 1.24.
                             // However, we keep it in the list for build-from-source users.
                             ridsToTry = new[] { rid, "osx-arm64", "osx-x64" };
+                        }
                         else
+                        {
                             ridsToTry = new[] { rid };
+                        }
 
                         foreach (var tryRid in ridsToTry)
                         {
                             string probePath = System.IO.Path.Combine(assemblyDir, "runtimes", tryRid, "native", mappedName);
                             if (System.IO.File.Exists(probePath) && NativeLibrary.TryLoad(probePath, assembly, searchPath, out handle))
                             {
+                                LogLibLoad($"[DllImportResolver] Loaded {mappedName} from: {probePath}");
                                 return handle;
                             }
                         }
@@ -959,26 +968,36 @@ private static IntPtr DllImportResolver(string libraryName, Assembly assembly, D
                         string probePath = System.IO.Path.Combine(baseDir, mappedName);
                         if (NativeLibrary.TryLoad(probePath, assembly, searchPath, out handle))
                         {
+                            LogLibLoad($"[DllImportResolver] Loaded {mappedName} from: {probePath}");
                             return handle;
                         }
 
                         string rid = RuntimeInformation.RuntimeIdentifier;
                         probePath = System.IO.Path.Combine(baseDir, "runtimes", rid, "native", mappedName);
                         if (NativeLibrary.TryLoad(probePath, assembly, searchPath, out handle))
                         {
+                            LogLibLoad($"[DllImportResolver] Loaded {mappedName} from: {probePath}");
                             return handle;
                         }
                     }
 
-#if DEBUG
-                    System.Console.WriteLine($"[DllImportResolver] Failed loading {mappedName} (RID: {RuntimeInformation.RuntimeIdentifier}, Assembly: {assemblyLocation})");
-#endif
+                    LogLibLoad($"[DllImportResolver] Failed loading {mappedName} (RID: {RuntimeInformation.RuntimeIdentifier}, Assembly: {assemblyLocation})");
+
                 }
             }
 
             // Fall back to default resolution
             return IntPtr.Zero;
         }
+
+        private static void LogLibLoad(string message)
+        {
+            System.Diagnostics.Trace.WriteLine(message);
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ORT_LOADER_VERBOSITY")))
+            {
+                Console.WriteLine(message);
+            }
+        }
 #endif
 
         [DllImport(NativeLib.DllName, CharSet = CharSet.Ansi)]

tools/ci_build/github/azure-pipelines/nuget/templates/test_macos.yml

@@ -76,3 +76,4 @@ stages:
           DisableContribOps: $(DisableContribOps)
           DisableMlOps: $(DisableMlOps)
           IsReleaseBuild: $(IsReleaseBuild)
+          ORT_LOADER_VERBOSITY: 1

tools/ci_build/github/linux/copy_strip_binary.sh

@@ -32,7 +32,8 @@ then
     # because the versioned library is excluded by the nuspec generation script.
     # We explicitly overwrite the symlink with the real file to ensure 'nuget pack' (especially on Windows)
     # doesn't pack an empty/broken symlink.
-    if [[ "$LIB_NAME" != "libonnxruntime.dylib" && -L "$BINARY_DIR/$ARTIFACT_NAME/lib/libonnxruntime.dylib" ]]; then
+    # Only applies to versioned libonnxruntime libraries (e.g. libonnxruntime.1.24.0.dylib).
+    if [[ "$LIB_NAME" =~ ^libonnxruntime\..*\.dylib$ && -L "$BINARY_DIR/$ARTIFACT_NAME/lib/libonnxruntime.dylib" ]]; then
        rm "$BINARY_DIR/$ARTIFACT_NAME/lib/libonnxruntime.dylib"
        cp "$BINARY_DIR/$ARTIFACT_NAME/lib/$LIB_NAME" "$BINARY_DIR/$ARTIFACT_NAME/lib/libonnxruntime.dylib"
     fi