Skip to content

Commit d66d249

Browse files
author
Jake Ginnivan
committed
Added support for teamcity picking up test results
1 parent b52336c commit d66d249

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

ConventionTests.proj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
<BuildPlatform Condition="$(BuildPlatform) == ''">Any CPU</BuildPlatform>
66
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
77
<MSBuildCommunityTasksPath>$(Root)tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
8+
<NUnitHome>$(MSBuildProjectDirectory)\packages\NUnit.Runners.2.6.2\tools\</NUnitHome>
9+
<NUnitConsole>$(NUnitHome)nunit-console.exe</NUnitConsole>
810
</PropertyGroup>
911
<ItemGroup>
10-
<NUnit Include="$(Root)packages\NUnit.Runners.*\tools\nunit-console.exe" />
1112
<NuGet Include="$(Root)packages\NuGet.CommandLine.*\tools\NuGet.exe" />
1213
</ItemGroup>
13-
14+
1415
<Target Name="Cleanup">
1516
<Error Condition="$(Root) == ''" Text="Root variable must be defined" />
16-
<Error Condition="@(NUnit) == ''" Text="Cannot find nUnit runner" />
17+
<Error Condition="$(NUnitConsole) == ''" Text="Cannot find nUnit runner (have you upgraded NUnit.Runners?)" />
1718
<Error Condition="@(NuGet) == ''" Text="Cannot find NuGet command line tool" />
1819

1920
<!-- Diagnostics -->
@@ -36,7 +37,14 @@
3637
</Target>
3738

3839
<Target Name="Test" DependsOnTargets="Build">
39-
<Exec Command="@(NUnit) $(Root)TestStack.ConventionTests.Tests\bin\$(Configuration)\TestStack.ConventionTests.Tests.dll" />
40+
<ItemGroup>
41+
<NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.2.*" />
42+
</ItemGroup>
43+
<!--Copy nUnit teamcity into addins directory if we find addins-->
44+
<MakeDir Directories="$(NUnitHome)addins" />
45+
<Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(NUnitHome)addins" />
46+
47+
<Exec Command="$(NUnitConsole) $(Root)TestStack.ConventionTests.Tests\bin\$(Configuration)\TestStack.ConventionTests.Tests.dll /nologo /noshadow" />
4048
</Target>
4149

4250
<Target Name="Publish">

0 commit comments

Comments
 (0)