Merge remote-tracking branch 'origin' into release/3.5

nunit · Oct 7, 2016 · 0fafc4a · 0fafc4a
2 parents 2573e88 + ef73d6a
commit 0fafc4a
Show file tree

Hide file tree

Showing 73 changed files with 23 additions and 6,385 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,9 @@ os:
   - linux
   - osx
 matrix:
+  exclude:
+    - os: osx
+      mono: 3.2.8
   allow_failures:
     - mono: latest
   fast_finish: true

diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -43,23 +43,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit3-console.tests", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-agent-x86", "src\NUnitEngine\nunit-agent\nunit-agent-x86.csproj", "{28B605B2-E2E9-417E-8369-49E263F1F31B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Addins", "Addins", "{B923C1E7-54DD-4E79-A1A9-B21123863B04}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs-project-loader", "src\NUnitEngine\Addins\vs-project-loader\vs-project-loader.csproj", "{96181317-7B6F-49F0-B283-6E804D41C8AF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-project-loader", "src\NUnitEngine\Addins\nunit-project-loader\nunit-project-loader.csproj", "{E71A76CA-0089-4E1A-A7FB-210429DBED6E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "addin-tests", "src\NUnitEngine\Addins\addin-tests\addin-tests.csproj", "{793CEC1B-D44D-4162-BE03-913BF1FDB458}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-v2-result-writer", "src\NUnitEngine\Addins\nunit-v2-result-writer\nunit-v2-result-writer.csproj", "{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{B538DFF5-4309-497A-8E5D-415BE2FA3F8F}"
-	ProjectSection(SolutionItems) = preProject
-		nuget\extensions\nunit-project-loader.nuspec = nuget\extensions\nunit-project-loader.nuspec
-		nuget\extensions\nunit-v2-result-writer.nuspec = nuget\extensions\nunit-v2-result-writer.nuspec
-		nuget\extensions\vs-project-loader.nuspec = nuget\extensions\vs-project-loader.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "engine", "engine", "{43A219A8-2995-4884-806F-FDB9CD25D403}"
 	ProjectSection(SolutionItems) = preProject
 		nuget\engine\nunit.engine.api.nuspec = nuget\engine\nunit.engine.api.nuspec
@@ -128,22 +111,6 @@ Global
 		{28B605B2-E2E9-417E-8369-49E263F1F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96181317-7B6F-49F0-B283-6E804D41C8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96181317-7B6F-49F0-B283-6E804D41C8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96181317-7B6F-49F0-B283-6E804D41C8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96181317-7B6F-49F0-B283-6E804D41C8AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E71A76CA-0089-4E1A-A7FB-210429DBED6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E71A76CA-0089-4E1A-A7FB-210429DBED6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E71A76CA-0089-4E1A-A7FB-210429DBED6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E71A76CA-0089-4E1A-A7FB-210429DBED6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{793CEC1B-D44D-4162-BE03-913BF1FDB458}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{793CEC1B-D44D-4162-BE03-913BF1FDB458}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{793CEC1B-D44D-4162-BE03-913BF1FDB458}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{793CEC1B-D44D-4162-BE03-913BF1FDB458}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -161,12 +128,6 @@ Global
 		{0DE218CA-AFB8-423A-9CD2-E22DEAC55C46} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
 		{B310A760-8AE1-41CA-81F8-03B12E2FCE30} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
 		{28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
-		{B923C1E7-54DD-4E79-A1A9-B21123863B04} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
-		{96181317-7B6F-49F0-B283-6E804D41C8AF} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
-		{E71A76CA-0089-4E1A-A7FB-210429DBED6E} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
-		{793CEC1B-D44D-4162-BE03-913BF1FDB458} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
-		{AECFA3FB-E55A-4151-9DEA-F715FBB972BA} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
-		{B538DFF5-4309-497A-8E5D-415BE2FA3F8F} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
 		{43A219A8-2995-4884-806F-FDB9CD25D403} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
 		{BC87F477-1A7A-45D0-9AC1-9F7315264732} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
 		{140CDAD6-6E11-4A97-94F3-B23A14391117} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}

diff --git a/build.cake b/build.cake
@@ -45,7 +45,6 @@ var NUNIT3_CONSOLE = BIN_DIR + "nunit3-console.exe";
 
 // Test Assemblies
 var ENGINE_TESTS = "nunit.engine.tests.dll";
-var ADDIN_TESTS = "addins/tests/addin-tests.dll";
 var CONSOLE_TESTS = "nunit3-console.tests.dll";
 
 // Packages
@@ -132,14 +131,6 @@ Task("BuildEngine")
 
         // Engine tests
         BuildProject("./src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj", configuration);
-
-        // Addins
-        BuildProject("./src/NUnitEngine/Addins/nunit-project-loader/nunit-project-loader.csproj", configuration);
-        BuildProject("./src/NUnitEngine/Addins/vs-project-loader/vs-project-loader.csproj", configuration);
-        BuildProject("./src/NUnitEngine/Addins/nunit-v2-result-writer/nunit-v2-result-writer.csproj", configuration);
-
-        // Addin tests
-        BuildProject("./src/NUnitEngine/Addins/addin-tests/addin-tests.csproj", configuration);
     });
 
 //////////////////////////////////////////////////////////////////////
