diff options
author | Alan McGovern <alan@xamarin.com> | 2013-07-25 09:34:33 +0400 |
---|---|---|
committer | Alan McGovern <alan@xamarin.com> | 2013-07-25 09:37:30 +0400 |
commit | e9b71b222795cd84c3471cd3f667dc8a907f1bcc (patch) | |
tree | d8c07f75272c2604f3eaa86bc421aa8e2b309a42 | |
parent | b2d7d05a8d90addc10a145856a48d436b1311769 (diff) |
Add both a NET_4_0 and NET_4_5 build of GuiUnit
MonoDevelop needs a NET_4_0 build as that's the runtime we target.
-rw-r--r-- | src/framework/GuiUnit.sln | 10 | ||||
-rw-r--r-- | src/framework/GuiUnit_NET_4_0.csproj | 380 | ||||
-rw-r--r-- | src/framework/GuiUnit_NET_4_5.csproj (renamed from src/framework/GuiUnit.csproj) | 8 | ||||
-rwxr-xr-x | src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs | 17 |
4 files changed, 402 insertions, 13 deletions
diff --git a/src/framework/GuiUnit.sln b/src/framework/GuiUnit.sln index 1701a85..5e7fe7c 100644 --- a/src/framework/GuiUnit.sln +++ b/src/framework/GuiUnit.sln @@ -1,7 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit", "GuiUnit.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_5", "GuiUnit_NET_4_5.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_0", "GuiUnit_NET_4_0.csproj", "{E13A0A7B-4DE6-43ED-A139-41052D065A9B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,8 +15,12 @@ Global {D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E13A0A7B-4DE6-43ED-A139-41052D065A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E13A0A7B-4DE6-43ED-A139-41052D065A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E13A0A7B-4DE6-43ED-A139-41052D065A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E13A0A7B-4DE6-43ED-A139-41052D065A9B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = GuiUnit.csproj
+ StartupItem = GuiUnit_NET_4_5.csproj
EndGlobalSection
EndGlobal
diff --git a/src/framework/GuiUnit_NET_4_0.csproj b/src/framework/GuiUnit_NET_4_0.csproj new file mode 100644 index 0000000..4bb6294 --- /dev/null +++ b/src/framework/GuiUnit_NET_4_0.csproj @@ -0,0 +1,380 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{E13A0A7B-4DE6-43ED-A139-41052D065A9B}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>NUnitLite</RootNamespace>
+ <AssemblyName>GuiUnit.dll</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
+ <IntermediateOutputPath>obj\$(Configuration)\net-4.5\</IntermediateOutputPath>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin\net_4_0\</OutputPath>
+ <DefineConstants>TRACE;DEBUG; CLR_4_0,NUNITLITE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <DocumentationFile>..\..\bin\Debug\net-4.5\nunitlite.xml</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\bin\net_4_0\</OutputPath>
+ <DefineConstants>TRACE;NET_4_5, CLR_4_0,NUNITLITE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <DocumentationFile>..\..\bin\Release\net-4.5\nunitlite.xml</DocumentationFile>
+ <Prefer32Bit>false</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>nunit.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Api\ExpectedExceptionData.cs" />
+ <Compile Include="Api\FailureSite.cs" />
+ <Compile Include="Api\IParameterDataSource.cs" />
+ <Compile Include="Api\IPropertyBag.cs" />
+ <Compile Include="Api\ITest.cs" />
+ <Compile Include="Api\ITestAssemblyBuilder.cs" />
+ <Compile Include="Api\ITestAssemblyRunner.cs" />
+ <Compile Include="Api\ITestCaseData.cs" />
+ <Compile Include="Api\ITestCaseSource.cs" />
+ <Compile Include="Api\ITestFilter.cs" />
+ <Compile Include="Api\ITestListener.cs" />
+ <Compile Include="Api\ITestResult.cs" />
+ <Compile Include="Api\IXmlNodeBuilder.cs" />
+ <Compile Include="Api\PropertyEntry.cs" />
+ <Compile Include="Api\ResultState.cs" />
+ <Compile Include="Api\RunState.cs" />
+ <Compile Include="Api\TestOutput.cs" />
+ <Compile Include="Api\TestStatus.cs" />
+ <Compile Include="Api\XmlNode.cs" />
+ <Compile Include="AssemblyInfo.cs" />
+ <Compile Include="Assert.cs" />
+ <Compile Include="AssertionHelper.cs" />
+ <Compile Include="Assume.cs" />
+ <Compile Include="Attributes\CategoryAttribute.cs" />
+ <Compile Include="Attributes\CombinatorialAttribute.cs" />
+ <Compile Include="Attributes\CultureAttribute.cs" />
+ <Compile Include="Attributes\DataAttribute.cs" />
+ <Compile Include="Attributes\DatapointAttribute.cs" />
+ <Compile Include="Attributes\DatapointsAttribute.cs" />
+ <Compile Include="Attributes\DatapointSourceAttribute.cs" />
+ <Compile Include="Attributes\DescriptionAttribute.cs" />
+ <Compile Include="Attributes\ExpectedExceptionAttribute.cs" />
+ <Compile Include="Attributes\ExplicitAttribute.cs" />
+ <Compile Include="Attributes\IgnoreAttribute.cs" />
+ <Compile Include="Attributes\IncludeExcludeAttribute.cs" />
+ <Compile Include="Attributes\MaxTimeAttribute.cs" />
+ <Compile Include="Attributes\NUnitAttribute.cs" />
+ <Compile Include="Attributes\PairwiseAttribute.cs" />
+ <Compile Include="Attributes\PlatformAttribute.cs" />
+ <Compile Include="Attributes\PropertyAttribute.cs" />
+ <Compile Include="Attributes\RandomAttribute.cs" />
+ <Compile Include="Attributes\RangeAttribute.cs" />
+ <Compile Include="Attributes\RepeatAttribute.cs" />
+ <Compile Include="Attributes\SequentialAttribute.cs" />
+ <Compile Include="Attributes\SetCultureAttribute.cs" />
+ <Compile Include="Attributes\SetUICultureAttribute.cs" />
+ <Compile Include="Attributes\SetUpAttribute.cs" />
+ <Compile Include="Attributes\TearDownAttribute.cs" />
+ <Compile Include="Attributes\TestAttribute.cs" />
+ <Compile Include="Attributes\TestCaseAttribute.cs" />
+ <Compile Include="Attributes\TestCaseSourceAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureSetUpAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureTearDownAttribute.cs" />
+ <Compile Include="Attributes\TheoryAttribute.cs" />
+ <Compile Include="Attributes\TimeoutAttribute.cs" />
+ <Compile Include="Attributes\ValuesAttribute.cs" />
+ <Compile Include="Attributes\ValueSourceAttribute.cs" />
+ <Compile Include="Constraints\AllItemsConstraint.cs" />
+ <Compile Include="Constraints\AndConstraint.cs" />
+ <Compile Include="Constraints\AssignableFromConstraint.cs" />
+ <Compile Include="Constraints\AssignableToConstraint.cs" />
+ <Compile Include="Constraints\AttributeConstraint.cs" />
+ <Compile Include="Constraints\AttributeExistsConstraint.cs" />
+ <Compile Include="Constraints\BasicConstraint.cs" />
+ <Compile Include="Constraints\BinaryConstraint.cs" />
+ <Compile Include="Constraints\BinarySerializableConstraint.cs" />
+ <Compile Include="Constraints\CollectionConstraint.cs" />
+ <Compile Include="Constraints\CollectionContainsConstraint.cs" />
+ <Compile Include="Constraints\CollectionEquivalentConstraint.cs" />
+ <Compile Include="Constraints\CollectionItemsEqualConstraint.cs" />
+ <Compile Include="Constraints\CollectionOrderedConstraint.cs" />
+ <Compile Include="Constraints\CollectionSubsetConstraint.cs" />
+ <Compile Include="Constraints\CollectionTally.cs" />
+ <Compile Include="Constraints\ComparisonAdapter.cs" />
+ <Compile Include="Constraints\ComparisonConstraint.cs" />
+ <Compile Include="Constraints\Constraint.cs" />
+ <Compile Include="Constraints\ConstraintBuilder.cs" />
+ <Compile Include="Constraints\ConstraintExpression.cs" />
+ <Compile Include="Constraints\ConstraintExpressionBase.cs" />
+ <Compile Include="Constraints\ConstraintFactory.cs" />
+ <Compile Include="Constraints\ContainsConstraint.cs" />
+ <Compile Include="Constraints\DelayedConstraint.cs" />
+ <Compile Include="Constraints\EmptyCollectionConstraint.cs" />
+ <Compile Include="Constraints\EmptyConstraint.cs" />
+ <Compile Include="Constraints\EmptyDirectoryConstraint.cs" />
+ <Compile Include="Constraints\EmptyStringConstraint.cs" />
+ <Compile Include="Constraints\EndsWithConstraint.cs" />
+ <Compile Include="Constraints\EqualConstraint.cs" />
+ <Compile Include="Constraints\EqualityAdapter.cs" />
+ <Compile Include="Constraints\ExactCountConstraint.cs" />
+ <Compile Include="Constraints\ExactTypeConstraint.cs" />
+ <Compile Include="Constraints\ExceptionTypeConstraint.cs" />
+ <Compile Include="Constraints\FailurePoint.cs" />
+ <Compile Include="Constraints\FalseConstraint.cs" />
+ <Compile Include="Constraints\FloatingPointNumerics.cs" />
+ <Compile Include="Constraints\GreaterThanConstraint.cs" />
+ <Compile Include="Constraints\GreaterThanOrEqualConstraint.cs" />
+ <Compile Include="Constraints\InstanceOfTypeConstraint.cs" />
+ <Compile Include="Constraints\IResolveConstraint.cs" />
+ <Compile Include="Constraints\LessThanConstraint.cs" />
+ <Compile Include="Constraints\LessThanOrEqualConstraint.cs" />
+ <Compile Include="Constraints\MessageWriter.cs" />
+ <Compile Include="Constraints\MsgUtils.cs" />
+ <Compile Include="Constraints\NaNConstraint.cs" />
+ <Compile Include="Constraints\NoItemConstraint.cs" />
+ <Compile Include="Constraints\NotConstraint.cs" />
+ <Compile Include="Constraints\NullConstraint.cs" />
+ <Compile Include="Constraints\NullOrEmptyStringConstraint.cs" />
+ <Compile Include="Constraints\Numerics.cs" />
+ <Compile Include="Constraints\NUnitComparer.cs" />
+ <Compile Include="Constraints\NUnitEqualityComparer.cs" />
+ <Compile Include="Constraints\Operators\AllOperator.cs" />
+ <Compile Include="Constraints\Operators\AndOperator.cs" />
+ <Compile Include="Constraints\Operators\AttributeOperator.cs" />
+ <Compile Include="Constraints\Operators\BinaryOperator.cs" />
+ <Compile Include="Constraints\Operators\CollectionOperator.cs" />
+ <Compile Include="Constraints\Operators\ConstraintOperator.cs" />
+ <Compile Include="Constraints\Operators\ExactCountOperator.cs" />
+ <Compile Include="Constraints\Operators\NoneOperator.cs" />
+ <Compile Include="Constraints\Operators\NotOperator.cs" />
+ <Compile Include="Constraints\Operators\OrOperator.cs" />
+ <Compile Include="Constraints\Operators\PrefixOperator.cs" />
+ <Compile Include="Constraints\Operators\PropOperator.cs" />
+ <Compile Include="Constraints\Operators\SelfResolvingOperator.cs" />
+ <Compile Include="Constraints\Operators\SomeOperator.cs" />
+ <Compile Include="Constraints\Operators\ThrowsOperator.cs" />
+ <Compile Include="Constraints\Operators\WithOperator.cs" />
+ <Compile Include="Constraints\OrConstraint.cs" />
+ <Compile Include="Constraints\PathConstraint.cs" />
+ <Compile Include="Constraints\PredicateConstraint.cs" />
+ <Compile Include="Constraints\PrefixConstraint.cs" />
+ <Compile Include="Constraints\PropertyConstraint.cs" />
+ <Compile Include="Constraints\PropertyExistsConstraint.cs" />
+ <Compile Include="Constraints\RangeConstraint.cs" />
+ <Compile Include="Constraints\RegexConstraint.cs" />
+ <Compile Include="Constraints\ResolvableConstraintExpression.cs" />
+ <Compile Include="Constraints\ReusableConstraint.cs" />
+ <Compile Include="Constraints\SameAsConstraint.cs" />
+ <Compile Include="Constraints\SamePathConstraint.cs" />
+ <Compile Include="Constraints\SamePathOrUnderConstraint.cs" />
+ <Compile Include="Constraints\SomeItemsConstraint.cs" />
+ <Compile Include="Constraints\StartsWithConstraint.cs" />
+ <Compile Include="Constraints\StringConstraint.cs" />
+ <Compile Include="Constraints\SubPathConstraint.cs" />
+ <Compile Include="Constraints\SubstringConstraint.cs" />
+ <Compile Include="Constraints\ThrowsConstraint.cs" />
+ <Compile Include="Constraints\ThrowsNothingConstraint.cs" />
+ <Compile Include="Constraints\Tolerance.cs" />
+ <Compile Include="Constraints\ToleranceMode.cs" />
+ <Compile Include="Constraints\TrueConstraint.cs" />
+ <Compile Include="Constraints\TypeConstraint.cs" />
+ <Compile Include="Constraints\UniqueItemsConstraint.cs" />
+ <Compile Include="Constraints\XmlSerializableConstraint.cs" />
+ <Compile Include="Contains.cs" />
+ <Compile Include="Env.cs" />
+ <Compile Include="Exceptions\AssertionException.cs" />
+ <Compile Include="Exceptions\IgnoreException.cs" />
+ <Compile Include="Exceptions\InconclusiveException.cs" />
+ <Compile Include="Exceptions\SuccessException.cs" />
+ <Compile Include="Extensibility\IParameterDataProvider.cs" />
+ <Compile Include="Extensibility\ISuiteBuilder.cs" />
+ <Compile Include="Extensibility\ITestCaseBuilder.cs" />
+ <Compile Include="Extensibility\ITestCaseProvider.cs" />
+ <Compile Include="GlobalSettings.cs" />
+ <Compile Include="Guard.cs" />
+ <Compile Include="Has.cs" />
+ <Compile Include="IExpectException.cs" />
+ <Compile Include="Internal\AssemblyHelper.cs" />
+ <Compile Include="Internal\Builders\CombinatorialStrategy.cs" />
+ <Compile Include="Internal\Builders\CombinatorialTestCaseProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Internal\Builders\CombiningStrategy.cs" />
+ <Compile Include="Internal\Builders\DataAttributeTestCaseProvider.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Internal\Builders\DatapointProvider.cs" />
+ <Compile Include="Internal\Builders\NUnitTestCaseBuilder.cs" />
+ <Compile Include="Internal\Builders\NUnitTestFixtureBuilder.cs" />
+ <Compile Include="Internal\Builders\PairwiseStrategy.cs" />
+ <Compile Include="Internal\Builders\ParameterDataProvider.cs" />
+ <Compile Include="Internal\Builders\ProviderCache.cs" />
+ <Compile Include="Internal\Builders\SequentialStrategy.cs" />
+ <Compile Include="Internal\Commands\ApplyChangesToContextCommand.cs" />
+ <Compile Include="Internal\AsyncInvocationRegion.cs" />
+ <Compile Include="Internal\AsyncSynchronizationContext.cs" />
+ <Compile Include="Internal\Commands\CommandDecoratorList.cs" />
+ <Compile Include="Internal\Commands\CommandStage.cs" />
+ <Compile Include="Internal\Commands\DelegatingTestCommand.cs" />
+ <Compile Include="Internal\Commands\ExpectedExceptionCommand.cs" />
+ <Compile Include="Internal\Commands\ICommandDecorator.cs" />
+ <Compile Include="Internal\Commands\MaxTimeCommand.cs" />
+ <Compile Include="Internal\Commands\OneTimeSetUpCommand.cs" />
+ <Compile Include="Internal\Commands\OneTimeTearDownCommand.cs" />
+ <Compile Include="Internal\Commands\RepeatedTestCommand.cs" />
+ <Compile Include="Internal\Commands\SetUpTearDownCommand.cs" />
+ <Compile Include="Internal\Commands\SkipCommand.cs" />
+ <Compile Include="Internal\Commands\TestCommand.cs" />
+ <Compile Include="Internal\Commands\TestMethodCommand.cs" />
+ <Compile Include="Internal\Commands\TheoryResultCommand.cs" />
+ <Compile Include="Internal\CultureDetector.cs" />
+ <Compile Include="Internal\ExceptionHelper.cs" />
+ <Compile Include="Internal\Extensibility\ParameterDataProviders.cs" />
+ <Compile Include="Internal\Extensibility\TestCaseProviders.cs" />
+ <Compile Include="Internal\Filters\AndFilter.cs" />
+ <Compile Include="Internal\Filters\CategoryExpression.cs" />
+ <Compile Include="Internal\Filters\CategoryFilter.cs" />
+ <Compile Include="Internal\Filters\NotFilter.cs" />
+ <Compile Include="Internal\Filters\OrFilter.cs" />
+ <Compile Include="Internal\Filters\SimpleCategoryExpression.cs" />
+ <Compile Include="Internal\Filters\SimpleNameFilter.cs" />
+ <Compile Include="Internal\IApplyToContext.cs" />
+ <Compile Include="Internal\IApplyToTest.cs" />
+ <Compile Include="Internal\InvalidTestFixtureException.cs" />
+ <Compile Include="Internal\MethodHelper.cs" />
+ <Compile Include="Internal\NUnitException.cs" />
+ <Compile Include="Internal\NUnitLiteTestAssemblyBuilder.cs" />
+ <Compile Include="Internal\NUnitLiteTestAssemblyRunner.cs" />
+ <Compile Include="Internal\OSPlatform.cs" />
+ <Compile Include="Internal\ParameterSet.cs" />
+ <Compile Include="Internal\PlatformHelper.cs" />
+ <Compile Include="Internal\PropertyBag.cs" />
+ <Compile Include="Internal\PropertyNames.cs" />
+ <Compile Include="Internal\RandomGenerator.cs" />
+ <Compile Include="Internal\Randomizer.cs" />
+ <Compile Include="Internal\Reflect.cs" />
+ <Compile Include="Internal\Results\TestCaseResult.cs" />
+ <Compile Include="Internal\Results\TestResult.cs" />
+ <Compile Include="Internal\Results\TestSuiteResult.cs" />
+ <Compile Include="Internal\RuntimeFramework.cs" />
+ <Compile Include="Internal\StackFilter.cs" />
+ <Compile Include="Internal\StringUtil.cs" />
+ <Compile Include="Internal\TestExecutionContext.cs" />
+ <Compile Include="Internal\TestFilter.cs" />
+ <Compile Include="Internal\TestFixtureBuilder.cs" />
+ <Compile Include="Internal\TestListener.cs" />
+ <Compile Include="Internal\Tests\ParameterizedFixtureSuite.cs" />
+ <Compile Include="Internal\Tests\ParameterizedMethodSuite.cs" />
+ <Compile Include="Internal\Tests\Test.cs" />
+ <Compile Include="Internal\Tests\TestAssembly.cs" />
+ <Compile Include="Internal\Tests\TestFixture.cs" />
+ <Compile Include="Internal\Tests\TestMethod.cs" />
+ <Compile Include="Internal\Tests\TestSuite.cs" />
+ <Compile Include="Internal\TextMessageWriter.cs" />
+ <Compile Include="Internal\ThreadUtility.cs" />
+ <Compile Include="Internal\TypeHelper.cs" />
+ <Compile Include="Internal\WorkItems\CompositeWorkItem.cs" />
+ <Compile Include="Internal\WorkItems\SimpleWorkItem.cs" />
+ <Compile Include="Internal\WorkItems\WorkItem.cs" />
+ <Compile Include="Internal\WorkItems\WorkItemState.cs" />
+ <Compile Include="Is.cs" />
+ <Compile Include="Iz.cs" />
+ <Compile Include="ListMapper.cs" />
+ <Compile Include="MessageMatch.cs" />
+ <Compile Include="ObjectList.cs" />
+ <Compile Include="Runner\CommandLineOptions.cs" />
+ <Compile Include="Runner\ConsoleWriter.cs" />
+ <Compile Include="Runner\DebugWriter.cs" />
+ <Compile Include="Runner\OutputWriters\NUnit2XmlOutputWriter.cs" />
+ <Compile Include="Runner\OutputWriters\NUnit3XmlOutputWriter.cs" />
+ <Compile Include="Runner\OutputWriters\OutputWriter.cs" />
+ <Compile Include="Runner\ResultReporter.cs" />
+ <Compile Include="Runner\ResultSummary.cs" />
+ <Compile Include="Runner\TcpWriter.cs" />
+ <Compile Include="SpecialValue.cs" />
+ <Compile Include="TestCaseData.cs" />
+ <Compile Include="TestContext.cs" />
+ <Compile Include="Throws.cs" />
+ <Compile Include="GuiUnit\TestRunner.cs" />
+ <Compile Include="GuiUnit\MainLoopCommand.cs" />
+ <Compile Include="GuiUnit\IMainLoopIntegration.cs" />
+ <Compile Include="GuiUnit\XwtMainLoopIntegration.cs" />
+ <Compile Include="GuiUnit\InvokerHelper.cs" />
+ <Compile Include="GuiUnit\MonoMacMainLoopIntegration.cs" />
+ <Compile Include="GuiUnit\XmlTestListener.cs" />
+ <Compile Include="GuiUnit\AdditionalAsserts.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Properties\" />
+ <Folder Include="GuiUnit\" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="nunit.snk" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\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 diff --git a/src/framework/GuiUnit.csproj b/src/framework/GuiUnit_NET_4_5.csproj index 6fd4819..abb54e5 100644 --- a/src/framework/GuiUnit.csproj +++ b/src/framework/GuiUnit_NET_4_5.csproj @@ -15,7 +15,6 @@ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -34,13 +33,14 @@ <TargetFrameworkProfile />
<IntermediateOutputPath>obj\$(Configuration)\net-4.5\</IntermediateOutputPath>
<SignAssembly>true</SignAssembly>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <DefineConstants>TRACE;DEBUG;NET_4_5, CLR_4_0,NUNITLITE</DefineConstants>
+ <OutputPath>..\..\bin\net_4_5</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NET_4_5; CLR_4_0,NUNITLITE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -50,7 +50,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\bin</OutputPath>
+ <OutputPath>..\..\bin\net_4_5</OutputPath>
<DefineConstants>TRACE;NET_4_5, CLR_4_0,NUNITLITE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs b/src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs index 20cffdb..e79d2c7 100755 --- a/src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs +++ b/src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs @@ -288,17 +288,20 @@ namespace NUnit.Framework.Builders private bool CheckSetUpTearDownMethods(TestFixture fixture, MethodInfo[] methods) { - foreach (MethodInfo method in methods) + foreach (MethodInfo method in methods) { if (method.IsAbstract || !method.IsPublic && !method.IsFamily || method.GetParameters().Length > 0 || !method.ReturnType.Equals(typeof(void))) - { - if (!MethodHelper.IsAsyncMethod (method)) - SetNotRunnable(fixture, string.Format("Invalid signature for Setup or TearDown method: {0}", method.Name)); - return false; - } - + { +#if NET_4_5 + if (MethodHelper.IsAsyncMethod (method)) + return true; +#endif + SetNotRunnable(fixture, string.Format("Invalid signature for Setup or TearDown method: {0}", method.Name)); + return false; + } + } return true; } |