fix plugins to make single file assemblies possible (#2946)

neo-project · Nov 7, 2023 · d824357 · d824357
1 parent 3fc8895
commit d824357
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Neo/Plugins/Plugin.cs b/src/Neo/Plugins/Plugin.cs
@@ -32,7 +32,7 @@ public abstract class Plugin : IDisposable
         /// <summary>
         /// The directory containing the plugin folders. Files can be contained in any subdirectory.
         /// </summary>
-        public static readonly string PluginsDirectory = Combine(GetDirectoryName(Assembly.GetEntryAssembly().Location), "Plugins");
+        public static readonly string PluginsDirectory = Combine(GetDirectoryName(System.AppContext.BaseDirectory), "Plugins");
 
         private static readonly FileSystemWatcher configWatcher;
 
@@ -123,7 +123,7 @@ private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEven
 
             string filename = an.Name + ".dll";
             string path = filename;
-            if (!File.Exists(path)) path = Combine(GetDirectoryName(Assembly.GetEntryAssembly().Location), filename);
+            if (!File.Exists(path)) path = Combine(GetDirectoryName(System.AppContext.BaseDirectory), filename);
             if (!File.Exists(path)) path = Combine(PluginsDirectory, filename);
             if (!File.Exists(path)) path = Combine(PluginsDirectory, args.RequestingAssembly.GetName().Name, filename);
             if (!File.Exists(path)) return null;