← Back to team overview

nunit-core team mailing list archive

[Merge] lp:~saidout/nunit-3.0/Refactoring-ResultState into lp:nunit-3.0

 

Said Outgajjouft has proposed merging lp:~saidout/nunit-3.0/Refactoring-ResultState into lp:nunit-3.0.

Requested reviews:
  NUnit Core Developers (nunit-core)

For more details, see:
https://code.launchpad.net/~saidout/nunit-3.0/Refactoring-ResultState/+merge/48630
-- 
https://code.launchpad.net/~saidout/nunit-3.0/Refactoring-ResultState/+merge/48630
Your team NUnit Core Developers is requested to review the proposed merge of lp:~saidout/nunit-3.0/Refactoring-ResultState into lp:nunit-3.0.
=== modified file 'solutions/vs2010/nunit.framework.tests/nunit.framework.tests.csproj'
--- solutions/vs2010/nunit.framework.tests/nunit.framework.tests.csproj	2010-08-17 19:05:05 +0000
+++ solutions/vs2010/nunit.framework.tests/nunit.framework.tests.csproj	2011-02-04 17:16:14 +0000
@@ -1,457 +1,460 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F74B8EB0-2FCC-4A78-9D50-FDC794CC0B38}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NUnit.Framework.Tests</RootNamespace>
-    <AssemblyName>nunit.framework.tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CLR_4_0;NET_4_0;CS_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;CLR_4_0;NET_4_0;CS_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\src\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\AlwaysEqualComparer.cs">
-      <Link>AlwaysEqualComparer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\ArrayEqualsFailureMessageFixture.cs">
-      <Link>Assertions\ArrayEqualsFailureMessageFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\ArrayEqualsFixture.cs">
-      <Link>Assertions\ArrayEqualsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\ArrayNotEqualFixture.cs">
-      <Link>Assertions\ArrayNotEqualFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssertFailTests.cs">
-      <Link>Assertions\AssertFailTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssertIgnoreTests.cs">
-      <Link>Assertions\AssertIgnoreTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssertInconclusiveTests.cs">
-      <Link>Assertions\AssertInconclusiveTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssertPassTests.cs">
-      <Link>Assertions\AssertPassTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssertThrowsTests.cs">
-      <Link>Assertions\AssertThrowsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\AssumeThatTests.cs">
-      <Link>Assertions\AssumeThatTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\CollectionAssertTest.cs">
-      <Link>Assertions\CollectionAssertTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\ConditionAssertTests.cs">
-      <Link>Assertions\ConditionAssertTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\EqualsFixture.cs">
-      <Link>Assertions\EqualsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\FileAssertTests.cs">
-      <Link>Assertions\FileAssertTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\GreaterEqualFixture.cs">
-      <Link>Assertions\GreaterEqualFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\GreaterFixture.cs">
-      <Link>Assertions\GreaterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\LessEqualFixture.cs">
-      <Link>Assertions\LessEqualFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\LessFixture.cs">
-      <Link>Assertions\LessFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\ListContentsTests.cs">
-      <Link>Assertions\ListContentsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\MessageChecker.cs">
-      <Link>Assertions\MessageChecker.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\NotEqualFixture.cs">
-      <Link>Assertions\NotEqualFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\NotSameFixture.cs">
-      <Link>Assertions\NotSameFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\NullableTypesTests.cs">
-      <Link>Assertions\NullableTypesTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\RangeTests.cs">
-      <Link>Assertions\RangeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\SameFixture.cs">
-      <Link>Assertions\SameFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\StringAssertTests.cs">
-      <Link>Assertions\StringAssertTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Assertions\TypeAssertTest.cs">
-      <Link>Assertions\TypeAssertTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\ApplyToTestTests.cs">
-      <Link>Attributes\ApplyToTestTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\AttributeInheritanceTests.cs">
-      <Link>Attributes\AttributeInheritanceTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\CategoryAttributeTests.cs">
-      <Link>Attributes\CategoryAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\CombinatorialTests.cs">
-      <Link>Attributes\CombinatorialTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\DatapointTests.cs">
-      <Link>Attributes\DatapointTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\ExpectedExceptionTests.cs">
-      <Link>Attributes\ExpectedExceptionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\FixtureSetUpTearDownTests.cs">
-      <Link>Attributes\FixtureSetUpTearDownTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\MaxTimeTests.cs">
-      <Link>Attributes\MaxTimeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\PairwiseTests.cs">
-      <Link>Attributes\PairwiseTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\ParameterizedTestFixtureTests.cs">
-      <Link>Attributes\ParameterizedTestFixtureTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\PropertyAttributeTests.cs">
-      <Link>Attributes\PropertyAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\RepeatedTestTests.cs">
-      <Link>Attributes\RepeatedTestTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\SetCultureAttributeTests.cs">
-      <Link>Attributes\SetCultureAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\TestCaseAttributeTests.cs">
-      <Link>Attributes\TestCaseAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\TestCaseSourceTests.cs">
-      <Link>Attributes\TestCaseSourceTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\TestDummy.cs">
-      <Link>Attributes\TestDummy.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\TestFixtureAttributeTests.cs">
-      <Link>Attributes\TestFixtureAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\TheoryTests.cs">
-      <Link>Attributes\TheoryTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\ThreadingTests.cs">
-      <Link>Attributes\ThreadingTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Attributes\ValuesAttributeTests.cs">
-      <Link>Attributes\ValuesAttributeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\CollectionAdapter.cs">
-      <Link>CollectionAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\AfterConstraintTests.cs">
-      <Link>Constraints\AfterConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\AndTest.cs">
-      <Link>Constraints\AndTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\BasicConstraintTests.cs">
-      <Link>Constraints\BasicConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\BinarySerializableTest.cs">
-      <Link>Constraints\BinarySerializableTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\CollectionConstraintTests.cs">
-      <Link>Constraints\CollectionConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ComparerTests.cs">
-      <Link>Constraints\ComparerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ComparisonConstraintTests.cs">
-      <Link>Constraints\ComparisonConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ConstraintTestBase.cs">
-      <Link>Constraints\ConstraintTestBase.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\EmptyConstraintTest.cs">
-      <Link>Constraints\EmptyConstraintTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\EqualTest.cs">
-      <Link>Constraints\EqualTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\FloatingPointNumericsTest.cs">
-      <Link>Constraints\FloatingPointNumericsTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\MsgUtilTests.cs">
-      <Link>Constraints\MsgUtilTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\NotTest.cs">
-      <Link>Constraints\NotTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\NumericsTest.cs">
-      <Link>Constraints\NumericsTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\OrTest.cs">
-      <Link>Constraints\OrTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\PathConstraintTests.cs">
-      <Link>Constraints\PathConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\PropertyTests.cs">
-      <Link>Constraints\PropertyTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ReusableConstraintTests.cs">
-      <Link>Constraints\ReusableConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\SameAsTest.cs">
-      <Link>Constraints\SameAsTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\StringConstraintTests.cs">
-      <Link>Constraints\StringConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ThrowsConstraintTests.cs">
-      <Link>Constraints\ThrowsConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\ToStringTests.cs">
-      <Link>Constraints\ToStringTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\TypeConstraintTests.cs">
-      <Link>Constraints\TypeConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Constraints\XmlSerializableTest.cs">
-      <Link>Constraints\XmlSerializableTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\AssemblyReaderTests.cs">
-      <Link>Internal\AssemblyReaderTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\CoreExtensionsTests.cs">
-      <Link>Internal\CoreExtensionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\CultureSettingAndDetectionTests.cs">
-      <Link>Internal\CultureSettingAndDetectionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\DirectorySwapperTests.cs">
-      <Link>Internal\DirectorySwapperTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\EventQueueTests.cs">
-      <Link>Internal\EventQueueTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\PlatformDetectionTests.cs">
-      <Link>Internal\PlatformDetectionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\PropertyBagTests.cs">
-      <Link>Internal\PropertyBagTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\RandomizerTests.cs">
-      <Link>Internal\RandomizerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\RuntimeFrameworkTests.cs">
-      <Link>Internal\RuntimeFrameworkTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\TestExecutionContextTests.cs">
-      <Link>Internal\TestExecutionContextTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\TestResultTests.cs">
-      <Link>Internal\TestResultTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\TestXmlTests.cs">
-      <Link>Internal\TestXmlTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\TextMessageWriterTests.cs">
-      <Link>Internal\TextMessageWriterTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Internal\UnhandledExceptionTests.cs">
-      <Link>Internal\UnhandledExceptionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\CallContextTests.cs">
-      <Link>NUnit\Core\CallContextTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\DescriptionTests.cs">
-      <Link>NUnit\Core\DescriptionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\DeduceTypeArgsFromArgs.cs">
-      <Link>NUnit\Core\Generic\DeduceTypeArgsFromArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\GenericTestFixtureTests.cs">
-      <Link>NUnit\Core\Generic\GenericTestFixtureTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\GenericTestMethodTests.cs">
-      <Link>NUnit\Core\Generic\GenericTestMethodTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\SimpleGenericFixture.cs">
-      <Link>NUnit\Core\Generic\SimpleGenericFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\SimpleGenericMethods.cs">
-      <Link>NUnit\Core\Generic\SimpleGenericMethods.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\TypeParameterUsedWithTestMethod.cs">
-      <Link>NUnit\Core\Generic\TypeParameterUsedWithTestMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\LegacySuiteTests.cs">
-      <Link>NUnit\Core\LegacySuiteTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\SetUpTest.cs">
-      <Link>NUnit\Core\SetUpTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\TestFixtureBuilderTests.cs">
-      <Link>NUnit\Core\TestFixtureBuilderTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\TestFixtureTests.cs">
-      <Link>NUnit\Core\TestFixtureTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\TestMethodSignatureTests.cs">
-      <Link>NUnit\Core\TestMethodSignatureTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\NUnit\Core\UnexpectedExceptionTests.cs">
-      <Link>NUnit\Core\UnexpectedExceptionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\AfterTests.cs">
-      <Link>Syntax\AfterTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\ArbitraryConstraintMatching.cs">
-      <Link>Syntax\ArbitraryConstraintMatching.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\CollectionTests.cs">
-      <Link>Syntax\CollectionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\ComparisonTests.cs">
-      <Link>Syntax\ComparisonTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\EqualityTests.cs">
-      <Link>Syntax\EqualityTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\InvalidCodeTests.cs">
-      <Link>Syntax\InvalidCodeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\OperatorOverrides.cs">
-      <Link>Syntax\OperatorOverrides.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\OperatorTests.cs">
-      <Link>Syntax\OperatorTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\PathConstraintTests.cs">
-      <Link>Syntax\PathConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\PropertyTests.cs">
-      <Link>Syntax\PropertyTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\SerializableConstraints.cs">
-      <Link>Syntax\SerializableConstraints.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\SimpleConstraints.cs">
-      <Link>Syntax\SimpleConstraints.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\StringConstraints.cs">
-      <Link>Syntax\StringConstraints.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\SyntaxTest.cs">
-      <Link>Syntax\SyntaxTest.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\TestCompiler.cs">
-      <Link>Syntax\TestCompiler.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\ThrowsTests.cs">
-      <Link>Syntax\ThrowsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\Syntax\TypeConstraints.cs">
-      <Link>Syntax\TypeConstraints.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestComparer.cs">
-      <Link>TestComparer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestContextTests.cs">
-      <Link>TestContextTests.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestDelegates.cs">
-      <Link>TestDelegates.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestUtilities\ResultSummary.cs">
-      <Link>TestUtilities\ResultSummary.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestUtilities\TestAssert.cs">
-      <Link>TestUtilities\TestAssert.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestUtilities\TestBuilder.cs">
-      <Link>TestUtilities\TestBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\src\tests\TestUtilities\TestFinder.cs">
-      <Link>TestUtilities\TestFinder.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj">
-      <Project>{F55F0FC4-E9B8-4D3C-B499-2FBB1E7C1D09}</Project>
-      <Name>nunit.framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\test-assembly\test-assembly.csproj">
-      <Project>{3A0FAD44-A336-43D4-90D9-A5206EB6F02E}</Project>
-      <Name>test-assembly</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\..\src\tests\TestImage1.jpg">
-      <Link>TestImage1.jpg</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\..\..\src\tests\TestImage2.jpg">
-      <Link>TestImage2.jpg</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\..\src\tests\TestText1.txt">
-      <Link>TestText1.txt</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\..\..\src\tests\TestText2.txt">
-      <Link>TestText2.txt</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F74B8EB0-2FCC-4A78-9D50-FDC794CC0B38}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NUnit.Framework.Tests</RootNamespace>
+    <AssemblyName>nunit.framework.tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CLR_4_0;NET_4_0;CS_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE;CLR_4_0;NET_4_0;CS_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\src\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\AlwaysEqualComparer.cs">
+      <Link>AlwaysEqualComparer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Api\ResultStateTests.cs">
+      <Link>Api\ResultStateTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\ArrayEqualsFailureMessageFixture.cs">
+      <Link>Assertions\ArrayEqualsFailureMessageFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\ArrayEqualsFixture.cs">
+      <Link>Assertions\ArrayEqualsFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\ArrayNotEqualFixture.cs">
+      <Link>Assertions\ArrayNotEqualFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssertFailTests.cs">
+      <Link>Assertions\AssertFailTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssertIgnoreTests.cs">
+      <Link>Assertions\AssertIgnoreTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssertInconclusiveTests.cs">
+      <Link>Assertions\AssertInconclusiveTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssertPassTests.cs">
+      <Link>Assertions\AssertPassTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssertThrowsTests.cs">
+      <Link>Assertions\AssertThrowsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\AssumeThatTests.cs">
+      <Link>Assertions\AssumeThatTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\CollectionAssertTest.cs">
+      <Link>Assertions\CollectionAssertTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\ConditionAssertTests.cs">
+      <Link>Assertions\ConditionAssertTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\EqualsFixture.cs">
+      <Link>Assertions\EqualsFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\FileAssertTests.cs">
+      <Link>Assertions\FileAssertTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\GreaterEqualFixture.cs">
+      <Link>Assertions\GreaterEqualFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\GreaterFixture.cs">
+      <Link>Assertions\GreaterFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\LessEqualFixture.cs">
+      <Link>Assertions\LessEqualFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\LessFixture.cs">
+      <Link>Assertions\LessFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\ListContentsTests.cs">
+      <Link>Assertions\ListContentsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\MessageChecker.cs">
+      <Link>Assertions\MessageChecker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\NotEqualFixture.cs">
+      <Link>Assertions\NotEqualFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\NotSameFixture.cs">
+      <Link>Assertions\NotSameFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\NullableTypesTests.cs">
+      <Link>Assertions\NullableTypesTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\RangeTests.cs">
+      <Link>Assertions\RangeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\SameFixture.cs">
+      <Link>Assertions\SameFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\StringAssertTests.cs">
+      <Link>Assertions\StringAssertTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Assertions\TypeAssertTest.cs">
+      <Link>Assertions\TypeAssertTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\ApplyToTestTests.cs">
+      <Link>Attributes\ApplyToTestTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\AttributeInheritanceTests.cs">
+      <Link>Attributes\AttributeInheritanceTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\CategoryAttributeTests.cs">
+      <Link>Attributes\CategoryAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\CombinatorialTests.cs">
+      <Link>Attributes\CombinatorialTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\DatapointTests.cs">
+      <Link>Attributes\DatapointTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\ExpectedExceptionTests.cs">
+      <Link>Attributes\ExpectedExceptionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\FixtureSetUpTearDownTests.cs">
+      <Link>Attributes\FixtureSetUpTearDownTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\MaxTimeTests.cs">
+      <Link>Attributes\MaxTimeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\PairwiseTests.cs">
+      <Link>Attributes\PairwiseTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\ParameterizedTestFixtureTests.cs">
+      <Link>Attributes\ParameterizedTestFixtureTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\PropertyAttributeTests.cs">
+      <Link>Attributes\PropertyAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\RepeatedTestTests.cs">
+      <Link>Attributes\RepeatedTestTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\SetCultureAttributeTests.cs">
+      <Link>Attributes\SetCultureAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\TestCaseAttributeTests.cs">
+      <Link>Attributes\TestCaseAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\TestCaseSourceTests.cs">
+      <Link>Attributes\TestCaseSourceTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\TestDummy.cs">
+      <Link>Attributes\TestDummy.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\TestFixtureAttributeTests.cs">
+      <Link>Attributes\TestFixtureAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\TheoryTests.cs">
+      <Link>Attributes\TheoryTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\ThreadingTests.cs">
+      <Link>Attributes\ThreadingTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Attributes\ValuesAttributeTests.cs">
+      <Link>Attributes\ValuesAttributeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\CollectionAdapter.cs">
+      <Link>CollectionAdapter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\AfterConstraintTests.cs">
+      <Link>Constraints\AfterConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\AndTest.cs">
+      <Link>Constraints\AndTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\BasicConstraintTests.cs">
+      <Link>Constraints\BasicConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\BinarySerializableTest.cs">
+      <Link>Constraints\BinarySerializableTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\CollectionConstraintTests.cs">
+      <Link>Constraints\CollectionConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ComparerTests.cs">
+      <Link>Constraints\ComparerTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ComparisonConstraintTests.cs">
+      <Link>Constraints\ComparisonConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ConstraintTestBase.cs">
+      <Link>Constraints\ConstraintTestBase.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\EmptyConstraintTest.cs">
+      <Link>Constraints\EmptyConstraintTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\EqualTest.cs">
+      <Link>Constraints\EqualTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\FloatingPointNumericsTest.cs">
+      <Link>Constraints\FloatingPointNumericsTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\MsgUtilTests.cs">
+      <Link>Constraints\MsgUtilTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\NotTest.cs">
+      <Link>Constraints\NotTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\NumericsTest.cs">
+      <Link>Constraints\NumericsTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\OrTest.cs">
+      <Link>Constraints\OrTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\PathConstraintTests.cs">
+      <Link>Constraints\PathConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\PropertyTests.cs">
+      <Link>Constraints\PropertyTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ReusableConstraintTests.cs">
+      <Link>Constraints\ReusableConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\SameAsTest.cs">
+      <Link>Constraints\SameAsTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\StringConstraintTests.cs">
+      <Link>Constraints\StringConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ThrowsConstraintTests.cs">
+      <Link>Constraints\ThrowsConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\ToStringTests.cs">
+      <Link>Constraints\ToStringTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\TypeConstraintTests.cs">
+      <Link>Constraints\TypeConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Constraints\XmlSerializableTest.cs">
+      <Link>Constraints\XmlSerializableTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\AssemblyReaderTests.cs">
+      <Link>Internal\AssemblyReaderTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\CoreExtensionsTests.cs">
+      <Link>Internal\CoreExtensionsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\CultureSettingAndDetectionTests.cs">
+      <Link>Internal\CultureSettingAndDetectionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\DirectorySwapperTests.cs">
+      <Link>Internal\DirectorySwapperTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\EventQueueTests.cs">
+      <Link>Internal\EventQueueTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\PlatformDetectionTests.cs">
+      <Link>Internal\PlatformDetectionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\PropertyBagTests.cs">
+      <Link>Internal\PropertyBagTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\RandomizerTests.cs">
+      <Link>Internal\RandomizerTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\RuntimeFrameworkTests.cs">
+      <Link>Internal\RuntimeFrameworkTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\TestExecutionContextTests.cs">
+      <Link>Internal\TestExecutionContextTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\TestResultTests.cs">
+      <Link>Internal\TestResultTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\TestXmlTests.cs">
+      <Link>Internal\TestXmlTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\TextMessageWriterTests.cs">
+      <Link>Internal\TextMessageWriterTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Internal\UnhandledExceptionTests.cs">
+      <Link>Internal\UnhandledExceptionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\CallContextTests.cs">
+      <Link>NUnit\Core\CallContextTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\DescriptionTests.cs">
+      <Link>NUnit\Core\DescriptionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\DeduceTypeArgsFromArgs.cs">
+      <Link>NUnit\Core\Generic\DeduceTypeArgsFromArgs.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\GenericTestFixtureTests.cs">
+      <Link>NUnit\Core\Generic\GenericTestFixtureTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\GenericTestMethodTests.cs">
+      <Link>NUnit\Core\Generic\GenericTestMethodTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\SimpleGenericFixture.cs">
+      <Link>NUnit\Core\Generic\SimpleGenericFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\SimpleGenericMethods.cs">
+      <Link>NUnit\Core\Generic\SimpleGenericMethods.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\Generic\TypeParameterUsedWithTestMethod.cs">
+      <Link>NUnit\Core\Generic\TypeParameterUsedWithTestMethod.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\LegacySuiteTests.cs">
+      <Link>NUnit\Core\LegacySuiteTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\SetUpTest.cs">
+      <Link>NUnit\Core\SetUpTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\TestFixtureBuilderTests.cs">
+      <Link>NUnit\Core\TestFixtureBuilderTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\TestFixtureTests.cs">
+      <Link>NUnit\Core\TestFixtureTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\TestMethodSignatureTests.cs">
+      <Link>NUnit\Core\TestMethodSignatureTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\NUnit\Core\UnexpectedExceptionTests.cs">
+      <Link>NUnit\Core\UnexpectedExceptionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\AfterTests.cs">
+      <Link>Syntax\AfterTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\ArbitraryConstraintMatching.cs">
+      <Link>Syntax\ArbitraryConstraintMatching.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\CollectionTests.cs">
+      <Link>Syntax\CollectionTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\ComparisonTests.cs">
+      <Link>Syntax\ComparisonTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\EqualityTests.cs">
+      <Link>Syntax\EqualityTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\InvalidCodeTests.cs">
+      <Link>Syntax\InvalidCodeTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\OperatorOverrides.cs">
+      <Link>Syntax\OperatorOverrides.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\OperatorTests.cs">
+      <Link>Syntax\OperatorTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\PathConstraintTests.cs">
+      <Link>Syntax\PathConstraintTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\PropertyTests.cs">
+      <Link>Syntax\PropertyTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\SerializableConstraints.cs">
+      <Link>Syntax\SerializableConstraints.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\SimpleConstraints.cs">
+      <Link>Syntax\SimpleConstraints.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\StringConstraints.cs">
+      <Link>Syntax\StringConstraints.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\SyntaxTest.cs">
+      <Link>Syntax\SyntaxTest.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\TestCompiler.cs">
+      <Link>Syntax\TestCompiler.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\ThrowsTests.cs">
+      <Link>Syntax\ThrowsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\Syntax\TypeConstraints.cs">
+      <Link>Syntax\TypeConstraints.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestComparer.cs">
+      <Link>TestComparer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestContextTests.cs">
+      <Link>TestContextTests.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestDelegates.cs">
+      <Link>TestDelegates.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestUtilities\ResultSummary.cs">
+      <Link>TestUtilities\ResultSummary.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestUtilities\TestAssert.cs">
+      <Link>TestUtilities\TestAssert.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestUtilities\TestBuilder.cs">
+      <Link>TestUtilities\TestBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\src\tests\TestUtilities\TestFinder.cs">
+      <Link>TestUtilities\TestFinder.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\nunit.framework\nunit.framework.csproj">
+      <Project>{F55F0FC4-E9B8-4D3C-B499-2FBB1E7C1D09}</Project>
+      <Name>nunit.framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\test-assembly\test-assembly.csproj">
+      <Project>{3A0FAD44-A336-43D4-90D9-A5206EB6F02E}</Project>
+      <Name>test-assembly</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\..\src\tests\TestImage1.jpg">
+      <Link>TestImage1.jpg</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\..\src\tests\TestImage2.jpg">
+      <Link>TestImage2.jpg</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\..\src\tests\TestText1.txt">
+      <Link>TestText1.txt</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\..\src\tests\TestText2.txt">
+      <Link>TestText2.txt</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file

