Skip to content

Commit f1a95c6

Browse files
alexvaluyskiymarcpiechura
alexvaluyskiy
authored and
marcpiechura
committed
Added xml documentation (#42)
* added xml documentation * Updated NUnit runner
1 parent 237c517 commit f1a95c6

File tree

9 files changed

+31
-46
lines changed

9 files changed

+31
-46
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
//--------------------------------------------------------------------------------

‎build.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ Param(
2929
[string[]]$ScriptArgs
3030
)
3131

32-
$FakeVersion = "4.50.0"
32+
$FakeVersion = "4.57.4"
3333
$NUnitVersion = "3.6.0"
3434
$DotNetChannel = "preview";
35-
$DotNetVersion = "1.0.0-rc4-004771";
35+
$DotNetVersion = "1.0.0";
3636
$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1";
37-
$NugetVersion = "3.5.0";
37+
$NugetVersion = "4.1.0";
3838
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
3939

4040
# Make sure tools folder exists

‎build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
88
TOOLS_DIR=$SCRIPT_DIR/tools
99
NUGET_EXE=$TOOLS_DIR/nuget.exe
10-
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
11-
FAKE_VERSION=4.50.0
10+
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe
11+
FAKE_VERSION=4.57.4
1212
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
13-
DOTNET_VERSION=1.0.0-rc4-004771
13+
DOTNET_VERSION=1.0.0
1414
DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh
1515

1616
# Define default arguments.

‎src/api/Reactive.Streams/Reactive.Streams.csproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@
44
<AssemblyName>Reactive.Streams</AssemblyName>
55
<Description>Reactive Streams API</Description>
66
<Copyright>CC0 1.0 Universal</Copyright>
7-
<VersionPrefix>1.0.0</VersionPrefix>
7+
<VersionPrefix>1.0.3</VersionPrefix>
88
<Authors>Reactive Streams</Authors>
99
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
1010
<PackageTags>reactive;stream</PackageTags>
1111
<PackageProjectUrl>https://github.com/reactive-streams/reactive-streams-dotnet</PackageProjectUrl>
1212
<PackageLicenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</PackageLicenseUrl>
1313
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1415
</PropertyGroup>
1516

16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
17-
<Reference Include="System" />
18-
<Reference Include="Microsoft.CSharp" />
19-
</ItemGroup>
20-
2117
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2218
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2319
</PropertyGroup>

‎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/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>Reactive.Streams.Example.Unicast</AssemblyName>
55
<TargetFrameworks>netstandard1.4;net45</TargetFrameworks>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -13,11 +14,6 @@
1314
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
1415
</ItemGroup>
1516

16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
17-
<Reference Include="System" />
18-
<Reference Include="Microsoft.CSharp" />
19-
</ItemGroup>
20-
2117
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2218
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2319
</PropertyGroup>

‎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

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@
44
<AssemblyName>Reactive.Streams.TCK</AssemblyName>
55
<Description>Reactive Streams Technology Compatibility Kit</Description>
66
<Copyright>CC0 1.0 Universal</Copyright>
7-
<VersionPrefix>1.0.0</VersionPrefix>
7+
<VersionPrefix>1.0.3</VersionPrefix>
88
<Authors>Reactive Streams</Authors>
99
<TargetFrameworks>net45</TargetFrameworks>
1010
<PackageTags>reactive;stream</PackageTags>
1111
<PackageProjectUrl>https://github.com/reactive-streams/reactive-streams-dotnet</PackageProjectUrl>
1212
<PackageLicenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</PackageLicenseUrl>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1314
</PropertyGroup>
1415

1516
<ItemGroup>
1617
<ProjectReference Include="..\..\api\Reactive.Streams\Reactive.Streams.csproj" />
1718
<ProjectReference Include="..\..\examples\Reactive.Streams.Example.Unicast\Reactive.Streams.Example.Unicast.csproj" />
1819
</ItemGroup>
1920

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
21-
<Reference Include="System" />
22-
<Reference Include="Microsoft.CSharp" />
23-
<PackageReference Include="NUnit" Version="3.6.1" />
21+
<ItemGroup>
22+
<PackageReference Include="NUnit" Version="3.7.1" />
2423
</ItemGroup>
2524

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

‎src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Reactive.Streams.TCK</id>
5-
<version>1.0.0</version>
5+
<version>1.0.3</version>
66
<authors>Reactive Streams</authors>
77
<owners>Reactive Streams</owners>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -13,13 +13,15 @@
1313
<tags>reactive stream</tags>
1414
<dependencies>
1515
<group targetFramework=".NETFramework4.5">
16-
<dependency id="Reactive.Streams" version="1.0.0" />
16+
<dependency id="Reactive.Streams" version="1.0.3" />
1717
<dependency id="NUnit" version="3.6.1" />
1818
</group>
1919
</dependencies>
2020
</metadata>
2121
<files>
2222
<file src="bin\Release\net45\Reactive.Streams.Example.Unicast.dll" target="lib\net45" />
23+
<file src="bin\Release\net45\Reactive.Streams.Example.Unicast.xml" target="lib\net45" />
2324
<file src="bin\Release\net45\Reactive.Streams.TCK.dll" target="lib\net45" />
25+
<file src="bin\Release\net45\Reactive.Streams.TCK.xml" target="lib\net45" />
2426
</files>
2527
</package>

0 commit comments

Comments
 (0)