Merge pull request #651 from nunit/release-30beta2

Release 3.0 Beta 2

.gitignore

@@ -14,6 +14,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+.vs/
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

CHANGES.txt

@@ -60,6 +60,7 @@ Issues Resolved
  * 628  Modify IService interface and simplify ServiceContext
  * 631  Separate packaging for the compact framework
  * 646  ConfigurationManager.AppSettings Params Return Null under Beta 1
+ * 648  Passing 2 or more test assemblies targeting > .NET 2.0 to nunit-console fails
 
 NUnit 3.0.0 Beta 1 - March 25, 2015
 

NUnit.proj

@@ -540,7 +540,7 @@
 
     <!-- Copy binaries to bin directory -->
     <Copy DestinationFiles="@(BinFiles->'$(PackageBinDir)\%(RecursiveDir)%(Filename)%(Extension)')" 
-        SourceFiles="@(BinFiles)"></Copy>
+        SourceFiles="@(BinFiles)" />
 
   </Target>
 

nuget/nunit.console.nuspec

@@ -11,8 +11,8 @@
     <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.</summary>
-    <description>This package includes the nunit-console runner and test engine for version 3.0 of the NUnit unit-testing framework. The runner will run 2.6 tests using a plugin.&#10;&#13;&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</description>
-    <releaseNotes>This package includes the nunit-console runner and test engine for version 3.0 of the NUnit unit-testing framework. The runner will run 2.6 tests using a plugin.&#10;&#13;&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
+    <description>This package includes the nunit-console runner and test engine for version 3.0 of the NUnit unit-testing framework. The runner will run 2.6 tests using a plugin.&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</description>
+    <releaseNotes>This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
     <language>en-US</language>
     <tags>nunit test testing tdd runner</tags>
     <copyright>Copyright (c) 2015 Charlie Poole</copyright>

nuget/nunit.core.engine.nuspec

@@ -11,7 +11,7 @@
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>The NUnit Core Engine handles is used by runners to load and execute tests within a process.</summary>
-    <description>This package includes the nunit.core.engine assembly, which may be used by runner programs that need to load and run tests within the same process as an alternative to the full engine.&#10;&#13;&#10;&#13;It is particularly suited for use by device runners. Third party runners that set up their own process for execution may also find this useful.&#10;&#13;&#10;&#13;This package is not intended for direct use by users who simply want to run tests.</description>
+    <description>This package includes the nunit.core.engine assembly, which may be used by runner programs that need to load and run tests within the same process as an alternative to the full engine.&#10;&#13;It is particularly suited for use by device runners. Third party runners that set up their own process for execution may also find this useful.&#10;&#13;This package is not intended for direct use by users who simply want to run tests.</description>
     <releaseNotes>This is an beta release. However, the interface to the engine is considered stable at this point.</releaseNotes>
     <language>en-US</language>
     <tags>nunit test testing tdd engine</tags>

nuget/nunit.nuspec

@@ -11,8 +11,8 @@
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnit is a unit-testing framework for all .Net languages with a strong TDD focus.</summary>
-    <description>NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible. A number of runners, both from the NUnit project and by third parties, are able to execute NUnit tests.&#10;&#13;&#10;&#13;This package includes the NUnit 3.0 framework assembly, which is referenced by your tests. You will need to install version 3.0 of the nunit-console program or a third-party runner that supports NUnit 3.0 in order to execute tests. Runners intended for use with NUnit 2.x will not run 3.0 tests correctly.&#10;&#13;&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</description>
-    <releaseNotes>This package includes the NUnit 3.0 framework assembly, which is referenced by your tests. You will need to install version 3.0 of the nunit-console program or a third-party runner that supports NUnit 3.0 in order to execute tests. Runners intended for use with NUnit 2.x will not run 3.0 tests correctly.&#10;&#13;&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
+    <description>NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible. A number of runners, both from the NUnit project and by third parties, are able to execute NUnit tests.&#10;&#13;This package includes the NUnit 3.0 framework assembly, which is referenced by your tests. You will need to install version 3.0 of the nunit-console program or a third-party runner that supports NUnit 3.0 in order to execute tests. Runners intended for use with NUnit 2.x will not run 3.0 tests correctly.&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</description>
+    <releaseNotes>This package includes the NUnit 3.0 framework assembly, which is referenced by your tests. You will need to install version 3.0 of the nunit-console program or a third-party runner that supports NUnit 3.0 in order to execute tests. Runners intended for use with NUnit 2.x will not run 3.0 tests correctly.&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
     <language>en-US</language>
     <tags>nunit test testing tdd framework fluent assert theory plugin addin</tags>
     <copyright>Copyright (c) 2015 Charlie Poole</copyright>

nuget/nunitCF.nuspec

