Changeset 3178

Timestamp:

03/22/10 16:50:11 (14 years ago)

Author:

gkronber

Message:

Fixed #940 (Plugin infrastructure events show assembly file version instead of plugin version)

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginValidator.cs (modified) (2 diffs)

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

@@ -143 +143 @@
         ApplicationAttribute attr = (from x in appType.GetCustomAttributes(typeof(ApplicationAttribute), false)
                                      select (ApplicationAttribute)x).Single();
+        var declaringPlugin = GetDeclaringPlugin(appType, plugins);
         ApplicationDescription info = new ApplicationDescription();
         info.Name = application.Name;
-        info.Version = appType.Assembly.GetName().Version;
+        info.Version = declaringPlugin.Version;
         info.Description = application.Description;
         info.AutoRestart = attr.RestartOnErrors;
@@ -544 +545 @@
     }
 
+    private PluginDescription GetDeclaringPlugin(Type appType, IEnumerable<PluginDescription> plugins) {
+      return (from p in plugins
+              from asmLocation in p.AssemblyLocations
+              where Path.GetFullPath(asmLocation).Equals(Path.GetFullPath(appType.Assembly.Location), StringComparison.CurrentCultureIgnoreCase)
+              select p).Single();
+    }
+
     // register assembly in the assembly cache for the ReflectionOnlyAssemblyResolveEvent
     private void RegisterLoadedAssembly(Assembly asm) {