Support module dependencies from non-app directory

2026-07-31 00:29:24 +03:00 · 2021-12-30 23:42:41 +04:00
parent f99d858994
commit c5e35a2ec5
1 changed files with 20 additions and 5 deletions
@@ -164,14 +164,29 @@ namespace Kruzya.TelegramBot.Core
            
            appDomain.AssemblyResolve += delegate(object? sender, ResolveEventArgs args)
            {
-                var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                var assemblyPath = Path.Combine(basePath, new AssemblyName(args.Name).Name + ".dll");
-                if (!File.Exists(assemblyPath))
+                var assemblyName = new AssemblyName(args.Name).Name + ".dll";
+
+                var possiblePaths = new List<string>();
+                if (args.RequestingAssembly != null)
                {
-                    return null;
+                    var modulePath = Path.GetDirectoryName(args.RequestingAssembly.Location);
+                    possiblePaths.Add(modulePath);
+                    possiblePaths.Add(args.RequestingAssembly.Location.Replace(".dll", ""));
                }

+                possiblePaths.Add(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
+                possiblePaths.Add(Environment.CurrentDirectory);
+
+                foreach (var basePath in possiblePaths)
+                {
+                    var assemblyPath = $"{basePath}/{assemblyName}";
+                    if (File.Exists(assemblyPath))
+                    {
                        return Assembly.LoadFrom(assemblyPath);
+                    }
+                }
+
+                return null;
            };
        }
    }