Update NUnit to version 2.6.1

src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj

@@ -42,10 +42,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Drawing" />
-    <Reference Include="nunit.uikit">
-      <HintPath>..\..\..\..\Tools\NUnit\lib\nunit.uikit.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>

src/AddIns/Analysis/UnitTesting/UnitTesting.csproj

@@ -52,11 +52,6 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="nunit.uikit">
-      <HintPath>..\..\..\Tools\NUnit\lib\nunit.uikit.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Src\IFileSystem.cs" />

src/Tools/NUnit/buildnunitconsole.bat

@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v3.5\msbuild /Target:Rebuild /property:Configuration=Release nunit-console\nunit-console.sln 
+%windir%\microsoft.net\framework\v4.0.30319\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/AssemblyInfo.cs

@@ -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.6.0")]
-[assembly: AssemblyInformationalVersion("2.6.0")]
+[assembly: AssemblyVersion("2.6.1")]
+[assembly: AssemblyInformationalVersion("2.6.1")]

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

@@ -208,16 +208,18 @@ namespace NUnit.ConsoleRunner
                     else
                     {
                         WriteSummaryReport(summary);
-                        if (summary.ErrorsAndFailures > 0 || result.IsError || result.IsFailure)
+
+                        bool hasErrors = summary.Errors > 0 || summary.Failures > 0 || result.IsError || result.IsFailure;
+
+                        if (options.stoponerror && (hasErrors || summary.NotRunnable > 0))
                         {
-                            if (options.stoponerror)
-                            {
-                                Console.WriteLine("Test run was stopped after first error, as requested.");
-                                Console.WriteLine();
-                            }
+                            Console.WriteLine("Test run was stopped after first error, as requested.");
+                            Console.WriteLine();
+                        }
 
+                        if (hasErrors)
                             WriteErrorsAndFailuresReport(result);
-                        }
+
                         if (summary.TestsNotRun > 0)
                             WriteNotRunReport(result);
 
@@ -234,7 +236,7 @@ namespace NUnit.ConsoleRunner
                         }
                     }
 
-                    returnCode = summary.ErrorsAndFailures;
+                    returnCode = summary.Errors + summary.Failures + summary.NotRunnable;
                 }
 
 				if ( collector.HasExceptions )

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

@@ -47,8 +47,16 @@ namespace NUnit.ConsoleRunner
 				options.Help();
 				return ConsoleUi.OK;
 			}
+
+            if (options.cleanup)
+            {
+                log.Info("Performing cleanup of shadow copy cache");
+                DomainManager.DeleteShadowCopyPath();
+                Console.WriteLine("Shadow copy cache emptied");
+                return ConsoleUi.OK;
+            }
 			
-			if(options.NoArgs) 
+            if (options.NoArgs) 
 			{
 				Console.Error.WriteLine("fatal error: no inputs specified");
 				options.Help();
@@ -118,24 +126,30 @@ namespace NUnit.ConsoleRunner
 			Assembly executingAssembly = Assembly.GetExecutingAssembly();
 			string versionText = executingAssembly.GetName().Version.ToString();
 
-			string productName = "NUnit";
-			string copyrightText = "Copyright (C) 2002-2009 Charlie Poole.\r\nCopyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\nCopyright (C) 2000-2002 Philip Craig.\r\nAll Rights Reserved.";
+#if CLR_1_0
+            string productName = "NUnit-Console (.NET 1.0)";
+#elif CLR_1_1
+            string productName = "NUnit-Console (.NET 1.1)";
+#else
+            string productName = "NUnit-Console";
+#endif
+            string copyrightText = "Copyright (C) 2002-2012 Charlie Poole.\r\nCopyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov.\r\nCopyright (C) 2000-2002 Philip Craig.\r\nAll Rights Reserved.";
 
-			object[] objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
-			if ( objectAttrs.Length > 0 )
-				productName = ((AssemblyProductAttribute)objectAttrs[0]).Product;
+            //object[] objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
+            //if ( objectAttrs.Length > 0 )
+            //    productName = ((AssemblyProductAttribute)objectAttrs[0]).Product;
 
-			objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+			object[] objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
 			if ( objectAttrs.Length > 0 )
 				copyrightText = ((AssemblyCopyrightAttribute)objectAttrs[0]).Copyright;
 
 			objectAttrs = executingAssembly.GetCustomAttributes(typeof(AssemblyConfigurationAttribute), false);
-      if (objectAttrs.Length > 0)
-      {
-        string configText = ((AssemblyConfigurationAttribute)objectAttrs[0]).Configuration;
-        if (configText != "")
-          versionText += string.Format(" ({0})", configText);
-      }
+            if (objectAttrs.Length > 0)
+            {
+                string configText = ((AssemblyConfigurationAttribute)objectAttrs[0]).Configuration;
+                if (configText != "")
+                    versionText += string.Format(" ({0})", configText);
+            }
 
 			Console.WriteLine(String.Format("{0} version {1}", productName, versionText));
 			Console.WriteLine(copyrightText);