fix: update ManagedLoadContext to search in additional probing paths (#…

…172)
natemcmaster · Jan 31, 2021 · 5cd23e7 · 5cd23e7
1 parent f317c02
commit 5cd23e7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/src/Plugins/Loader/ManagedLoadContext.cs b/src/Plugins/Loader/ManagedLoadContext.cs
@@ -154,10 +154,14 @@ public ManagedLoadContext(string mainAssemblyPath,
             {
                 // if an assembly was not listed in the list of known assemblies,
                 // fallback to the load context base directory
-                var localFile = Path.Combine(_basePath, assemblyName.Name + ".dll");
-                if (File.Exists(localFile))
+                var dllName = assemblyName.Name + ".dll";
+                foreach (var probingPath in _additionalProbingPaths.Prepend(_basePath))
                 {
-                    return LoadAssemblyFromFilePath(localFile);
+                    var localFile = Path.Combine(probingPath, dllName);
+                    if (File.Exists(localFile))
+                    {
+                        return LoadAssemblyFromFilePath(localFile);
+                    }
                 }
             }
 
@@ -225,17 +229,24 @@ protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
                         else
                         {
                             // fallback to native assets which match the file name in the plugin base directory
-                            var localFile = Path.Combine(_basePath, prefix + unmanagedDllName + suffix);
-                            if (File.Exists(localFile))
-                            {
-                                return LoadUnmanagedDllFromResolvedPath(localFile);
-                            }
+                            var prefixSuffixDllName = prefix + unmanagedDllName + suffix;
+                            var prefixDllName = prefix + unmanagedDllName;
 
-                            var localFileWithoutSuffix = Path.Combine(_basePath, prefix + unmanagedDllName);
-                            if (File.Exists(localFileWithoutSuffix))
+                            foreach (var probingPath in _additionalProbingPaths.Prepend(_basePath))
                             {
-                                return LoadUnmanagedDllFromResolvedPath(localFileWithoutSuffix);
+                                var localFile = Path.Combine(probingPath, prefixSuffixDllName);
+                                if (File.Exists(localFile))
+                                {
+                                    return LoadUnmanagedDllFromResolvedPath(localFile);
+                                }
+
+                                var localFileWithoutSuffix = Path.Combine(probingPath, prefixDllName);
+                                if (File.Exists(localFileWithoutSuffix))
+                                {
+                                    return LoadUnmanagedDllFromResolvedPath(localFileWithoutSuffix);
+                                }
                             }
+
                         }
                     }
 

diff --git a/src/Plugins/releasenotes.props b/src/Plugins/releasenotes.props
@@ -1,5 +1,9 @@
 <Project>
   <PropertyGroup>
+    <PackageReleaseNotes Condition="'$(VersionPrefix)' == '1.4.0'">
+Changes:
+* @Sewer56 - search in additional probing paths (PR #172)
+    </PackageReleaseNotes>
     <PackageReleaseNotes Condition="'$(VersionPrefix)' == '1.3.1'">
 Changes:
 * @KatoStoelen - don't create shadow copy that already exists (PR #147)