diff --git a/src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj b/src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj
index 51642f82f8..ca9e20c1bc 100644
--- a/src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj
+++ b/src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj
@@ -42,10 +42,6 @@
-
- ..\..\..\..\Tools\NUnit\lib\nunit.uikit.dll
- False
-
..\..\..\..\Tools\NUnit\nunit.framework.dll
False
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
index 77590cce8d..deff7f8687 100644
--- a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
+++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
@@ -52,11 +52,6 @@
False
False
-
- ..\..\..\Tools\NUnit\lib\nunit.uikit.dll
- False
- False
-
diff --git a/src/Tools/NUnit/buildnunitconsole.bat b/src/Tools/NUnit/buildnunitconsole.bat
index 9db3adea02..313b203d35 100644
--- a/src/Tools/NUnit/buildnunitconsole.bat
+++ b/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
diff --git a/src/Tools/NUnit/lib/nunit-console-runner.dll b/src/Tools/NUnit/lib/nunit-console-runner.dll
index b0e611afb7..e637d6523b 100644
Binary files a/src/Tools/NUnit/lib/nunit-console-runner.dll and b/src/Tools/NUnit/lib/nunit-console-runner.dll differ
diff --git a/src/Tools/NUnit/lib/nunit-gui-runner.dll b/src/Tools/NUnit/lib/nunit-gui-runner.dll
deleted file mode 100644
index ebff05eb7d..0000000000
Binary files a/src/Tools/NUnit/lib/nunit-gui-runner.dll and /dev/null differ
diff --git a/src/Tools/NUnit/lib/nunit.core.dll b/src/Tools/NUnit/lib/nunit.core.dll
index 5f748becd1..1c57782550 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.dll and b/src/Tools/NUnit/lib/nunit.core.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.core.interfaces.dll b/src/Tools/NUnit/lib/nunit.core.interfaces.dll
index 72b9486d74..941d4931d9 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.interfaces.dll and b/src/Tools/NUnit/lib/nunit.core.interfaces.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.fixtures.dll b/src/Tools/NUnit/lib/nunit.fixtures.dll
deleted file mode 100644
index 8fd1932d75..0000000000
Binary files a/src/Tools/NUnit/lib/nunit.fixtures.dll and /dev/null differ
diff --git a/src/Tools/NUnit/lib/nunit.uiexception.dll b/src/Tools/NUnit/lib/nunit.uiexception.dll
deleted file mode 100644
index 9129c039ad..0000000000
Binary files a/src/Tools/NUnit/lib/nunit.uiexception.dll and /dev/null differ
diff --git a/src/Tools/NUnit/lib/nunit.uikit.dll b/src/Tools/NUnit/lib/nunit.uikit.dll
deleted file mode 100644
index 76c1af4fdf..0000000000
Binary files a/src/Tools/NUnit/lib/nunit.uikit.dll and /dev/null differ
diff --git a/src/Tools/NUnit/lib/nunit.util.dll b/src/Tools/NUnit/lib/nunit.util.dll
index 28d603c662..c837e9ecf0 100644
Binary files a/src/Tools/NUnit/lib/nunit.util.dll and b/src/Tools/NUnit/lib/nunit.util.dll differ
diff --git a/src/Tools/NUnit/nunit-console-dotnet2-x86.exe b/src/Tools/NUnit/nunit-console-dotnet2-x86.exe
index 7514847e53..00416949ec 100755
Binary files a/src/Tools/NUnit/nunit-console-dotnet2-x86.exe and b/src/Tools/NUnit/nunit-console-dotnet2-x86.exe differ
diff --git a/src/Tools/NUnit/nunit-console-dotnet2.exe b/src/Tools/NUnit/nunit-console-dotnet2.exe
index 11542bdc2e..468fa7ec48 100755
Binary files a/src/Tools/NUnit/nunit-console-dotnet2.exe and b/src/Tools/NUnit/nunit-console-dotnet2.exe differ
diff --git a/src/Tools/NUnit/nunit-console-x86.exe b/src/Tools/NUnit/nunit-console-x86.exe
index 7514847e53..00416949ec 100644
Binary files a/src/Tools/NUnit/nunit-console-x86.exe and b/src/Tools/NUnit/nunit-console-x86.exe differ
diff --git a/src/Tools/NUnit/nunit-console.exe b/src/Tools/NUnit/nunit-console.exe
index 11542bdc2e..468fa7ec48 100644
Binary files a/src/Tools/NUnit/nunit-console.exe and b/src/Tools/NUnit/nunit-console.exe differ
diff --git a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs b/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
index 58f6eb3925..738b915cfc 100644
--- a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
+++ b/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")]
diff --git a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs b/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
index 832d19f4a8..12a0199e4a 100644
--- a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
+++ b/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 )
diff --git a/src/Tools/NUnit/nunit-console/ExtendedRunner.cs b/src/Tools/NUnit/nunit-console/ExtendedRunner.cs
index d1344ba9f0..4ae84d9b69 100644
--- a/src/Tools/NUnit/nunit-console/ExtendedRunner.cs
+++ b/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);
diff --git a/src/Tools/NUnit/nunit.framework.dll b/src/Tools/NUnit/nunit.framework.dll
index eaea9eedf7..215767d2fb 100755
Binary files a/src/Tools/NUnit/nunit.framework.dll and b/src/Tools/NUnit/nunit.framework.dll differ