Skip to content

Commit dc9d332

Browse files
committed
Updated NUnit runner
1 parent 0501e98 commit dc9d332

File tree

4 files changed

+16
-24
lines changed

4 files changed

+16
-24
lines changed

build.fsx

+10-8
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@ Target "Build" (fun _ ->
6262
)
6363

6464
Target "RunTests" (fun _ ->
65-
let nunitAssemblies = !! "./src/tck/Reactive.Streams.TCK.Tests/bin/Release/net45/Reactive.Streams.TCK.Tests.dll"
66-
++ "./src/examples/Reactive.Streams.Example.Unicast.Tests/bin/Release/net45/Reactive.Streams.Example.Unicast.Tests.dll"
65+
let projects = !! "./src/**/Reactive.Streams.Example.Unicast.Tests.csproj"
66+
++ "./src/**/Reactive.Streams.TCK.Tests.csproj"
6767

68-
NUnit3
69-
(fun p ->
70-
{ p with
71-
WorkingDir = outputTests;
72-
TeamCity = true;})
73-
(nunitAssemblies)
68+
let runSingleProject project =
69+
DotNetCli.Test
70+
(fun p ->
71+
{ p with
72+
Project = project
73+
Configuration = configuration })
74+
75+
projects |> Seq.iter (runSingleProject)
7476
)
7577

7678
//--------------------------------------------------------------------------------

src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj

+2-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
16-
<PackageReference Include="NUnit" Version="3.6.1" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
18-
</ItemGroup>
19-
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
21-
<Reference Include="System" />
22-
<Reference Include="Microsoft.CSharp" />
16+
<PackageReference Include="NUnit" Version="3.7.1" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
2318
</ItemGroup>
2419

2520
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj

+2-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
16-
<PackageReference Include="NUnit" Version="3.6.1" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
18-
</ItemGroup>
19-
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
21-
<Reference Include="System" />
22-
<Reference Include="Microsoft.CSharp" />
16+
<PackageReference Include="NUnit" Version="3.7.1" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
2318
</ItemGroup>
2419

2520
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<ProjectReference Include="..\..\examples\Reactive.Streams.Example.Unicast\Reactive.Streams.Example.Unicast.csproj" />
1919
</ItemGroup>
2020

21-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
22-
<PackageReference Include="NUnit" Version="3.6.1" />
21+
<ItemGroup>
22+
<PackageReference Include="NUnit" Version="3.7.1" />
2323
</ItemGroup>
2424

2525
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

0 commit comments

Comments
 (0)