Merge pull request #181 from nunit/Issue180

Issue180
nunit · Jun 4, 2019 · be6d50a · be6d50a
2 parents 53a5ccb + 4bf7dca
commit be6d50a
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 32 deletions.
diff --git a/NUnitTestAdapter.sln b/NUnitTestAdapter.sln
diff --git 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
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <Content Include="$(MSBuildThisFileDirectory)NUnit.VisualStudio.TestAdapter.dll">
+            <Link>NUnit.VisualStudio.TestAdapter.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.dll" >
+            <Link>Mono.Cecil.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll" >
+            <Link>Mono.Cecil.Mdb.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll" >
+            <Link>Mono.Cecil.Pdb.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll" >
+            <Link>Mono.Cecil.Rocks.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.core.dll">
+            <Link>nunit.core.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.core.interfaces.dll">
+            <Link>nunit.core.interfaces.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)nunit.util.dll">
+            <Link>nunit.util.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>False</Visible>
+        </Content>
+     </ItemGroup>
+</Project>
+
diff --git a/nuget/NUnitVisualStudioTestAdapter.nuspec b/nuget/NUnitVisualStudioTestAdapter.nuspec
@@ -11,24 +11,24 @@
         <repository type="git" url="https://github.com/nunit/nunit-vs-adapter"/>
         <iconUrl>http://nunit.org/nuget/nunit_32x32.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>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</description>
-      <summary>The NUnit TestAdapter for Visual Studio 2012/13/15/17 for NUnit 2</summary>
-        <releaseNotes>Hotfix for .net framework 3.5 support, and missing pdb crash</releaseNotes>
-        <copyright>Copyright (c) Charlie Poole 2011-2017, Terje Sandstrom 2014-2017</copyright>
+        <description>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.</description>
+      <summary>The NUnit TestAdapter for Visual Studio 2012 and newer for NUnit 2</summary>
+        <releaseNotes>See release notes on project site</releaseNotes>
+        <copyright>Copyright (c) Charlie Poole 2011-2019, Terje Sandstrom 2014-2019</copyright>
         <language>en-US</language>
-        <tags>test visualstudio testadapter</tags>
+        <tags>test visualstudio testadapter nunit</tags>
     </metadata>
     <files>
         <file src="LICENSE.txt" />
-        <file src="bin\nunit.core.dll" target="tools\nunit.core.dll" />
-        <file src="bin\nunit.core.interfaces.dll" target="tools\nunit.core.interfaces.dll" />
-        <file src="bin\nunit.util.dll" target="tools\nunit.util.dll" />
-        <file src="bin\NUnit.VisualStudio.TestAdapter.dll" target="tools\NUnit.VisualStudio.TestAdapter.dll" />
-        <file src="bin\Mono.Cecil.dll" target="tools\Mono.Cecil.dll" />
-        <file src="bin\Mono.Cecil.Mdb.dll" target="tools\Mono.Cecil.Mdb.dll" />
-        <file src="bin\Mono.Cecil.Pdb.dll" target="tools\Mono.Cecil.Pdb.dll" />
-        <file src="bin\Mono.Cecil.Rocks.dll" target="tools\Mono.Cecil.Rocks.dll" />
+        <file src="bin\nunit.core.dll" target="build\nunit.core.dll" />
+        <file src="bin\nunit.core.interfaces.dll" target="build\nunit.core.interfaces.dll" />
+        <file src="bin\nunit.util.dll" target="build\nunit.util.dll" />
+        <file src="bin\NUnit.VisualStudio.TestAdapter.dll" target="build\NUnit.VisualStudio.TestAdapter.dll" />
+        <file src="bin\Mono.Cecil.dll" target="build\Mono.Cecil.dll" />
+        <file src="bin\Mono.Cecil.Mdb.dll" target="build\Mono.Cecil.Mdb.dll" />
+        <file src="bin\Mono.Cecil.Pdb.dll" target="build\Mono.Cecil.Pdb.dll" />
+        <file src="bin\Mono.Cecil.Rocks.dll" target="build\Mono.Cecil.Rocks.dll" />
+        <file src="bin\NUnitTestAdapter.props" target="build\NUnitTestAdapter.props" />
     </files>
 </package>
diff --git a/readme.md 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
@@ -13,9 +13,9 @@
     <Tags>test, Testing, adapter, NUnit, TDD, NUnit</Tags>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,16.0)" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,16.0)" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,16.0)"/>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[11.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[11.0,17.0)"/>
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -24,7 +24,7 @@
     <Asset Type="UnitTestExtension" d:Source="Project" d:ProjectName="NUnitTestAdapter" Path="|NUnitTestAdapter|" />
   </Assets>
   <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
-    <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0.25904.2,16.0)" DisplayName=".NET desktop development tools" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0.25904.2,)" DisplayName=".NET desktop development tools" />
   </Prerequisites>
 </PackageManifest>
diff --git a/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj
@@ -59,8 +59,8 @@
     <Reference Include="nunit.core.interfaces">
       <HintPath>..\..\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="nunit.util, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/NUnitTestAdapterTests/packages.config b/src/NUnitTestAdapterTests/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.3" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="2.7.0" targetFramework="net45" />
 </packages>
diff --git a/src/empty-assembly/empty-assembly.csproj b/src/empty-assembly/empty-assembly.csproj
@@ -79,8 +79,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/src/empty-assembly/packages.config b/src/empty-assembly/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="2.7.0" targetFramework="net45" />
 </packages>
diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -79,8 +79,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/src/mock-assembly/packages.config b/src/mock-assembly/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="2.7.0" targetFramework="net45" />
 </packages>