@@ -196,14 +187,6 @@ Task("TestEngine")
         RunTest(NUNIT3_CONSOLE, BIN_DIR, ENGINE_TESTS, "TestEngine", ref ErrorDetail);
     });
 
-Task("TestAddins")
-    .OnError(exception => { ErrorDetail.Add(exception.Message); })
-    .IsDependentOn("Build")
-    .Does(() =>
-    {
-        RunTest(NUNIT3_CONSOLE, BIN_DIR, ADDIN_TESTS,"TestAddins", ref ErrorDetail);
-    });
-
 //////////////////////////////////////////////////////////////////////
 // TEST CONSOLE
 //////////////////////////////////////////////////////////////////////
@@ -238,7 +221,6 @@ var BinFiles = new FilePath[]
     "nunit-agent-x86.exe.config",
     "nunit-agent.exe",
     "nunit-agent.exe.config",
-    "nunit.engine.addin.xml",
     "nunit.engine.addins",
     "nunit.engine.api.dll",
     "nunit.engine.api.xml",
@@ -254,16 +236,6 @@ var BinFiles = new FilePath[]
     "nunit3-console.tests.dll",
     "TestListWithEmptyLine.tst",
     "TextSummary.xslt",
-    "addins/nunit-project-loader.dll",
-    "addins/nunit-v2-result-writer.dll",
-    "addins/vs-project-loader.dll",
-    "addins/tests/addin-tests.dll",
-    "addins/tests/nunit-project-loader.dll",
-    "addins/tests/nunit.engine.api.dll",
-    "addins/tests/nunit.engine.api.xml",
-    "addins/tests/nunit.framework.dll",
-    "addins/tests/nunit.framework.xml",
-    "addins/tests/vs-project-loader.dll",
 };
 
 Task("PackageSource")
@@ -329,39 +301,6 @@ Task("PackageEngine")
         });
     });
 
-Task("PackageExtensions")
-    .IsDependentOn("CreateImage")
-    .Does(() =>
-    {
-        var currentImageDir = IMAGE_DIR + "NUnit-" + packageVersion + "/";
-
-        CreateDirectory(PACKAGE_DIR);
-
-        NuGetPack("nuget/extensions/nunit-project-loader.nuspec", new NuGetPackSettings()
-        {
-            Version = packageVersion,
-            BasePath = currentImageDir,
-            OutputDirectory = PACKAGE_DIR,
-            NoPackageAnalysis = true
-        });
-
-        NuGetPack("nuget/extensions/vs-project-loader.nuspec", new NuGetPackSettings()
-        {
-            Version = packageVersion,
-            BasePath = currentImageDir,
-            OutputDirectory = PACKAGE_DIR,
-            NoPackageAnalysis = true
-        });
-
-        NuGetPack("nuget/extensions/nunit-v2-result-writer.nuspec", new NuGetPackSettings()
-        {
-            Version = packageVersion,
-            BasePath = currentImageDir,
-            OutputDirectory = PACKAGE_DIR,
-            NoPackageAnalysis = true
-        });
-    });
-
 Task("PackageConsole")
     .IsDependentOn("CreateImage")
     .Does(() =>
@@ -405,10 +344,7 @@ Task("PackageZip")
 
         var zipFiles =
             GetFiles(currentImageDir + "*.*") +
-            GetFiles(currentImageDir + "bin/*.*") +
-            GetFiles(currentImageDir + "bin/addins/*.*") +
-            GetFiles(currentImageDir + "bin/addins/tests/*.*") +
-            GetFiles(currentImageDir + "bin/addins/v2-tests/*.*");
+            GetFiles(currentImageDir + "bin/*.*");
         Zip(currentImageDir, File(ZIP_PACKAGE), zipFiles);
     });
 
@@ -531,13 +467,11 @@ Task("Rebuild")
 
 Task("Test")
     .IsDependentOn("TestEngine")
