Changeset 2688 for trunk/sources/HeuristicLab.PluginInfrastructure/Manager

Timestamp:

01/27/10 11:11:52 (15 years ago)

Author:

gkronber

Message:

Implemented an enumerable to iterate through all PluginFiles as suggested by swagner, replaced the Assemblies enumerable with an AssemblyName enumerable for internal usage in the plugin infrastructure and replaced Assembly.LoadFrom calls with Assembly.Load() to prevent loading from GAC as far as possible.

#850 (PluginInfrastructure should provide a way to get assemblies associated with a plug-in)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Manager

Files:

• PluginDescription.cs (modified) (3 diffs)
• PluginFile.cs (added)
• PluginValidator.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginDescription.cs

@@ -24 +24 @@
 using System.Text;
 using System.Linq;
+using System.Reflection;
 
 namespace HeuristicLab.PluginInfrastructure.Manager {
@@ -77 +78 @@
 
 
-    private List<string> files = new List<string>();
+    private List<PluginFile> files = new List<PluginFile>();
     /// <summary>
     /// Gets the names of all files that belong to this plugin.
     /// These files are deleted when the plugin is removed or updated.
     /// </summary>
-    public IEnumerable<string> Files {
-      get { return files; }
+    public IEnumerable<IPluginFile> Files {
+      get { return files.Cast<IPluginFile>(); }
     }
 
-    internal void AddFiles(IEnumerable<string> fileNames) {
+    internal void AddFiles(IEnumerable<PluginFile> fileNames) {
       files.AddRange(fileNames);
     }
@@ -105 +106 @@
     }
 
-    private List<string> assemblies = new List<string>();
+    private List<AssemblyName> assemblyNames = new List<AssemblyName>();
     /// <summary>
     /// Gets the names of the assemblies that belong to this plugin.
     /// </summary>
-    public IEnumerable<string> Assemblies {
-      get { return assemblies; }
-      // set { assemblies = value; }
+    public IEnumerable<AssemblyName> AssemblyNames {
+      get { return assemblyNames; }
     }
 
-    internal void AddAssemblies(IEnumerable<string> assemblyNames) {
-      assemblies.AddRange(assemblyNames);
+    internal void AddAssemblyNames(IEnumerable<AssemblyName> assemblyNames) {
+      this.assemblyNames.AddRange(assemblyNames);
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginValidator.cs

@@ -172 +172 @@
       foreach (var desc in pluginDescriptions.Where(x => x.PluginState != PluginState.Disabled)) {
         try {
-          foreach (var asm in desc.Assemblies) {
-            Assembly.ReflectionOnlyLoadFrom(asm);
+          foreach (var asmName in desc.AssemblyNames) {
+            Assembly.ReflectionOnlyLoad(asmName.FullName);
           }
         }
@@ -237 +237 @@
       // get all attributes of that type
       IList<CustomAttributeData> attributes = CustomAttributeData.GetCustomAttributes(pluginType);
-      List<string> pluginAssemblies = new List<string>();
+      List<AssemblyName> pluginAssemblyNames = new List<AssemblyName>();
       List<string> pluginDependencies = new List<string>();
-      List<string> pluginFiles = new List<string>();
+      List<PluginFile> pluginFiles = new List<PluginFile>();
       string pluginName = null;
       string pluginDescription = null;
@@ -254 +254 @@
           string pluginFileName = (string)attributeData.ConstructorArguments[0].Value;
           PluginFileType fileType = (PluginFileType)attributeData.ConstructorArguments[1].Value;
-          pluginFiles.Add(Path.GetFullPath(Path.Combine(PluginDir, pluginFileName)));
+          pluginFiles.Add(new PluginFile(Path.GetFullPath(Path.Combine(PluginDir, pluginFileName)), fileType));
           if (fileType == PluginFileType.Assembly) {
-            pluginAssemblies.Add(Path.GetFullPath(Path.Combine(PluginDir, pluginFileName)));
+            pluginAssemblyNames.Add(AssemblyName.GetAssemblyName(Path.GetFullPath(Path.Combine(PluginDir, pluginFileName))));
           }
         }
@@ -268 +268 @@
       if (!string.IsNullOrEmpty(pluginName) &&
           pluginFiles.Count > 0 &&
-          pluginAssemblies.Count > 0 &&
+          pluginAssemblyNames.Count > 0 &&
           buildDates.Count() == 1) {
         // create a temporary PluginDescription that contains the attribute values
@@ -276 +276 @@
         info.Version = pluginType.Assembly.GetName().Version;
         info.BuildDate = DateTime.Parse(buildDates.Single(), System.Globalization.CultureInfo.InvariantCulture);
-        info.AddAssemblies(pluginAssemblies);
+        info.AddAssemblyNames(pluginAssemblyNames);
         info.AddFiles(pluginFiles);
 
@@ -349 +349 @@
                                                                                 .Where(x => x.PluginState != PluginState.Disabled))) {
         List<Type> types = new List<Type>();
-        foreach (string assembly in desc.Assemblies) {
-          var asm = Assembly.LoadFrom(assembly);
+        foreach (AssemblyName assemblyName in desc.AssemblyNames) {
+          var asm = Assembly.Load(assemblyName);
           foreach (Type t in asm.GetTypes()) {
             if (typeof(IPlugin).IsAssignableFrom(t)) {
@@ -379 +379 @@
 
     private bool CheckPluginFiles(PluginDescription pluginDescription) {
-      foreach (string filename in pluginDescription.Files) {
+      foreach (string filename in pluginDescription.Files.Select(x => x.Name)) {
         if (!FileLiesInDirectory(PluginDir, filename) ||
           !File.Exists(filename)) {