Возвращено поведение загрузчика из версии 1 с приоритетом ключа lib.additional

Author: EvilBeaver

src/ScriptEngine.HostedScript/Extensions/EngineBuilderExtensions.cs

@@ -88,19 +88,15 @@ public static IEngineBuilder UseFileSystemLibraries(this IEngineBuilder b)
                         entrypoint = typeof(FileSystemDependencyResolver).Assembly;
 
                     sysDir = Path.GetDirectoryName(entrypoint.Location);
-                    searchDirs.Add(sysDir);
                 }
-                else
-                {
-                    searchDirs.Add(sysDir);
-                }
-            
+                
                 if (libOptions.AdditionalLibraries != null)
                 {
                     searchDirs.AddRange(libOptions.AdditionalLibraries);
                 }
 
                 var resolver = new FileSystemDependencyResolver();
+                resolver.LibraryRoot = sysDir;
                 resolver.SearchDirectories.AddRange(searchDirs);
 
                 return resolver;

src/ScriptEngine.HostedScript/FileSystemDependencyResolver.cs

@@ -24,6 +24,7 @@ public class FileSystemDependencyResolver : IDependencyResolver
         private readonly List<Library> _libs = new List<Library>();
         private LibraryLoader _defaultLoader;
         private object _defaultLoaderLocker = new object();
+        private string _libraryRoot;
 
         #region Private classes
 
@@ -48,8 +49,27 @@ public FileSystemDependencyResolver()
 
         public IList<string> SearchDirectories { get;} = new List<string>();
 
-        public string LibraryRoot => SearchDirectories.FirstOrDefault() ?? string.Empty;
-        
+        public string LibraryRoot
+        {
+            get
+            {
+                if (_libraryRoot == null)
+                    _libraryRoot = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+
+                return _libraryRoot;
+            }
+            set
+            {
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    _libraryRoot = null;
+                }
+                
+                _libraryRoot = value;
+            }
+        }
+            
+
         private ScriptingEngine Engine { get; set; }
 
         public void Initialize(ScriptingEngine engine)