Changeset 2688 for trunk/sources/HeuristicLab.PluginInfrastructure

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

Files:

• Advanced/InstallationManager.cs (modified) (5 diffs)
• ApplicationManager.cs (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure.csproj (modified) (2 diffs)
• Interfaces/IPluginDescription.cs (modified) (1 diff)
• Interfaces/IPluginFile.cs (added)
• Manager/PluginDescription.cs (modified) (3 diffs)
• Manager/PluginFile.cs (added)
• Manager/PluginValidator.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs

@@ -28 +28 @@
 using System.ComponentModel;
 using HeuristicLab.PluginInfrastructure.UpdateLocationReference;
+using System.Reflection;
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -67 +68 @@
       builder.Append("Build date: ").AppendLine(desc.BuildDate.ToString());
       builder.AppendLine("Files: ");
-      foreach (string fileName in desc.Files) {
+      foreach (string fileName in from file in desc.Files select file.Name) {
         builder.AppendLine(fileName);
       }
@@ -95 +96 @@
       StringBuilder builder = new StringBuilder();
       var missingFiles = from x in desc.Files
-                         where !File.Exists(x)
-                         select x;
+                         where !File.Exists(x.Name)
+                         select x.Name;
       if (missingFiles.Count() > 0) {
-        foreach (string fileName in desc.Files) {
+        foreach (string fileName in from file in desc.Files select file.Name) {
           if (!File.Exists(fileName)) builder.Append("Missing file: ").AppendLine(fileName);
         }
@@ -126 +127 @@
             // or there was a problem loading the assemblies
             builder.AppendLine("There was a problem while loading assemblies: ");
-            foreach (string assembly in desc.Assemblies) {
-              builder.AppendLine(assembly);
+            foreach (AssemblyName assembly in desc.AssemblyNames) {
+              builder.AppendLine(assembly.FullName);
             }
             return builder.ToString();
@@ -196 +197 @@
     public void Remove(IEnumerable<string> pluginNames) {
       var fileNames = from pluginToDelete in PluginDescriptionIterator.IterateDependentsTopDown(GetPluginDescriptions(pluginNames), pluginManager.Plugins)
-                      from fileName in pluginToDelete.Files
-                      select Path.Combine(pluginDir, fileName);
+                      from file in pluginToDelete.Files
+                      select Path.Combine(pluginDir, file.Name);
       var args = new PluginInfrastructureCancelEventArgs("Deleting", fileNames);
       OnPreDelete(args);

trunk/sources/HeuristicLab.PluginInfrastructure/ApplicationManager.cs

@@ -103 +103 @@
       // load all loadable plugins (all dependencies available) into the execution context
       foreach (var desc in PluginDescriptionIterator.IterateDependenciesBottomUp(plugins.Where(x => x.PluginState != PluginState.Disabled))) {
-        foreach (string assembly in desc.Assemblies) {
-          var asm = Assembly.LoadFrom(assembly);
+        foreach (AssemblyName assemblyName in desc.AssemblyNames) {
+          var asm = Assembly.Load(assemblyName);
 
           // instantiate and load all plugins in this assembly
@@ -213 +213 @@
       PluginDescription pluginDesc = (PluginDescription)pluginDescription;
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
-             where !string.IsNullOrEmpty(asm.Location) &&
-                   pluginDesc.Assemblies.Any(asmPath =>
-                     Path.GetFullPath(asmPath).Equals(Path.GetFullPath(asm.Location),
-                                                      StringComparison.CurrentCultureIgnoreCase))
+             where pluginDesc.AssemblyNames.Any(asmName => asmName.FullName.Equals(asm.GetName().FullName))
              from t in GetTypes(type, asm, onlyInstantiable)
              select t;
@@ -286 +283 @@
     public IPluginDescription GetDeclaringPlugin(Type type) {
       foreach (PluginDescription info in Plugins) {
-        if (info.Assemblies.Contains(Path.GetFullPath(type.Assembly.Location))) return info;
+        if (info.AssemblyNames.Contains(type.Assembly.GetName())) return info;
       }
       return null;

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -101 +101 @@
     <Compile Include="BaseClasses\ApplicationBase.cs" />
     <Compile Include="BaseClasses\PluginBase.cs" />
+    <Compile Include="Interfaces\IPluginFile.cs" />
     <Compile Include="Interfaces\IApplicationManager.cs" />
     <Compile Include="Interfaces\IApplicationDescription.cs" />
@@ -110 +111 @@
     <Compile Include="InvalidPluginException.cs" />
     <Compile Include="Manager\ApplicationDescription.cs" />
+    <Compile Include="Manager\PluginFile.cs" />
     <Compile Include="Manager\PluginInfrastructureCancelEventArgs.cs" />
     <Compile Include="Manager\PluginDescription.cs" />

trunk/sources/HeuristicLab.PluginInfrastructure/Interfaces/IPluginDescription.cs

@@ -47 +47 @@
     /// Gets the file names of files that are part of the plugin.
     /// </summary>
-    IEnumerable<string> Files { get; }
-
-    /// <summary>
-    /// Get a list of assembly names associated with the plugin.
-    /// </summary>
-    IEnumerable<string> Assemblies { get; }
+    IEnumerable<IPluginFile> Files { get; }
   }
 }

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)) {