diff --git a/NUnitTestAdapter.sln b/NUnitTestAdapter.sln index 466d178..e5633dc 100644 Binary files a/NUnitTestAdapter.sln and b/NUnitTestAdapter.sln differ diff --git a/build.cake b/build.cake index 635c417..0ef5736 100644 --- a/build.cake +++ b/build.cake @@ -70,6 +70,7 @@ var PACKAGE_DIR = PROJECT_DIR + "package/"; var PACKAGE_IMAGE_DIR = PACKAGE_DIR + packageName + "/"; var TOOLS_DIR = PROJECT_DIR + "tools/"; var BIN_DIR = PROJECT_DIR + "bin/" + configuration + "/"; +var NUGET_DIR = PROJECT_DIR + "nuget/"; var DEMO_BIN_DIR = PROJECT_DIR + "src/NUnitTestDemo/NUnitTestDemo/bin/" + configuration + "/"; var VSIXDIR = PROJECT_DIR+"src/NUnitTestAdapterInstall/bin/"+configuration+"/"; var TEST_BIN_DIR = PROJECT_DIR+"src/NUnitTestAdapterTests/bin/"+configuration+"/"; @@ -188,6 +189,7 @@ Task("CreateWorkingImage") .IsDependentOn("CreatePackageDir") .Does(() => { + Information("Creating work image"); CreateDirectory(PACKAGE_IMAGE_DIR); CleanDirectory(PACKAGE_IMAGE_DIR); @@ -202,8 +204,9 @@ Task("CreateWorkingImage") BIN_DIR + "Mono.Cecil.Rocks.dll", BIN_DIR + "nunit.core.dll", BIN_DIR + "nunit.core.interfaces.dll", - BIN_DIR + "nunit.util.dll" - }; + BIN_DIR + "nunit.util.dll", + NUGET_DIR + "nunittestadapter.props" + }; var binDir = PACKAGE_IMAGE_DIR + "bin/"; CreateDirectory(binDir); @@ -221,6 +224,7 @@ Task("PackageNuGet") .IsDependentOn("CreateWorkingImage") .Does(() => { + Information("Creating the NuGet package"); NuGetPack("nuget/NUnitVisualStudioTestAdapter.nuspec", new NuGetPackSettings() { Version = packageVersion, @@ -234,7 +238,7 @@ Task("PackageVsix") .IsDependentOn("CreatePackageDir") .Does(() => { - System.Console.WriteLine("Packaging the vsix"); + Information("Creating the vsix package"); CopyFile( VSIXDIR + "NUnitTestAdapter.vsix", PACKAGE_DIR + packageName + ".vsix"); diff --git a/nuget/NUnitTestAdapter.props b/nuget/NUnitTestAdapter.props new file mode 100644 index 0000000..358a19e --- /dev/null +++ b/nuget/NUnitTestAdapter.props @@ -0,0 +1,46 @@ + + + + + NUnit.VisualStudio.TestAdapter.dll + PreserveNewest + False + + + Mono.Cecil.dll + PreserveNewest + False + + + Mono.Cecil.Mdb.dll + PreserveNewest + False + + + Mono.Cecil.Pdb.dll + PreserveNewest + False + + + Mono.Cecil.Rocks.dll + PreserveNewest + False + + + nunit.core.dll + PreserveNewest + False + + + nunit.core.interfaces.dll + PreserveNewest + False + + + nunit.util.dll + PreserveNewest + False + + + + diff --git a/nuget/NUnitVisualStudioTestAdapter.nuspec b/nuget/NUnitVisualStudioTestAdapter.nuspec index 1505b38..0f4fd3b 100644 --- a/nuget/NUnitVisualStudioTestAdapter.nuspec +++ b/nuget/NUnitVisualStudioTestAdapter.nuspec @@ -11,24 +11,24 @@ http://nunit.org/nuget/nunit_32x32.png false - The NUnit TestAdapter for Visual Studio 2012/13/15 for NUnit 2. With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your TFS server. -Note that this package ONLY contains the adapter, not the NUnit framework. You must also get the framework, or use the NUnitTestAdapter.WithFramework nuget package. -You only need one such package for a solution. The package works with Visual Studio >= 2012 - The NUnit TestAdapter for Visual Studio 2012/13/15/17 for NUnit 2 - Hotfix for .net framework 3.5 support, and missing pdb crash - Copyright (c) Charlie Poole 2011-2017, Terje Sandstrom 2014-2017 + The NUnit TestAdapter for Visual Studio 2012 and newer for NUnit 2. With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your TFS server. +Note that this package ONLY contains the adapter, not the NUnit framework. + The NUnit TestAdapter for Visual Studio 2012 and newer for NUnit 2 + See release notes on project site + Copyright (c) Charlie Poole 2011-2019, Terje Sandstrom 2014-2019 en-US - test visualstudio testadapter + test visualstudio testadapter nunit - - - - - - - - + + + + + + + + + diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..fbb8896 --- /dev/null +++ b/readme.md @@ -0,0 +1,20 @@ +# NUnit Test Adapter for Visual Studio, for NUnit 2.X + +The NUnit Test Adapter only runs NUnit 2.X tests in Visual Studio 2012 and newer. + +Note that it does not run NUnit 3.X tests. For that, you need the [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) + +Please consider moving your code to use NUnit3. This adapter is only maintained to support newer versions of Visual Studio, and is very rarely updated. We might fix an occasional bug if it is critical. + + + + +##### Support + +Ask support questions [![Chat](https://img.shields.io/gitter/room/nunit/nunit.svg?style=flat)](https://gitter.im/nunit/nunit) +or raise an issue [![](https://img.shields.io/github/issues/nunit/NUnit-vs-Adapter.svg?style=flat)](https://github.com/nunit/nunit-vs-adapter/issues) + +## License + + +The NUnit 3 Test Adapter is Open Source software released under the [![](https://img.shields.io/github/license/nunit/nunit3-vs-adapter.svg?style=flat)](https://nunit.org/nuget/nunit3-license.txt). diff --git a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest index 7ad6e19..706bcaa 100644 --- a/src/NUnitTestAdapterInstall/source.extension.vsixmanifest +++ b/src/NUnitTestAdapterInstall/source.extension.vsixmanifest @@ -13,9 +13,9 @@ test, Testing, adapter, NUnit, TDD, NUnit - - - + + + @@ -24,7 +24,7 @@ - - + + diff --git a/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj index 8d672a8..fbb56fa 100644 --- a/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj +++ b/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj @@ -59,8 +59,8 @@ ..\..\lib\nunit.core.interfaces.dll - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll False diff --git a/src/NUnitTestAdapterTests/packages.config b/src/NUnitTestAdapterTests/packages.config index 92fd0fc..6008319 100644 --- a/src/NUnitTestAdapterTests/packages.config +++ b/src/NUnitTestAdapterTests/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/empty-assembly/empty-assembly.csproj b/src/empty-assembly/empty-assembly.csproj index 0cc7b2e..034c134 100644 --- a/src/empty-assembly/empty-assembly.csproj +++ b/src/empty-assembly/empty-assembly.csproj @@ -79,8 +79,8 @@ false - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll System diff --git a/src/empty-assembly/packages.config b/src/empty-assembly/packages.config index c714ef3..a5aee52 100644 --- a/src/empty-assembly/packages.config +++ b/src/empty-assembly/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj index 660ab3a..942f8d6 100644 --- a/src/mock-assembly/mock-assembly.csproj +++ b/src/mock-assembly/mock-assembly.csproj @@ -79,8 +79,8 @@ false - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll System diff --git a/src/mock-assembly/packages.config b/src/mock-assembly/packages.config index c714ef3..a5aee52 100644 --- a/src/mock-assembly/packages.config +++ b/src/mock-assembly/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file