diff --git a/appveyor.yml b/appveyor.yml index c97e32e..ea52580 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: 3.5.{build} -image: Visual Studio 2015 +image: Visual Studio 2017 build_script: - ps: .\build.ps1 -Target "Appveyor" diff --git a/build.cake b/build.cake index 49a1d83..7fa3e5f 100644 --- a/build.cake +++ b/build.cake @@ -1,4 +1,4 @@ -#tool nuget:?package=NUnit.ConsoleRunner&version=3.7.0 +#tool nuget:?package=NUnit.ConsoleRunner&version=3.11.1 ////////////////////////////////////////////////////////////////////// // PROJECT-SPECIFIC @@ -8,12 +8,13 @@ // main changes needed should be in this section. var SOLUTION_FILE = "nunit-v2-result-writer.sln"; +var OUTPUT_ASSEMBLY = "nunit-v2-result-writer.dll"; var UNIT_TEST_ASSEMBLY = "nunit-v2-result-writer.tests.dll"; var GITHUB_SITE = "https://github.com/nunit/nunit-v2-result-writer"; var WIKI_PAGE = "https://github.com/nunit/docs/wiki/Console-Command-Line"; var NUGET_ID = "NUnit.Extension.NUnitV2ResultWriter"; var CHOCO_ID = "nunit-extension-nunit-v2-result-writer"; -var VERSION = "3.6.0"; +var VERSION = "3.7.0"; // Metadata used in the nuget and chocolatey packages var TITLE = "NUnit 3 - NUnit V2 Result Writer Extension"; @@ -24,6 +25,11 @@ var SUMMARY = "NUnit Engine extension for writing test result files in NUnit V2 var COPYRIGHT = "Copyright (c) 2016 Charlie Poole"; var RELEASE_NOTES = new [] { "See https://raw.githubusercontent.com/nunit/nunit-v2-result-writer/master/CHANGES.txt" }; var TAGS = new [] { "nunit", "test", "testing", "tdd", "runner" }; +var TARGET_FRAMEWORKS = new [] { "net20", "netcoreapp2.1" }; + +// We don't support running tests built with .net core yet +// var TEST_TARGET_FRAMEWORKS = TARGET_FRAMEWORKS +var TEST_TARGET_FRAMEWORKS = new [] { "net20" }; //////////////////////////////////////////////////////////////////// // ARGUMENTS @@ -180,7 +186,7 @@ Task("Test") .IsDependentOn("Build") .Does(() => { - NUnit3(BIN_DIR + UNIT_TEST_ASSEMBLY); + NUnit3(TEST_TARGET_FRAMEWORKS.Select(framework => System.IO.Path.Combine(BIN_DIR, framework, UNIT_TEST_ASSEMBLY))); }); ////////////////////////////////////////////////////////////////////// @@ -197,6 +203,12 @@ var BUG_TRACKER_URL = new Uri(GITHUB_SITE + "/issues"); var DOCS_URL = new Uri(WIKI_PAGE); var MAILING_LIST_URL = new Uri("https://groups.google.com/forum/#!forum/nunit-discuss"); +// Nuspec-files don't handle forward slash in path in combination with recursive wildcards +// https://github.com/cake-build/cake/issues/2367 +// https://github.com/NuGet/Home/issues/3584 +var TOOLS_SOURCE = BIN_SRC + "**/" + OUTPUT_ASSEMBLY; +TOOLS_SOURCE = TOOLS_SOURCE.Replace("/", @"\"); + Task("RePackageNuGet") .Does(() => { @@ -221,10 +233,11 @@ Task("RePackageNuGet") Tags = TAGS, //Language = "en-US", OutputDirectory = OUTPUT_DIR, + KeepTemporaryNuSpecFile = false, Files = new [] { new NuSpecContent { Source = PROJECT_DIR + "LICENSE.txt" }, new NuSpecContent { Source = PROJECT_DIR + "CHANGES.txt" }, - new NuSpecContent { Source = BIN_SRC + "nunit-v2-result-writer.dll", Target = "tools" } + new NuSpecContent { Source = TOOLS_SOURCE, Target = "tools" }, } }); }); @@ -262,7 +275,7 @@ Task("RePackageChocolatey") new ChocolateyNuSpecContent { Source = PROJECT_DIR + "LICENSE.txt", Target = "tools" }, new ChocolateyNuSpecContent { Source = PROJECT_DIR + "CHANGES.txt", Target = "tools" }, new ChocolateyNuSpecContent { Source = PROJECT_DIR + "VERIFICATION.txt", Target = "tools" }, - new ChocolateyNuSpecContent { Source = BIN_SRC + "nunit-v2-result-writer.dll", Target = "tools" } + new ChocolateyNuSpecContent { Source = TOOLS_SOURCE, Target = "tools" } } }); }); diff --git a/nunit-v2-result-writer.sln b/nunit-v2-result-writer.sln index da96dcc..c1147c1 100644 --- a/nunit-v2-result-writer.sln +++ b/nunit-v2-result-writer.sln @@ -1,11 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30320.27 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-v2-result-writer", "src\extension\nunit-v2-result-writer.csproj", "{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-v2-result-writer", "src\extension\nunit-v2-result-writer.csproj", "{AECFA3FB-E55A-4151-9DEA-F715FBB972BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-v2-result-writer.tests", "src\tests\nunit-v2-result-writer.tests.csproj", "{9A2892BF-2E7A-4D32-8ED9-3971A9EB959E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-v2-result-writer.tests", "src\tests\nunit-v2-result-writer.tests.csproj", "{9A2892BF-2E7A-4D32-8ED9-3971A9EB959E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{5F2D8428-EF74-449E-ADD6-505D20751D12}" + ProjectSection(SolutionItems) = preProject + .travis.yml = .travis.yml + appveyor.yml = appveyor.yml + build = build + build.cake = build.cake + build.cmd = build.cmd + build.ps1 = build.ps1 + build.sh = build.sh + NuGet.config = NuGet.config + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,4 +37,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F9258C05-1EEA-485D-BC8E-69A1D6EFE5DC} + EndGlobalSection EndGlobal diff --git a/src/extension/nunit-v2-result-writer.csproj b/src/extension/nunit-v2-result-writer.csproj index ccb6453..8319107 100644 --- a/src/extension/nunit-v2-result-writer.csproj +++ b/src/extension/nunit-v2-result-writer.csproj @@ -1,60 +1,15 @@  - - + - Debug - AnyCPU - {AECFA3FB-E55A-4151-9DEA-F715FBB972BA} - Library - Properties + + net20;netcoreapp2.1 + Debug;Release NUnit.Engine.Addins nunit-v2-result-writer - v2.0 - 512 - - - true - full - false - ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - ..\..\bin\Release\ - TRACE - prompt - 4 - true + ..\..\bin\$(Configuration)\ + false - - ..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll - True - - - - + - - - - - - - - - - - \ No newline at end of file diff --git a/src/extension/packages.config b/src/extension/packages.config deleted file mode 100644 index 2db5070..0000000 --- a/src/extension/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/tests/nunit-v2-result-writer.tests.csproj b/src/tests/nunit-v2-result-writer.tests.csproj index 5e9e3ff..43f81a5 100644 --- a/src/tests/nunit-v2-result-writer.tests.csproj +++ b/src/tests/nunit-v2-result-writer.tests.csproj @@ -1,70 +1,24 @@  - - + - Debug - AnyCPU - {9A2892BF-2E7A-4D32-8ED9-3971A9EB959E} - Library - Properties + + + net20;netcoreapp2.1 + Debug;Release NUnit.Engine.Tests nunit-v2-result-writer.tests - v2.0 - 512 - - - true - full - false - ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\Release\ - TRACE - prompt - 4 + ..\..\bin\$(Configuration)\ + false + PackageReference - - ..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll - True - - - ..\..\packages\NUnit.3.7.1\lib\net20\nunit.framework.dll - True - - - ..\..\packages\NUnit.3.7.1\lib\net20\NUnit.System.Linq.dll - True - - - - + + + + - - + - - - {aecfa3fb-e55a-4151-9dea-f715fbb972ba} - nunit-v2-result-writer - - - - - - - - \ No newline at end of file + + diff --git a/src/tests/packages.config b/src/tests/packages.config deleted file mode 100644 index 4affdef..0000000 --- a/src/tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tools/packages.config b/tools/packages.config index 89d4cd1..5ab376a 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,4 +1,4 @@ - +