Merge pull request #438 from nunit/alpha-4-release

Final changes for the alpha-4 release
nunit · Dec 31, 2014 · 596f462 · 596f462
2 parents 03497fe + 4593e5d
commit 596f462
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 20 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,55 @@
-NOTE: A combined description of changes since NUnit 2.6.3 is under development along with a summary statement of major features. Both will be available in the next release.
+NOTE: A combined description of changes since NUnit 2.6.3 is under development along with a summary statement of major features. Both will be available in the first Beta release.
+
+NUnit 3.0.0 Alpha 4 - December 30, 2014
+
+Console
+
+ * The command-line may now include any number of assemblies and/or supported projects.
+
+Engine
+
+ * A driver is now included, which allows running NUnit 2.x tests under NUnit 3.0.
+ * The engine can now load and run tests specified in a number of project formats:
+   * NUnit (.nunit)
+   * Visual Studio C# projects (.csproj)
+   * Visual Studio F# projects (.vjsproj)
+   * Visual Studio Visual Basic projects (.vbproj)
+   * Visual Studio solutions (.sln)
+   * Legacy C++ and Visual JScript projects (.csproj and .vjsproj) are also supported
+   * Support for the current C++ format (.csxproj) is not yet available
+ * Creation of output files like TestResult.xml in various formats is now a
+   service of the engine, available to any runner.
+
+Framework
+
+ * ApartmentAttribute has been added, replacing STAAttribute and MTAAttribute.
+ * Unnecessary overloads of Assert.That and Assume.That have been removed.
+ * Multiple SetUpFixtures may be specified in a single namespace.
+ * Improvements to the Pairwise strategy test case generation algorithm.
+ * The new NUnitLite runner --testlist option, allows a list of tests to be kept in a file.
+
+Issues Resolved
+
+ * 37	Multiple SetUpFixtures should be permitted on same namespace
+ * 210	TestContext.WriteLine in an AppDomain causes an error
+ * 227	Add support for VS projects and solutions
+ * 231	Update C# samples to use NUnit 3.0
+ * 233	Update F# samples to use NUnit 3.0
+ * 234	Update C++ samples to use NUnit 3.0
+ * 265	Reorganize console reports for nunit-console and nunitlite
+ * 299	No full path to assembly in XML file under Compact Framework
+ * 301	Command-line length
+ * 363	Make Xml result output an engine service
+ * 377	CombiningStrategyAttributes don't work correctly on generic methods
+ * 388	Improvements to NUnitLite runner output
+ * 390	Specify exactly what happens when a test times out
+ * 396	ApartmentAttribute
+ * 397	CF nunitlite runner assembly has the wrong name
+ * 407	Assert.Pass() with ]]> in message crashes console runner
+ * 414	Simplify Assert overloads
+ * 416	NUnit 2.x Framework Driver
+ * 417	Complete work on NUnit projects
+ * 420	Create Settings file in proper location
 
 NUnit 3.0.0 Alpha 3 - November 29, 2014
 
@@ -406,4 +457,4 @@ Bug Fixes
  * 417557 	Add SetUICultureAttribute from NUnit 2.5.2
  * 417559 	Add Ignore to TestFixture, TestCase and TestCaseData
  * 417560 	Merge Assert.Throws and Assert.Catch changes from NUnit 2.5.2
- * 417564 	TimeoutAttribute on Assembly
+ * 417564 	TimeoutAttribute on Assembly
diff --git a/NUnit.proj b/NUnit.proj
@@ -9,7 +9,7 @@
 	<PropertyGroup Label="Common Properties">
 		<ProjectName>$(MSBuildProjectName)</ProjectName>
 		<PackageVersion>3.0.0</PackageVersion>
-		<PackageModifier>-alpha-3</PackageModifier>
+		<PackageModifier>-alpha-4</PackageModifier>
 		<PackageName>$(ProjectName)-$(PackageVersion)$(PackageModifier)</PackageName>
 	</PropertyGroup>
 
@@ -451,23 +451,21 @@
 
 	<ItemGroup Label="Files for packaging in bin directory">
 		<BinFiles Include="$(ConfigurationBuildDir)\**\*.dll" />
-
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-console.exe" />
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-console.exe.config" />
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-agent.exe" />
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-agent.exe.config" />
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-agent-x86.exe" />
-		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit-agent-x86.exe.config" />
+		<BinFiles Include="$(ConfigurationBuildDir)\**\*.exe" />
+		<BinFiles Include="$(ConfigurationBuildDir)\**\*.config" />
 
 		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit.framework.xml" />
 		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit.engine.api.xml" />
 
+		<BinFiles Include="$(ConfigurationBuildDir)\EngineTests.nunit" />
+		<BinFiles Include="$(ConfigurationBuildDir)\ConsoleTests.nunit" />
 		<BinFiles Include="$(ConfigurationBuildDir)\NUnit2TestResult.xsd" />
