Merge lp:~simone.busoli/nunitv2/nunitv2 into lp:nunitv2

[Simone Busoli]

Basically used the patches provided by the user for the two additional console options, with minor modifications

[Charlie Poole (charlie.poole)]

Looks good. No tests, but I added them.

review: Approve

=== modified file 'src/ConsoleRunner/nunit-console/ConsoleOptions.cs'
--- src/ConsoleRunner/nunit-console/ConsoleOptions.cs	2012-07-09 18:33:10 +0000
+++ src/ConsoleRunner/nunit-console/ConsoleOptions.cs	2012-10-16 01:51:17 +0000
@@ -73,7 +73,13 @@
 		public bool noshadow;
 
 		[Option (Description = "Disable use of a separate thread for tests")]
-		public bool nothread;
+		public bool nothread;
+
+		[Option(Description = "Base path to be used when loading the assemblies")]
+ 		public string basepath;
+ 
+ 		[Option(Description = "Additional directories to be probed when loading assemblies, separated by semicolons")]
+ 		public string privatebinpath;
 
         [Option(Description = "Set timeout for each test case in milliseconds")]
         public int timeout;
 
=== modified file 'src/ConsoleRunner/nunit-console/ConsoleUi.cs'
--- src/ConsoleRunner/nunit-console/ConsoleUi.cs	2012-10-14 22:44:01 +0000
+++ src/ConsoleRunner/nunit-console/ConsoleUi.cs	2012-10-16 01:51:17 +0000
@@ -311,6 +311,17 @@
 				domainUsage = DomainUsage.Multiple;
 			}
 
+			if (options.basepath != null && options.basepath != string.Empty)
+ 			{
+ 				package.BasePath = options.basepath;
+ 			}
+ 
+ 			if (options.privatebinpath != null && options.privatebinpath != string.Empty)
+ 			{
+ 				package.AutoBinPath = false;
+				package.PrivateBinPath = options.privatebinpath;
+ 			}
+
 #if CLR_2_0 || CLR_4_0
             if (options.framework != null)
                 framework = RuntimeFramework.Parse(options.framework);
@@ -326,11 +337,10 @@
             
             package.Settings["ProcessModel"] = processModel;
             package.Settings["DomainUsage"] = domainUsage;
-            if (framework != null)
+            
+			if (framework != null)
                 package.Settings["RuntimeFramework"] = framework;
 
-            
-
             if (domainUsage == DomainUsage.None)
             {
                 // Make sure that addins are available