diff --git a/build.fsx b/build.fsx
index 1c70c05..80ef71c 100644
--- a/build.fsx
+++ b/build.fsx
@@ -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)
)
//--------------------------------------------------------------------------------
diff --git a/build.ps1 b/build.ps1
index 03aadc6..96be84d 100644
--- a/build.ps1
+++ b/build.ps1
@@ -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
diff --git a/build.sh b/build.sh
index 383a803..93c2009 100644
--- a/build.sh
+++ b/build.sh
@@ -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.
diff --git a/src/api/Reactive.Streams/Reactive.Streams.csproj b/src/api/Reactive.Streams/Reactive.Streams.csproj
index 55a4747..aad21f6 100644
--- a/src/api/Reactive.Streams/Reactive.Streams.csproj
+++ b/src/api/Reactive.Streams/Reactive.Streams.csproj
@@ -4,20 +4,16 @@
Reactive.Streams
Reactive Streams API
CC0 1.0 Universal
- 1.0.0
+ 1.0.3
Reactive Streams
netstandard1.0;net45
reactive;stream
https://github.com/reactive-streams/reactive-streams-dotnet
http://creativecommons.org/publicdomain/zero/1.0/
1.6.0
+ true
-
-
-
-
-
$(DefineConstants);RELEASE
diff --git a/src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj b/src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj
index 910651d..f9bf5fc 100644
--- a/src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj
+++ b/src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj
@@ -13,13 +13,8 @@
-
-
-
-
-
-
-
+
+
diff --git a/src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj b/src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj
index b21f3a9..84be131 100644
--- a/src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj
+++ b/src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj
@@ -3,6 +3,7 @@
Reactive.Streams.Example.Unicast
netstandard1.4;net45
+ true
@@ -13,11 +14,6 @@
-
-
-
-
-
$(DefineConstants);RELEASE
diff --git a/src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj b/src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj
index ec61c22..4444511 100644
--- a/src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj
+++ b/src/tck/Reactive.Streams.TCK.Tests/Reactive.Streams.TCK.Tests.csproj
@@ -13,13 +13,8 @@
-
-
-
-
-
-
-
+
+
diff --git a/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj b/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj
index 746c960..1f9e4da 100644
--- a/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj
+++ b/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.csproj
@@ -4,12 +4,13 @@
Reactive.Streams.TCK
Reactive Streams Technology Compatibility Kit
CC0 1.0 Universal
- 1.0.0
+ 1.0.3
Reactive Streams
net45
reactive;stream
https://github.com/reactive-streams/reactive-streams-dotnet
http://creativecommons.org/publicdomain/zero/1.0/
+ true
@@ -17,10 +18,8 @@
-
-
-
-
+
+
diff --git a/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec b/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec
index f58221b..80146ca 100644
--- a/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec
+++ b/src/tck/Reactive.Streams.TCK/Reactive.Streams.TCK.nuspec
@@ -2,7 +2,7 @@
Reactive.Streams.TCK
- 1.0.0
+ 1.0.3
Reactive Streams
Reactive Streams
false
@@ -13,13 +13,15 @@
reactive stream
-
+
+
+
\ No newline at end of file