Merge pull request #557 from nunit/release-3.0-beta-1

Release 3.0 beta 1

CHANGES.txt

@@ -1,4 +1,67 @@
-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 Beta 1 - March 25, 2015
+
+General
+
+ * There is now a master windows installer for the framework, engine and console runner.
+
+Framework
+
+ * We no longer create a separate framework build for .NET 3.5. The 2.0 and
+   3.5 builds were essentially the same, so the former should now be used 
+   under both runtimes.
+ * A new Constraint, DictionaryContainsKeyConstraint, may be used to test
+   that a specified key is present in a dictionary.
+ * LevelOfParallelizationAttribute has been renamed to LevelOfParallelismAttribute.
+ * The Silverlight runner now displays output in color and includes any
+   text output created by the tests.
+ * The class and method names of each test are included in the output xml
+   where applicable.
+ * String arguments used in test case names are now truncated to 40 rather
+   than 20 characters.
+
+Engine
+
+ * The engine API has now been finalized. It permits specifying a minimum 
+   version of the engine that a runner is able to use. The best installed 
+   version of the engine will be loaded. Third-party runners may override
+   the selection process by including a copy of the engine in their 
+   installation directory and specifying that it must be used.
+ * The V2 framework driver now uses the event listener and test listener
+   passed to it by the runner. This corrects several outstanding issues
+   caused by events not being received and allows selecting V2 tests to
+   be run from the command-line, in the same way that V3 tests are selected.
+
+Console
+
+ * The console now defaults to not using shadowcopy. There is a new option 
+   --shadowcopy to turn it on if needed.
+
+Issues Resolved
+
+ * 224	Silverlight Support
+ * 318	TestActionAttribute: Retrieving the TestFixture
+ * 428	Add ExpectedExceptionAttribute to C# samples
+ * 440	Automatic selection of Test Engine to use
+ * 450	Create master install that includes the framework, engine and console installs
+ * 477	Assert does not work with ArraySegment
+ * 482	nunit-console has multiple errors related to -framework option
+ * 483	Adds constraint for asserting that a dictionary contains a particular key
+ * 484	Missing file in NUnit.Console nuget package
+ * 485	Can't run v2 tests with nunit-console 3.0
+ * 487	NUnitLite can't load assemblies by their file name
+ * 488	Async setup and teardown still don't work
+ * 497	Framework installer shold register the portable framework
+ * 504	Option --workers:0 is ignored
+ * 508	Travis builds with failure in engine tests show as successful
+ * 509	Under linux, not all mono profiles are listed as available
+ * 512	Drop the .NET 3.5 build
+ * 517	V2 FrameworkDriver does not make use of passed in TestEventListener
+ * 523	Provide an option to disable shadowcopy in NUnit v3
+ * 528	V2 FrameworkDriver does not make use of passed in TestFilter
+ * 530	Color display for Silverlight runner
+ * 531	Display text output from tests in Silverlight runner
+ * 534	Add classname and methodname to test result xml
+ * 541	Console help doesn't indicate defaults
 
 NUnit 3.0.0 Alpha 5 - January 30, 2015
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Charlie Poole
+Copyright (c) 2015 Charlie Poole
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NUnit.proj

@@ -9,7 +9,7 @@
 	<PropertyGroup Label="Common Properties">
 		<ProjectName>$(MSBuildProjectName)</ProjectName>
 		<PackageVersion>3.0.0</PackageVersion>
-		<PackageModifier>-alpha-5b</PackageModifier>
+		<PackageModifier>-beta-1</PackageModifier>
 		<PackageName>$(ProjectName)-$(PackageVersion)$(PackageModifier)</PackageName>
 	</PropertyGroup>
 

install/framework/framework.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" 
-             Name="NUnit Framework !(bind.FileVersion.nunit.framework.45.dll)" 
+             Name="NUnit Framework $(var.DisplayVersion)" 
              Language="1033" 
              Version="!(bind.FileVersion.nunit.framework.45.dll)" 
              Manufacturer="nunit.org"

install/framework/nunit-framework.wixproj

@@ -3,10 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <PackageVersion Condition=" '$(PackageVersion)' == '' ">3.0.0-beta-1</PackageVersion>
     <ProductVersion>3.9</ProductVersion>
     <ProjectGuid>20132190-582e-462e-b18b-4b2cedddb6c4</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>NUnit.Framework</OutputName>
+    <OutputName>NUnit.Framework.$(PackageVersion)</OutputName>
     <OutputType>Package</OutputType>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -15,12 +16,13 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;DisplayVersion=3.0 Beta 1</DefineConstants>
     <WixVariables>Build=$(Configuration)</WixVariables>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>DisplayVersion=3.0</DefineConstants>
     <WixVariables>Build=$(Configuration)</WixVariables>
   </PropertyGroup>
   <ItemGroup>
@@ -58,11 +60,11 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-  <Target Name="BeforeBuild">
+  <!--<Target Name="BeforeBuild">
     <GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\net-4.5\nunit.framework.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
     </GetAssemblyIdentity>
-    <CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
+    <CreateProperty Value="$(OutputName).$([System.Version]::new(%(AssemblyVersions.Version)).ToString(2))-beta-1">
       <Output TaskParameter="Value" PropertyName="TargetName" />
     </CreateProperty>
     <CreateProperty Value="$(TargetName)$(TargetExt)">
@@ -71,5 +73,5 @@
     <CreateProperty Value="$(TargetDir)$(TargetFileName)">
       <Output TaskParameter="Value" PropertyName="TargetPath" />
     </CreateProperty>