=== modified file 'solutions/vs2010/nunitlite.tests/nunitlite.tests.csproj'
--- solutions/vs2010/nunitlite.tests/nunitlite.tests.csproj	2010-09-19 16:45:44 +0000
+++ solutions/vs2010/nunitlite.tests/nunitlite.tests.csproj	2011-02-04 17:16:14 +0000
@@ -53,6 +53,9 @@
     <Compile Include="..\..\..\src\tests\AlwaysEqualComparer.cs">
       <Link>AlwaysEqualComparer.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\tests\Api\ResultStateTests.cs">
+      <Link>Api\ResultStateTests.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\tests\Assertions\ArrayEqualsFailureMessageFixture.cs">
       <Link>Assertions\ArrayEqualsFailureMessageFixture.cs</Link>
     </Compile>

=== modified file 'src/framework/Api/ResultState.cs'
--- src/framework/Api/ResultState.cs	2010-08-04 21:39:48 +0000
+++ src/framework/Api/ResultState.cs	2011-02-04 17:16:14 +0000
@@ -32,8 +32,8 @@
 	/// </summary>
 	public class ResultState
 	{
-        private TestStatus status;
-        private string label;
+        private readonly TestStatus status;
+        private readonly string label;
 
         #region Constructors
 
@@ -41,10 +41,8 @@
         /// Initializes a new instance of the <see cref="ResultState"/> class.
         /// </summary>
         /// <param name="status">The TestStatus.</param>
-        public ResultState(TestStatus status)
+        public ResultState(TestStatus status) : this (status, string.Empty)
         {
-            this.status = status;
-            this.label = null;
         }
 
         /// <summary>
@@ -55,7 +53,7 @@
         public ResultState(TestStatus status, string label)
         {
             this.status = status;
-            this.label = label;
+            this.label = label ?? string.Empty;
         }
 
         #endregion
@@ -64,43 +62,43 @@
 
         /// <summary>
         /// The result is inconclusive
-        /// </summary>
-        public static ResultState Inconclusive = new ResultState(TestStatus.Inconclusive);
-
+        /// </summary>
+        public readonly static ResultState Inconclusive = new ResultState(TestStatus.Inconclusive);
+        
         /// <summary>
         /// The test was not runnable.
-        /// </summary>
-        public static ResultState NotRunnable = new ResultState(TestStatus.Skipped, "Invalid");
+        /// </summary>
+        public readonly static ResultState NotRunnable = new ResultState(TestStatus.Skipped, "Invalid");
 
         /// <summary>
         /// The test has been skipped. 
-        /// </summary>
-        public static ResultState Skipped = new ResultState(TestStatus.Skipped);
+        /// </summary>
+        public readonly static ResultState Skipped = new ResultState(TestStatus.Skipped);
 
         /// <summary>
         /// The test has been ignored.
-        /// </summary>
-        public static ResultState Ignored = new ResultState(TestStatus.Skipped, "Ignored");
+        /// </summary>
+        public readonly static ResultState Ignored = new ResultState(TestStatus.Skipped, "Ignored");
 
         /// <summary>
         /// The test succeeded
-        /// </summary>
-        public static ResultState Success = new ResultState(TestStatus.Passed);
+        /// </summary>
+        public readonly static ResultState Success = new ResultState(TestStatus.Passed);
 
         /// <summary>
         /// The test failed
-        /// </summary>
-        public static ResultState Failure = new ResultState(TestStatus.Failed);
+        /// </summary>
+        public readonly static ResultState Failure = new ResultState(TestStatus.Failed);
 
         /// <summary>
         /// The test encountered an unexpected exception
-        /// </summary>
-        public static ResultState Error = new ResultState(TestStatus.Failed, "Error");
+        /// </summary>
+        public readonly static ResultState Error = new ResultState(TestStatus.Failed, "Error");
 
         /// <summary>
         /// The test was cancelled by the user
-        /// </summary>
-        public static ResultState Cancelled = new ResultState(TestStatus.Failed, "Cancelled");
+        /// </summary>
+        public readonly static ResultState Cancelled = new ResultState(TestStatus.Failed, "Cancelled");
         
         #endregion
 
@@ -135,9 +133,7 @@
         public override string ToString()
         {
             string s = status.ToString();
-            if (label == null) return s;
-
-            return string.Format("{0}:{1}", s, label);
+            return string.IsNullOrEmpty(label) ? s : string.Format("{0}:{1}", s, label);
         }
     }
 }

