Stone_Red/DesktopMagic
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/DesktopMagic.git synced 2026-09-07 15:56:13 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Improve DLL dependency loading and fix plugin type check when loading plugin

Browse Source
This commit is contained in:
Stone_Red
2026-07-02 15:09:26 +02:00
parent bd29bcdb37
commit 393ccb0ba6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DesktopMagic/Plugins/PluginWindow.xaml.cs
+5 -6
View File
@@ -120,11 +120,10 @@ public partial class PluginWindow : Window, IPluginWindow
string assemblyPath = Path.Combine(PluginFolderPath, assemblyName.Name + ".dll"); string assemblyPath = Path.Combine(PluginFolderPath, assemblyName.Name + ".dll");
if (File.Exists(assemblyPath)) if (File.Exists(assemblyPath))
{ {
return ctx.LoadFromAssemblyPath(assemblyPath); byte[] assemblyData = File.ReadAllBytes(assemblyPath);
} using MemoryStream assemblyStream = new(assemblyData);
else
{ return ctx.LoadFromStream(assemblyStream);
_ = ctx.LoadFromAssemblyName(assemblyName);
} }
return null; return null;
}; };
@@ -483,7 +482,7 @@ public partial class PluginWindow : Window, IPluginWindow
dll = Assembly.LoadFrom($"{PluginFolderPath}\\main.dll"); dll = Assembly.LoadFrom($"{PluginFolderPath}\\main.dll");
} }
Type? instanceType = Array.Find(dll.GetTypes(), type => type.GetTypeInfo().BaseType == typeof(Plugin)); Type? instanceType = Array.Find(dll.GetTypes(), type => type.IsAssignableTo(typeof(Plugin)));
if (instanceType is null) if (instanceType is null)
{ {