From 501d1745f5b1dfd724b92ba0fe6304ac3b1f2955 Mon Sep 17 00:00:00 2001 From: Rob Prouse Date: Tue, 19 Apr 2016 09:47:33 -0400 Subject: [PATCH] Minor test and packaging fixes after testing the build --- build.cake | 10 +++++++++- .../nunit3-console.tests/CommandLineTests.cs | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 207c915399..f0fcdfbf32 100644 --- a/build.cake +++ b/build.cake @@ -476,6 +476,8 @@ var BinFiles = new FilePath[] }; // Not all of these are present in every framework +// The Microsoft and System assemblies are part of the BCL +// used by the .NET 4.0 framework. 4.0 tests will not run without them var FrameworkFiles = new FilePath[] { "AppManifest.xaml", @@ -491,7 +493,13 @@ var FrameworkFiles = new FilePath[] "nunitlite.tests.exe", "nunitlite.tests.dll", "slow-nunit-tests.dll", - "nunitlite-runner.exe" + "nunitlite-runner.exe", + "Microsoft.Threading.Tasks.dll", + "Microsoft.Threading.Tasks.Extensions.Desktop.dll", + "Microsoft.Threading.Tasks.Extensions.dll", + "System.IO.dll", + "System.Runtime.dll", + "System.Threading.Tasks.dll" }; Task("PackageSource") diff --git a/src/NUnitConsole/nunit3-console.tests/CommandLineTests.cs b/src/NUnitConsole/nunit3-console.tests/CommandLineTests.cs index 68b39e5264..03547d8ff4 100644 --- a/src/NUnitConsole/nunit3-console.tests/CommandLineTests.cs +++ b/src/NUnitConsole/nunit3-console.tests/CommandLineTests.cs @@ -529,6 +529,8 @@ public void ShouldSetTeamCityFlagAccordingToArgsAndDefauls(bool hasTeamcityInCmd public void ShouldNotFailOnEmptyLine() { var testListPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "TestListWithEmptyLine.tst"); + // Not copying this test file into releases + Assume.That(testListPath, Does.Exist); var options = new ConsoleOptions("--testlist=" + testListPath); Assert.That(options.errorMessages, Is.Empty); Assert.That(options.TestList, Is.EqualTo(new[] {"AmazingTest"}));