@@ -11,8 +11,8 @@
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnit is a unit-testing framework for all .Net languages with a strong TDD focus.</summary>
-    <description>NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible. A number of runners, both from the NUnit project and by third parties, are able to execute NUnit tests.&#10;&#13;&#10;&#13;This package includes the NUnit 3.0 framework assembly, which is referenced by your tests. You will need to install version 3.0 of the nunit-console program or a third-party runner that supports NUnit 3.0 in order to execute tests. Runners intended for use with NUnit 2.x will not run 3.0 tests correctly.&#10;&#13;&#10;&#13;This is an beta release, but is ready for production use for people with prior NUnit experience.</description>
-    <releaseNotes>This package includes the NUnit 3.0 framework assembly for .NET Compact Framework 3.5, which is referenced by your tests. You will need to install the NUnitLiteCF package in order to run the tests. Two separate packages are used because future versions will be supported by additional runners.</releaseNotes>
+    <description>NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible.&#10;&#13;This package includes the NUnit 3.0 framework assembly for .NET Compact Framework 3.5, which is referenced by your tests. You will need to install the NUnitLiteCF package in order to run the tests. Two separate packages are used because future versions will be supported by additional runners.</description>
+    <releaseNotes>This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
     <language>en-US</language>
     <tags>nunit test testing tdd framework fluent assert theory plugin addin cf compact framework</tags>
     <copyright>Copyright (c) 2015 Charlie Poole</copyright>

nuget/nunitlite.nuspec

@@ -11,7 +11,7 @@
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnitlite is a lightweight runner for tests that use the NUnit testing framework.</summary>
-    <description>NUnitLite provides a simple way to run NUnit tests, without the overhead of a full NUnit installation. It is suitable for projects that want to have a quick way to run tests using a console runner and don't need all the features of the NUnit engine and console runner. This package contains builds of the NUnitLite runner for .NET 2.0, 4.0 and 4.5 as well as Silverlight 5.0.&#10;&#13;&#10;&#13;How to use this package:&#10;&#13;&#10;&#13;1. Create a console application for your tests and delete the generated class containing Main().&#10;&#13;2. Install the NUnitLite package, which creates a new Main() as well as adding a reference to NUnitLite. This will also bring in the NUnit package, which adds a reference to the nunit framework to your project.&#10;&#13;3. Add your tests to the test project and simply start the project to execute them.</description>
+    <description>NUnitLite provides a simple way to run NUnit tests, without the overhead of a full NUnit installation. It is suitable for projects that want to have a quick way to run tests using a console runner and don't need all the features of the NUnit engine and console runner. This package contains builds of the NUnitLite runner for .NET 2.0, 4.0 and 4.5 as well as Silverlight 5.0.&#10;&#13;How to use this package:&#10;&#13;1. Create a console application for your tests and delete the generated class containing Main().&#10;&#13;2. Install the NUnitLite package, which creates a new Main() as well as adding a reference to NUnitLite. This will also bring in the NUnit package, which adds a reference to the nunit framework to your project.&#10;&#13;3. Add your tests to the test project and simply start the project to execute them.</description>
     <releaseNotes>This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
     <language>en-US</language>
     <tags>test unit testing tdd framework fluent assert device phone embedded</tags>
@@ -36,8 +36,8 @@
     <file src="bin\net-4.0\nunitlite.dll" target="lib\net40" />
     <file src="bin\net-4.5\nunitlite.dll" target="lib\net45" />
     <file src="bin\sl-5.0\nunitlite.dll" target="lib\sl5" />
-    <file src="nuget\Program.cs" target="content" />
-    <file src="nuget\Program.vb" target="content" />
-    <file src="nuget\install.ps1" target="tools" />
+    <file src="..\..\nuget\Program.cs" target="content" />
+    <file src="..\..\nuget\Program.vb" target="content" />
+    <file src="..\..\nuget\install.ps1" target="tools" />
   </files>
 </package>

nuget/nunitliteCF.nuspec

@@ -11,7 +11,7 @@
     <iconUrl>http://nunit.org/nuget/nunitv3_32x32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>NUnitlite is a lightweight runner for tests that use the NUnit testing framework.</summary>
-    <description>NUnitLite provides a simple way to run NUnit tests, without the overhead of a full NUnit installation. It is suitable for projects that want to have a quick way to run tests using a console runner and don't need all the features of the NUnit engine and console runner. This package contains a build of the NUnitLite runner for the .NET compact framework 3.5.&#10;&#13;&#10;&#13;How to use this package:&#10;&#13;&#10;&#13;1. Create a console application for your tests and delete the generated class containing Main().&#10;&#13;2. Install the NUnitLite package, which creates a new Main() as well as adding a reference to NUnitLite. This will also bring in the NUnit package, which adds a reference to the nunit framework to your project.&#10;&#13;3. Add your tests to the test project and simply start the project to execute them.</description>
+    <description>NUnitLite provides a simple way to run NUnit tests, without the overhead of a full NUnit installation. This package contains a build of the NUnitLite runner for the .NET compact framework 3.5.</description>
     <releaseNotes>This is an beta release, but is ready for production use for people with prior NUnit experience.</releaseNotes>
     <language>en-US</language>
     <tags>test unit testing tdd framework fluent assert device phone embedded cf compact</tags>