Changeset 9363 for branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/Manager

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs (modified) (2 diffs)

branches/OaaS

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

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

branches/OaaS/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginManager.cs

@@ -110 +110 @@
     /// </summary>
     /// <param name="appInfo">application to run</param>
-    public void Run(ApplicationDescription appInfo) {
+    public void Run(ApplicationDescription appInfo, ICommandLineArgument[] args) {
       if (!initialized) throw new InvalidOperationException("PluginManager is not initialized. DiscoverAndCheckPlugins() must be called before Run()");
       // create a separate AppDomain for the application
@@ -129 +129 @@
         applicationManager.PrepareApplicationDomain(applications, plugins);
         OnApplicationStarted(new PluginInfrastructureEventArgs(appInfo));
-        applicationManager.Run(appInfo);
+        applicationManager.Run(appInfo, args);
       }
       finally {

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