Skip to content

Commit

Permalink
Added xml documentation (#42)
Browse files Browse the repository at this point in the history 
* added xml documentation

* Updated NUnit runner
  • Loading branch information
@alexvaluyskiy @marcpiechura
alexvaluyskiy authored and marcpiechura committed Aug 8, 2017
1 parent 237c517 commit f1a95c6
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 46 deletions.
18 changes: 10 additions & 8 deletions build.fsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,17 @@ Target "Build" (fun _ ->
)

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

NUnit3
(fun p ->
{ p with
WorkingDir = outputTests;
TeamCity = true;})
(nunitAssemblies)
let runSingleProject project =
DotNetCli.Test
(fun p ->
{ p with
Project = project
Configuration = configuration })

projects |> Seq.iter (runSingleProject)
)

//--------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ Param(
[string[]]$ScriptArgs
)

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

# Make sure tools folder exists
Expand Down
6 changes: 3 additions & 3 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
TOOLS_DIR=$SCRIPT_DIR/tools
NUGET_EXE=$TOOLS_DIR/nuget.exe
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
FAKE_VERSION=4.50.0
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe
FAKE_VERSION=4.57.4
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
DOTNET_VERSION=1.0.0-rc4-004771
DOTNET_VERSION=1.0.0
DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh

# Define default arguments.
Expand Down
8 changes: 2 additions & 6 deletions src/api/Reactive.Streams/Reactive.Streams.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@
<AssemblyName>Reactive.Streams</AssemblyName>
<Description>Reactive Streams API</Description>
<Copyright>CC0 1.0 Universal</Copyright>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionPrefix>1.0.3</VersionPrefix>
<Authors>Reactive Streams</Authors>
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
<PackageTags>reactive;stream</PackageTags>
<PackageProjectUrl>https://github.com/reactive-streams/reactive-streams-dotnet</PackageProjectUrl>
<PackageLicenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</PackageLicenseUrl>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
Expand Down
9 changes: 2 additions & 7 deletions ...ples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="NUnit" Version="3.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
6 changes: 1 addition & 5 deletions src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<AssemblyName>Reactive.Streams.Example.Unicast</AssemblyName>
<TargetFrameworks>netstandard1.4;net45</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,11 +14,6 @@
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
Expand Down
9 changes: 2 additions & 7 deletions src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="NUnit" Version="3.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
9 changes: 4 additions & 5 deletions src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@
<AssemblyName>Reactive.Streams.TCK</AssemblyName>
<Description>Reactive Streams Technology Compatibility Kit</Description>
<Copyright>CC0 1.0 Universal</Copyright>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionPrefix>1.0.3</VersionPrefix>
<Authors>Reactive Streams</Authors>
<TargetFrameworks>net45</TargetFrameworks>
<PackageTags>reactive;stream</PackageTags>
<PackageProjectUrl>https://github.com/reactive-streams/reactive-streams-dotnet</PackageProjectUrl>
<PackageLicenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</PackageLicenseUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\api\Reactive.Streams\Reactive.Streams.csproj" />
<ProjectReference Include="..\..\examples\Reactive.Streams.Example.Unicast\Reactive.Streams.Example.Unicast.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="NUnit" Version="3.6.1" />
<ItemGroup>
<PackageReference Include="NUnit" Version="3.7.1" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
6 changes: 4 additions & 2 deletions src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Reactive.Streams.TCK</id>
<version>1.0.0</version>
<version>1.0.3</version>
<authors>Reactive Streams</authors>
<owners>Reactive Streams</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -13,13 +13,15 @@
<tags>reactive stream</tags>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="Reactive.Streams" version="1.0.0" />
<dependency id="Reactive.Streams" version="1.0.3" />
<dependency id="NUnit" version="3.6.1" />
</group>
</dependencies>
</metadata>
<files>
<file src="bin\Release\net45\Reactive.Streams.Example.Unicast.dll" target="lib\net45" />
<file src="bin\Release\net45\Reactive.Streams.Example.Unicast.xml" target="lib\net45" />
<file src="bin\Release\net45\Reactive.Streams.TCK.dll" target="lib\net45" />
<file src="bin\Release\net45\Reactive.Streams.TCK.xml" target="lib\net45" />
</files>
</package>

4 comments on commit f1a95c6

@Petabridge-CI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Reactive.Streams :: Pull Requests (Windows) Build 80 is now running

@Petabridge-CI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Reactive.Streams :: Pull Requests (Windows) Build 80 outcome was FAILURE
Summary: System.Exception: Test failed on "test" "D:\work\662557eb2b3cf1d0\src\examples\Reactive.Streams.Example.Unicast.Tests\Reactive.Streams.Example.Unicast.Tests.csproj" --configuration Release at [email protected](String message) in C:... Build time: 00:03:23

@Petabridge-CI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Reactive.Streams :: Pull Requests (Windows) Build 81 is now running

@Petabridge-CI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Reactive.Streams :: Pull Requests (Windows) Build 81 outcome was FAILURE
Summary: System.Exception: Test failed on "test" "D:\work\662557eb2b3cf1d0\src\examples\Reactive.Streams.Example.Unicast.Tests\Reactive.Streams.Example.Unicast.Tests.csproj" --configuration Release at [email protected](String message) in C:... Build time: 00:03:00

Please sign in to comment.