Update NUnit to version 2.5.8

src/Tools/NUnit/buildnunitconsole.bat

@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v3.5\msbuild /property:Configuration=Release nunit-console\nunit-console.sln 
+%windir%\microsoft.net\framework\v3.5\msbuild /Target:Rebuild /property:Configuration=Release nunit-console\nunit-console.sln 
 copy nunit-console.exe nunit-console-x86.exe
 corflags /32bit+ nunit-console-x86.exe
 @IF %ERRORLEVEL% NEQ 0 GOTO err

src/Tools/NUnit/nunit-console-dotnet2-x86.exe.config

@@ -1,12 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!-- Set the level for tracing NUnit itself -->
-  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
-  <system.diagnostics>
-	  <switches>
-      <add name="NTrace" value="0" />
-	  </switches>
-	</system.diagnostics>
 
   <runtime>
     <!-- We need this so test exceptions don't crash NUnit -->

src/Tools/NUnit/nunit-console-dotnet2.exe.config

@@ -1,12 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!-- Set the level for tracing NUnit itself -->
-  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
-  <system.diagnostics>
-	  <switches>
-      <add name="NTrace" value="0" />
-	  </switches>
-	</system.diagnostics>
 
   <runtime>
     <!-- We need this so test exceptions don't crash NUnit -->

src/Tools/NUnit/nunit-console.exe.config

@@ -1,17 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<startup>
 		<requiredRuntime version="v4.0" />
 	</startup>
-
-  <!-- Set the level for tracing NUnit itself -->
-  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
-  <system.diagnostics>
-	  <switches>
-      <add name="NTrace" value="0" />
-	  </switches>
-	</system.diagnostics>
-
+	
   <runtime>
     <!-- We need this so test exceptions don't crash NUnit -->
     <legacyUnhandledExceptionPolicy enabled="1" />

src/Tools/NUnit/nunit-console/AssemblyInfo.cs

@@ -16,7 +16,7 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("NUnit.org")]
 [assembly: AssemblyProduct("NUnit")]
-[assembly: AssemblyCopyright("Copyright (C) 2002-2009 Charlie Poole.\r\n" +
+[assembly: AssemblyCopyright("Copyright (C) 2002-2010 Charlie Poole.\r\n" +
                              "Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\n" +
                              "Copyright (C) 2000-2002 Philip Craig.\r\n" +
                              "Copyright (C) 2006 Daniel Grunwald.\r\n" +
@@ -36,5 +36,5 @@ using System.Reflection;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.5.7")]
-[assembly: AssemblyInformationalVersion("2.5.7")]
+[assembly: AssemblyVersion("2.5.8")]
+[assembly: AssemblyInformationalVersion("2.5.8")]

src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs

@@ -207,10 +207,14 @@ namespace NUnit.ConsoleRunner
             ProcessModel processModel = ProcessModel.Default;
             RuntimeFramework framework = null;
 
+            string[] parameters = new string[options.ParameterCount];
+            for (int i = 0; i < options.ParameterCount; i++)
+                parameters[i] = Path.GetFullPath((string)options.Parameters[i]);
+                
 			if (options.IsTestProject)
 			{
 				NUnitProject project = 
-					Services.ProjectService.LoadProject((string)options.Parameters[0]);
+					Services.ProjectService.LoadProject(parameters[0]);
 
 				string configName = options.config;
 				if (configName != null)
@@ -221,15 +225,15 @@ namespace NUnit.ConsoleRunner
                 domainUsage = project.DomainUsage;
                 framework = project.ActiveConfig.RuntimeFramework;
 			}
-			else if (options.Parameters.Count == 1)
+			else if (parameters.Length == 1)
 			{
-				package = new TestPackage((string)options.Parameters[0]);
+				package = new TestPackage(parameters[0]);
 				domainUsage = DomainUsage.Single;
 			}
 			else
 			{
 				// TODO: Figure out a better way to handle "anonymous" packages
-				package = new TestPackage(null, options.Parameters);
+				package = new TestPackage(null, parameters);
 				package.AutoBinPath = true;
 				domainUsage = DomainUsage.Multiple;
 			}

src/Tools/NUnit/nunit-console/ExtendedRunner.cs

@@ -27,10 +27,18 @@ namespace NUnit.ConsoleRunner
 		[STAThread]
 		public static int Main(string[] args)
 		{
-			log.Info( "NUnit-console.exe starting" );
-
 			ExtendedConsoleOptions options = new ExtendedConsoleOptions(args);
 
+            // Create SettingsService early so we know the trace level right at the start
+            SettingsService settingsService = new SettingsService();
+            InternalTraceLevel level = (InternalTraceLevel)settingsService.GetSetting("Options.InternalTraceLevel", InternalTraceLevel.Default);
+            if (options.trace != InternalTraceLevel.Default)
+                level = options.trace;
+
+            InternalTrace.Initialize("nunit-console_%p.log", level);
+            
+            log.Info("NUnit-console.exe starting");
+            
 			if(!options.nologo)
 				WriteCopyright();
 
@@ -56,7 +64,7 @@ namespace NUnit.ConsoleRunner
 			}
 
 			// Add Standard Services to ServiceManager
-			ServiceManager.Services.AddService( new SettingsService() );
+			ServiceManager.Services.AddService( settingsService );
 			ServiceManager.Services.AddService( new DomainManager() );
 			//ServiceManager.Services.AddService( new RecentFilesService() );
 			ServiceManager.Services.AddService( new ProjectService() );

src/Tools/NUnit/nunit-console/nunit-console.csproj

@@ -55,6 +55,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
     <Reference Include="nunit.util">
       <HintPath>..\lib\nunit.util.dll</HintPath>