From 5804bade477a240e355f907a5781bb258800b6a1 Mon Sep 17 00:00:00 2001 From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com> Date: Wed, 1 May 2024 15:51:19 +0200 Subject: [PATCH] Fix plugin dependencies not getting loaded --- src/DesktopMagic/GlobalSuppressions.cs | 1 + src/DesktopMagic/Plugins/PluginWindow.xaml.cs | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DesktopMagic/GlobalSuppressions.cs b/src/DesktopMagic/GlobalSuppressions.cs index c4ac37e..8b907aa 100644 --- a/src/DesktopMagic/GlobalSuppressions.cs +++ b/src/DesktopMagic/GlobalSuppressions.cs @@ -9,3 +9,4 @@ using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "No need to")] [assembly: SuppressMessage("Minor Code Smell", "S1075:URIs should not be hardcoded", Justification = "")] [assembly: SuppressMessage("Critical Code Smell", "S2696:Instance members should not write to \"static\" fields", Justification = "", Scope = "member", Target = "~P:DesktopMagic.DataContexts.MainWindowDataContext.Settings")] +[assembly: SuppressMessage("Major Code Smell", "S3885:\"Assembly.Load\" should be used", Justification = "Assembly.Load does not load dependencies", Scope = "member", Target = "~M:DesktopMagic.PluginWindow.ExecuteSource")] diff --git a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs index 1c810b9..dde7122 100644 --- a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs +++ b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs @@ -202,8 +202,7 @@ public partial class PluginWindow : Window object? instance = pluginClassInstance; if (instance is null) { - byte[] assemblyBytes = File.ReadAllBytes($"{PluginFolderPath}\\main.dll"); - Assembly dll = Assembly.Load(assemblyBytes); + Assembly dll = Assembly.LoadFrom($"{PluginFolderPath}\\main.dll"); Type? instanceType = Array.Find(dll.GetTypes(), type => type.GetTypeInfo().BaseType == typeof(Plugin)); if (instanceType is null)