+		<BinFiles Include="$(ConfigurationBuildDir)\TextSummary.xslt" />
 
 		<!-- Extra files for Silverlight build -->
-		<BinFiles Include="$(ConfigurationBuildDir)\sl-5.0\AppManifest.xaml" />
-		<BinFiles Include="$(ConfigurationBuildDir)\sl-5.0\nunit.framework.tests.xap" />
-		<BinFiles Include="$(ConfigurationBuildDir)\sl-5.0\nunit.framework.tests_TestPage.html" />
+		<BinFiles Include="$(ConfigurationBuildDir)\**\AppManifest.xaml" />
+		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit.framework.tests.xap" />
+		<BinFiles Include="$(ConfigurationBuildDir)\**\nunit.framework.tests_TestPage.html" />
 
 		<!-- Include pdp files for Debug -->
 		<BinFiles Include="$(ConfigurationBuildDir)\**\*.pdb"
@@ -479,21 +477,22 @@
 		<SupportedFrameworks Include="net-4.0" />
 		<SupportedFrameworks Include="net-3.5" />
 		<SupportedFrameworks Include="net-2.0" />
-		<!--<SupportedFrameworks Condition="$(IsWindows)" Include="netcf-3.5" />
-		<SupportedFrameworks Condition="$(IsWindows)" Include="netcf-2.0" />-->
+		<!--<SupportedFrameworks Condition="$(IsWindows)" Include="netcf-3.5" />-->
 		<SupportedFrameworks Condition="$(IsWindows)" Include="sl-5.0" />
+		<SupportedFrameworks Include="portable" />
 	</ItemGroup>
 
 	<ItemGroup Label="Projects for building the framework">
 		<NUnitProjects Include="$(FrameworkSrcDir)\framework\nunit.framework-$(ProjectSuffix).csproj"></NUnitProjects>
-		<NUnitProjects Include="$(FrameworkSrcDir)\nunitlite.runner\nunitlite.runner-$(ProjectSuffix).csproj"></NUnitProjects>
+		<NUnitProjects Include="$(FrameworkSrcDir)\nunitlite.runner\nunitlite.runner-$(ProjectSuffix).csproj"
+			Condition="'$(Runtime)' != 'portable'"></NUnitProjects>
 		<NUnitProjects Include="$(FrameworkSrcDir)\mock-assembly\mock-nunit-assembly-$(ProjectSuffix).csproj"
-						Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight' And '$(Runtime)' != 'portable'"></NUnitProjects>
+			Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight' And '$(Runtime)' != 'portable'"></NUnitProjects>
 		<NUnitProjects Include="$(FrameworkSrcDir)\testdata\nunit.testdata-$(ProjectSuffix).csproj"></NUnitProjects>
 		<NUnitProjects Include="$(FrameworkSrcDir)\slow-tests\slow-nunit-tests-$(ProjectSuffix).csproj"
-						Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight' And '$(Runtime)' != 'portable'"></NUnitProjects>
+			Condition="'$(Runtime)' != 'netcf' And '$(Runtime)' != 'silverlight' And '$(Runtime)' != 'portable'"></NUnitProjects>
 		<NUnitProjects Include="$(FrameworkSrcDir)\tests\nunit.framework.tests-$(ProjectSuffix).csproj"
-						Condition="'$(Runtime)' != 'portable'"></NUnitProjects>
+			Condition="'$(Runtime)' != 'portable'"></NUnitProjects>
 	</ItemGroup>
 
 	<ItemGroup Label="Projects for building the engine">

diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec
@@ -28,5 +28,9 @@
     <file src="$builddir$\nunit.engine.api.dll" target="tools" />
     <file src="$builddir$\nunit.engine.api.xml" target="tools" />
     <file src="$builddir$\nunit.engine.dll" target="tools" />
+    <file src="$builddir$\v2-driver\nunit.v2.driver.dll" target="tools\v2-driver" />
+    <file src="$builddir$\v2-driver\nunit.engine.api.dll" target="tools\v2-driver" />
+    <file src="$builddir$\v2-driver\nunit.core.dll" target="tools\v2-driver" />
+    <file src="$builddir$\v2-driver\nunit.core.interfaces.dll" target="tools\v2-driver" />
   </files>
 </package>
diff --git a/nuget/nunitlite.nuspec b/nuget/nunitlite.nuspec
@@ -37,7 +37,6 @@
     <file src="$builddir$\net-4.0\nunitlite.dll" target="lib\net40" />
     <file src="$builddir$\net-4.5\nunitlite.dll" target="lib\net45" />
     <file src="$builddir$\sl-5.0\nunitlite.dll" target="lib\sl5" />
-    <file src="$builddir$\portable\nunitlite.dll" target="lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" />
     <file src="nuget\Program.cs" target="content" />
   </files>
 </package>