=== added file 'src/tests/Api/ResultStateTests.cs'
--- src/tests/Api/ResultStateTests.cs	1970-01-01 00:00:00 +0000
+++ src/tests/Api/ResultStateTests.cs	2011-02-04 17:16:14 +0000
@@ -0,0 +1,176 @@
+// ***********************************************************************
+// Copyright (c) 2011 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 in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+using NUnit.Framework.Api;
+
+namespace NUnit.Framework.Internal
+{
+    [TestFixture]
+    public class ResultStateTests
+    {
+        [TestCase(TestStatus.Failed)]
+        [TestCase(TestStatus.Skipped)]
+        [TestCase(TestStatus.Inconclusive)]
+        [TestCase(TestStatus.Passed)]
+        public void Status_ConstructorWithOneArguments_ReturnsConstructorArgumentStatus(TestStatus status)
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(status);
+
+            Assert.AreEqual(status, resultState.Status);
+        }
+
+        [Test]
+        public void Label_ConstructorWithOneArguments_ReturnsStringEmpty()
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(TestStatus.Failed);
+
+            Assert.AreEqual(string.Empty, resultState.Label);
+        }
+
+        [TestCase(TestStatus.Failed)]
+        [TestCase(TestStatus.Skipped)]
+        [TestCase(TestStatus.Inconclusive)]
+        [TestCase(TestStatus.Passed)]
+        public void Status_ConstructorWithTwoArguments_ReturnsConstructorArgumentStatus(TestStatus status)
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(status, string.Empty);
+
+            Assert.AreEqual(status, resultState.Status);
+        }
+
+        [TestCase("")]
+        [TestCase("label")]        
+        public void Label_ConstructorWithTwoArguments_ReturnsConstructorArgumentLabel(string label)
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(TestStatus.Failed, label);
+
+            Assert.AreEqual(label, resultState.Label);
+        }
+
+        [Test]
+        public void Label_ConstructorWithTwoArgumentsLabelArgumentIsNull_ReturnsEmptyString()
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(TestStatus.Failed, null);
+
+            Assert.AreEqual(string.Empty, resultState.Label);
+        }
+        
+        [TestCase(TestStatus.Skipped, null, "Skipped")]
+        [TestCase(TestStatus.Passed, "", "Passed")]
+        [TestCase(TestStatus.Passed, "testLabel", "Passed:testLabel")]
+        public void ToString_Constructor_ReturnsExepectedString(TestStatus status, string label, string expected)
+        {
+            // Arrange N/A
+
+            ResultState resultState = new ResultState(status, label);
+
+            Assert.AreEqual(expected, resultState.ToString());
+        }
+
+        #region Test Fields
+
+        [Test]
+        public void Inconclusive_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Inconclusive;
+
+            Assert.AreEqual(TestStatus.Inconclusive, resultState.Status, "Status not correct.");
+            Assert.AreEqual(string.Empty, resultState.Label, "Label not correct.");            
+        }
+
+        [Test]
+        public void NotRunnable_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.NotRunnable;
+
+            Assert.AreEqual(TestStatus.Skipped, resultState.Status, "Status not correct.");
+            Assert.AreEqual("Invalid", resultState.Label, "Label not correct.");
+        }
+
+        [Test]
+        public void Skipped_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Skipped;
+
+            Assert.AreEqual(TestStatus.Skipped, resultState.Status, "Status not correct.");
+            Assert.AreEqual(string.Empty, resultState.Label, "Label not correct.");
+        }
+
+        [Test]
+        public void Ignored_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Ignored;
+
+            Assert.AreEqual(TestStatus.Skipped, resultState.Status, "Status not correct.");
+            Assert.AreEqual("Ignored", resultState.Label, "Label not correct.");
+        }
+        
+        [Test]
+        public void Success_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Success;
+
+            Assert.AreEqual(TestStatus.Passed, resultState.Status, "Status not correct.");
+            Assert.AreEqual(string.Empty, resultState.Label, "Label not correct.");
+        }
+
+        [Test]
+        public void Failure_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Failure;
+
+            Assert.AreEqual(TestStatus.Failed, resultState.Status, "Status not correct.");
+            Assert.AreEqual(string.Empty, resultState.Label, "Label not correct.");
+        }
+
+        [Test]
+        public void Error_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Error;
+
+            Assert.AreEqual(TestStatus.Failed, resultState.Status, "Status not correct.");
+            Assert.AreEqual("Error", resultState.Label, "Label not correct.");
+        }
+
+        [Test]
+        public void Cancelled_NA_ReturnsResultStateWithPropertiesCorrectlySet()
+        {
+            ResultState resultState = ResultState.Cancelled;
+
+            Assert.AreEqual(TestStatus.Failed, resultState.Status, "Status not correct.");
+            Assert.AreEqual("Cancelled", resultState.Label, "Label not correct.");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

=== modified file 'src/tests/Internal/TestResultTests.cs'
--- src/tests/Internal/TestResultTests.cs	2010-10-15 22:07:12 +0000
+++ src/tests/Internal/TestResultTests.cs	2011-02-04 17:16:14 +0000
@@ -128,7 +128,7 @@
         {
             Assert.AreEqual(ResultState.Inconclusive, testResult.ResultState);
             Assert.AreEqual(TestStatus.Inconclusive, testResult.ResultState.Status);
-            Assert.Null(testResult.ResultState.Label);
+            Assert.IsEmpty(testResult.ResultState.Label);
             Assert.AreEqual(0.0, testResult.Time);
         }
 
@@ -178,7 +178,7 @@
         {
             Assert.True(testResult.ResultState == ResultState.Success);
             Assert.AreEqual(TestStatus.Passed, testResult.ResultState.Status);
-            Assert.Null(testResult.ResultState.Label);
+            Assert.IsEmpty(testResult.ResultState.Label);
             Assert.AreEqual(0.125, testResult.Time);
         }
 
@@ -187,7 +187,7 @@
         {
             Assert.True(suiteResult.ResultState == ResultState.Success);
             Assert.AreEqual(TestStatus.Passed, suiteResult.ResultState.Status);
-            Assert.Null(suiteResult.ResultState.Label);
+            Assert.IsEmpty(suiteResult.ResultState.Label);
 
             Assert.AreEqual(1, suiteResult.PassCount);
             Assert.AreEqual(0, suiteResult.FailCount);


Follow ups