Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.PluginInfrastructure

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginDescription.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginDescription.cs

@@ -139 +139 @@
     }
 
+    /// <summary>
+    /// Gets and sets the list of assembly names for this plugin. Assembly names are only available after the plugin has been loaded.
+    /// </summary>
+    private List<string> assemblyNames;
+    public IEnumerable<string> AssemblyNames {
+      get { return assemblyNames; }
+      set { this.assemblyNames = new List<string>(value); }
+    }
+
     internal PluginDescription() {
       pluginState = PluginState.Undefined;

branches/ScatterSearch (trunk integration)/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginValidator.cs

@@ -506 +506 @@
       foreach (var desc in PluginDescriptionIterator.IterateDependenciesBottomUp(pluginDescriptions
                                                                                 .Where(x => x.PluginState != PluginState.Disabled))) {
+        // store the assembly names so that we can later retrieve the assemblies loaded in the appdomain by name
+        var assemblyNames = new List<string>();
         foreach (string assemblyLocation in desc.AssemblyLocations) {
           if (desc.PluginState != PluginState.Disabled) {
@@ -515 +517 @@
               // this can still lead to an exception
               // even when the assemby was successfully loaded into the reflection only context before 
-              var asm = Assembly.Load(assemblyName);
+              // when loading the assembly using it's assemblyName it can be loaded from a different location than before (e.g. the GAC)
+              Assembly.Load(assemblyName);
+              assemblyNames.Add(assemblyName);
             }
             catch (BadImageFormatException) {
@@ -535 +539 @@
           }
         }
+        desc.AssemblyNames = assemblyNames;
       }
     }
@@ -547 +552 @@
         if (desc.PluginState == PluginState.Enabled) {
           // cannot use ApplicationManager to retrieve types because it is not yet instantiated
-          foreach (string assemblyLocation in desc.AssemblyLocations) {
+          foreach (string assemblyName in desc.AssemblyNames) {
             var asm = (from assembly in assemblies
-                       where string.Equals(Path.GetFullPath(assembly.Location), Path.GetFullPath(assemblyLocation), StringComparison.CurrentCultureIgnoreCase)
+                       where assembly.FullName == assemblyName
                        select assembly)
-                      .Single();
-
+                      .SingleOrDefault();
+            if (asm == null) throw new InvalidPluginException("Could not load assembly " + assemblyName + " for plugin " + desc.Name);
             foreach (Type pluginType in asm.GetTypes()) {
               if (typeof(IPlugin).IsAssignableFrom(pluginType) && !pluginType.IsAbstract && !pluginType.IsInterface && !pluginType.HasElementType) {

branches/ScatterSearch (trunk integration)/HeuristicLab.PluginInfrastructure/3.3/Properties/AssemblyInfo.cs.frame

@@ -56 +56 @@
 //
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll