diff --git a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj index ac667f3..3732964 100644 --- a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj +++ b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj @@ -8,7 +8,7 @@ - 2.10.8 + 2.11.0 \ No newline at end of file diff --git a/Pilz.Plugins/PluginManager{T,T}.cs b/Pilz.Plugins/PluginManager{T,T}.cs index f447df4..ef0ef2b 100644 --- a/Pilz.Plugins/PluginManager{T,T}.cs +++ b/Pilz.Plugins/PluginManager{T,T}.cs @@ -1,5 +1,4 @@ -using Pilz.Text; -using System.Reflection; +using System.Reflection; namespace Pilz.Plugins; @@ -17,11 +16,6 @@ public class PluginManager where TPluginIn /// public virtual IEnumerable LoadedPlugins => loadedPlugins.AsReadOnly(); - protected void OnCurrentAppDomainAssemblyLoad(object? sender, AssemblyLoadEventArgs args) - { - LoadPlugins(args.LoadedAssembly, null); - } - /// /// Loads assembly from the given file paths and then loads the plugins from the assemblies. /// @@ -54,39 +48,6 @@ public class PluginManager where TPluginIn return results; } - /// - /// Loads plugins from already loaded assemblies for the current . - /// - /// - public virtual IEnumerable> LoadOwnPlugins(object?[]? parameters, string? whitelist) - { - return LoadOwnPlugins(false, parameters, whitelist); - } - - /// - /// Loads plugins from already loaded assemblies for the current . - /// - /// Do also load plugins from all yet not loaded assemblies by listening the event - /// >. - /// >. - /// - public virtual IEnumerable> LoadOwnPlugins(bool listenAssemblyLoadContext, object?[]? parameters, string? whitelist) - { - var results = new List>(); - - if (listenAssemblyLoadContext) - AppDomain.CurrentDomain.AssemblyLoad += OnCurrentAppDomainAssemblyLoad; - - var assemblies = AppDomain.CurrentDomain.GetAssemblies().AsEnumerable(); - if (!string.IsNullOrWhiteSpace(whitelist)) - assemblies = assemblies.Where(n => LikeOperator.IsLike(n.GetName().Name, whitelist)); - - foreach (var assembly in assemblies) - results.Add(LoadPlugins(assembly, parameters)); - - return results; - } - /// /// Loads an assembly from the given file path and then loads plugins from the assembly. ///