-    .IsDependentOn("TestAddins")
     .IsDependentOn("TestConsole");
 
 Task("Package")
     .IsDependentOn("CheckForError")
     .IsDependentOn("PackageEngine")
-    .IsDependentOn("PackageExtensions")
     .IsDependentOn("PackageConsole")
     .IsDependentOn("PackageZip");
 

diff --git a/nuget/runners/nunit.console-runner-with-extensions.nuspec b/nuget/runners/nunit.console-runner-with-extensions.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NUnit.Console</id>
-    <title>NUnit Console Runner Version 3 With Extensions</title>
+    <title>NUnit Console Runner Version 3 Plus Extensions</title>
     <version>$version$</version>
     <authors>Charlie Poole</authors>
     <owners>Charlie Poole</owners>
     <licenseUrl>http://nunit.org/nuget/nunit3-license.txt</licenseUrl>
     <projectUrl>http://nunit.org</projectUrl>
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <summary>Console runner for version 3.0 of the NUnit unit-testing framework with selected extensions.</summary>
+    <summary>Console runner for the NUnit 3 unit-testing framework with selected extensions.</summary>
     <description>
       This package includes the nunit3-console runner and test engine for version 3.0 of the NUnit unit-testing framework.
 
@@ -34,7 +34,7 @@
         <dependency id="NUnit.Extension.VSProjectLoader" version="$version$" />
         <dependency id="NUnit.Extension.NUnitV2ResultWriter" version="$version$" />
         <dependency id="NUnit.Extension.NUnitV2Driver" version="$version$" />
-        <dependency id="NUnit.Extension.TeamCityEventListener" version="1.0.1" />
+        <dependency id="NUnit.Extension.TeamCityEventListener" version="1.0.2" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>http://nunit.org</projectUrl>
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <summary>Console runner for version 3.0 of the NUnit unit-testing framework, without any extensions.</summary>
+    <summary>Console runner for the NUnit 3 unit-testing framework, without any extensions.</summary>
     <description>
       This package includes the nunit3-console runner and test engine for version 3.0 of the NUnit unit-testing framework.
 

diff --git a/nuget/runners/nunit.runners.nuspec b/nuget/runners/nunit.runners.nuspec
@@ -2,17 +2,19 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NUnit.Runners</id>
-    <title>NUnit Console Version 3 With Extensions</title>
+    <title>NUnit Console Runner - Deprecated: Use NUnit.Console</title>
     <version>$version$</version>
     <authors>Charlie Poole</authors>
     <owners>Charlie Poole</owners>
     <licenseUrl>http://nunit.org/nuget/nunit3-license.txt</licenseUrl>
     <projectUrl>http://nunit.org</projectUrl>
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <summary>Console runner for version 3.0 of the NUnit unit-testing framework with selected extensions</summary>
+    <summary>Deprecated NUnit 3 console runner - use NUnit.Console or NUnit.ConsoleRunner.</summary>
     <description>
-      This package includes the nunit3-console runner and test engine for version 3.0 of the NUnit unit-testing framework.
+      This package is now obsolete and has been replaced by the NUnit.Console package.
+
+      It includes the nunit3-console runner and test engine for version 3.0 of the NUnit unit-testing framework.
 
       The following extensions are included with this package:
       * NUnitProjectLoader     - loads tests from NUnit projects
@@ -22,8 +24,6 @@
       * TeamCityEventListener - supports special progress messages used by teamcity.
 
       Other extensions, if needed, must be installed separately.
-
-      This package is being replaced by the NUnit.Console package and will eventually be removed. Users should update their projects to use the NUnit.Console package directly if desired.
     </description>
     <releaseNotes>This release uses the latest version of the TeamCityEventListener extension.</releaseNotes>
     <language>en-US</language>
@@ -36,7 +36,7 @@
         <dependency id="NUnit.Extension.VSProjectLoader" version="$version$" />
         <dependency id="NUnit.Extension.NUnitV2ResultWriter" version="$version$" />
         <dependency id="NUnit.Extension.NUnitV2Driver" version="$version$" />
-        <dependency id="NUnit.Extension.TeamCityEventListener" version="1.0.1" />
+        <dependency id="NUnit.Extension.TeamCityEventListener" version="1.0.2" />
       </group>
     </dependencies>
   </metadata>

diff --git a/src/NUnitEngine/Addins/addin-tests/NUnit2XmlResultWriterTests.cs b/src/NUnitEngine/Addins/addin-tests/NUnit2XmlResultWriterTests.cs