-  </Target>
+  </Target>-->
 </Project>

install/master/nunit.wixproj

@@ -3,10 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <PackageVersion Condition=" '$(PackageVersion)' == '' ">3.0.0-beta-1</PackageVersion>
     <ProductVersion>3.9</ProductVersion>
     <ProjectGuid>809C00DC-3FD3-45BF-BC0E-E284F314D306</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>NUnit</OutputName>
+    <OutputName>NUnit.$(PackageVersion)</OutputName>
     <OutputType>Package</OutputType>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -16,7 +17,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;DisplayVersion=3.0 Beta 1</DefineConstants>
     <WixVariables>Build=$(Configuration)</WixVariables>
     <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
@@ -25,6 +26,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>Build=$(Configuration)</WixVariables>
     <SuppressIces>ICE61</SuppressIces>
+    <DefineConstants>DisplayVersion=3.0</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="nunit.wxs" />
@@ -82,11 +84,11 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-  <Target Name="BeforeBuild">
+  <!--<Target Name="BeforeBuild">
     <GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\net-4.5\nunit.framework.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
     </GetAssemblyIdentity>
-    <CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
+    <CreateProperty Value="$(OutputName).$([System.Version]::new(%(AssemblyVersions.Version)).ToString(2))-beta-1">
       <Output TaskParameter="Value" PropertyName="TargetName" />
     </CreateProperty>
     <CreateProperty Value="$(TargetName)$(TargetExt)">
@@ -95,5 +97,5 @@
     <CreateProperty Value="$(TargetDir)$(TargetFileName)">
       <Output TaskParameter="Value" PropertyName="TargetPath" />
     </CreateProperty>
-  </Target>
+  </Target>-->
 </Project>

install/master/nunit.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*"
-             Name="NUnit !(bind.FileVersion.nunit.framework.45.dll)"
+             Name="NUnit $(var.DisplayVersion)"
              Language="1033"
              Version="!(bind.FileVersion.nunit.framework.45.dll)"
              Manufacturer="nunit.org"

install/runners/nunit-runners.wixproj

@@ -3,10 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <PackageVersion Condition=" '$(PackageVersion)' == '' ">3.0.0-beta-1</PackageVersion>
     <ProductVersion>3.9</ProductVersion>
     <ProjectGuid>0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>NUnit.Runners</OutputName>
+    <OutputName>NUnit.Runners.$(PackageVersion)</OutputName>
     <OutputType>Package</OutputType>
     <DefineSolutionProperties>false</DefineSolutionProperties>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -16,7 +17,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;DisplayVersion=3.0 Beta 1</DefineConstants>
     <WixVariables>Build=$(Configuration)</WixVariables>
     <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
@@ -25,6 +26,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>Build=$(Configuration)</WixVariables>
     <SuppressIces>ICE61</SuppressIces>
+    <DefineConstants>DisplayVersion=3.0</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="runners.wxs" />
@@ -63,11 +65,11 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-  <Target Name="BeforeBuild">
+  <!--<Target Name="BeforeBuild">
     <GetAssemblyIdentity AssemblyFiles="..\..\bin\$(Configuration)\nunit.engine.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
     </GetAssemblyIdentity>
-    <CreateProperty Value="$(OutputName).%(AssemblyVersions.Version)">
+    <CreateProperty Value="$(OutputName).$([System.Version]::new(%(AssemblyVersions.Version)).ToString(2))-beta-1">
       <Output TaskParameter="Value" PropertyName="TargetName" />
     </CreateProperty>
     <CreateProperty Value="$(TargetName)$(TargetExt)">
@@ -76,5 +78,5 @@
     <CreateProperty Value="$(TargetDir)$(TargetFileName)">
       <Output TaskParameter="Value" PropertyName="TargetPath" />
     </CreateProperty>
-  </Target>
+  </Target>-->
 </Project>

install/runners/runners.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*"
-             Name="NUnit Runners"
+             Name="NUnit Runners $(var.DisplayVersion)"
              Language="1033"
              Version="!(bind.FileVersion.nunit.engine.dll)"
              Manufacturer="nunit.org"

nunit-install.sln

@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F36D8EB6-8F40-400B-BBA0-98299D6F97B1}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -12,22 +10,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit-framework", "install\framework\nunit-framework.wixproj", "{20132190-582E-462E-B18B-4B2CEDDDB6C4}"
-EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit", "install\master\nunit.wixproj", "{809C00DC-3FD3-45BF-BC0E-E284F314D306}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit-runners", "install\runners\nunit-runners.wixproj", "{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nunit-framework", "install\framework\nunit-framework.wixproj", "{20132190-582E-462E-B18B-4B2CEDDDB6C4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.ActiveCfg = Debug|x86
-		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.Build.0 = Debug|x86
-		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.ActiveCfg = Release|x86
-		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.Build.0 = Release|x86
 		{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x86.ActiveCfg = Debug|x86
 		{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Debug|x86.Build.0 = Debug|x86
 		{809C00DC-3FD3-45BF-BC0E-E284F314D306}.Release|x86.ActiveCfg = Release|x86
@@ -36,6 +30,10 @@ Global
 		{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Debug|x86.Build.0 = Debug|x86
 		{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x86.ActiveCfg = Release|x86
 		{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75}.Release|x86.Build.0 = Release|x86
+		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.ActiveCfg = Debug|x86
+		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Debug|x86.Build.0 = Debug|x86
+		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.ActiveCfg = Release|x86
+		{20132190-582E-462E-B18B-4B2CEDDDB6C4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE