From 4455d0fca4e50f84b68a26d2e50bf09633c083a6 Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 21 Aug 2020 00:32:22 +0700
Subject: [PATCH 1/5] Turn on NUnit testing on Akka.Streams.Tests.TCK

---
 src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
index 2ad0f00f906..caeb4c8ccb8 100644
--- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
+++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
@@ -18,6 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Reactive.Streams.TCK" Version="1.0.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
   </ItemGroup>

From 9dc81eedd3f5c603f11d92f17c1f78e7d657e1cb Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 21 Aug 2020 03:46:55 +0700
Subject: [PATCH 2/5] Downgrade NUnit to 3.7.1 becasue 3.12.0 was not
 compatible with Reactive.Streams.TCK

---
 .../Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
index caeb4c8ccb8..22e0fe2b3c3 100644
--- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
+++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\xunitSettings.props" />
   <PropertyGroup>
     <AssemblyName>Akka.Streams.Tests</AssemblyName>
-    <TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
   </PropertyGroup>
  
   <ItemGroup>
@@ -18,10 +18,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Reactive.Streams.TCK" Version="1.0.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <!-- !!!WARNING!!! ALWAYS MATCH NUNIT VERSION WITH THE VERSION USED BY REACTIVE TCK !!!WARNING!!! -->
+    <PackageReference Include="NUnit" Version="3.7.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">

From a0ad0f3128642a149d6048251f2973fa8c61f240 Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 21 Aug 2020 06:48:20 +0700
Subject: [PATCH 3/5] Remove NUnit reference in csproj, using the one
 referenced in the `Reactive.Streams.TCK` instead

---
 .../Akka.Streams.Tests.TCK.csproj                    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
index 22e0fe2b3c3..a0f09a44dff 100644
--- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
+++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
@@ -3,7 +3,9 @@
   <Import Project="..\..\xunitSettings.props" />
   <PropertyGroup>
     <AssemblyName>Akka.Streams.Tests</AssemblyName>
-    <TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
+    <!-- Reactive.Streams.TCK isn't compatible with .NET Core -->
+    <!-- Reactive. -->
+    <TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
   </PropertyGroup>
  
   <ItemGroup>
@@ -20,8 +22,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Reactive.Streams.TCK" Version="1.0.2" />
-    <!-- !!!WARNING!!! ALWAYS MATCH NUNIT VERSION WITH THE VERSION USED BY REACTIVE TCK !!!WARNING!!! -->
-    <PackageReference Include="NUnit" Version="3.7.1" />
+    <!-- !!!WARNING!!! 
+         NUNIT VERSION HAVE TO MATCH WITH THE VERSION USED BY REACTIVE TCK. 
+         NEVER ADD NUNIT PACKAGE, WE ARE RELYING ON REACTIVE.STREAMS.TCK TO PROVIDE 
+         THE DEPENDENCY 
+         !!!WARNING!!! -->
+    <!-- <PackageReference Include="NUnit" Version="3.7.1" /> -->
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">

From e81ce96cb16b2a2a000b78e38db496b5f2f4f18e Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 21 Aug 2020 08:53:59 +0700
Subject: [PATCH 4/5] Fix build script, it excludes `Akka.Streams.Tests.TCK`
 from test runs

---
 build.fsx                                                     | 1 +
 src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.fsx b/build.fsx
index 5e6397b3587..7734a5c15ab 100644
--- a/build.fsx
+++ b/build.fsx
@@ -232,6 +232,7 @@ Target "RunTests" (fun _ ->
     let projects = 
         let rawProjects = match (isWindows) with 
                             | true -> !! "./src/**/*.Tests.*sproj"
+                                      ++ "./src/**/Akka.Streams.Tests.TCK.csproj"
                             | _ -> !! "./src/**/*.Tests.*sproj" // if you need to filter specs for Linux vs. Windows, do it here
         rawProjects |> Seq.choose filterProjects
     
diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
index a0f09a44dff..09ee5da3684 100644
--- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
+++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
@@ -2,7 +2,7 @@
 <Import Project="..\..\common.props" />
   <Import Project="..\..\xunitSettings.props" />
   <PropertyGroup>
-    <AssemblyName>Akka.Streams.Tests</AssemblyName>
+    <AssemblyName>Akka.Streams.Tests.TCK</AssemblyName>
     <!-- Reactive.Streams.TCK isn't compatible with .NET Core -->
     <!-- Reactive. -->
     <TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>

From 681e12d4e07efc35d7142f3e71847db50f0a261f Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Fri, 21 Aug 2020 21:35:08 +0700
Subject: [PATCH 5/5] Enable Akka.Streams.Tests.TCK on netcoreapp3.1

---
 build.fsx                                                  | 1 +
 .../Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj   | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.fsx b/build.fsx
index 7734a5c15ab..af7537b2aca 100644
--- a/build.fsx
+++ b/build.fsx
@@ -258,6 +258,7 @@ Target "RunTestsNetCore" (fun _ ->
         let projects = 
             let rawProjects = match (isWindows) with 
                                 | true -> !! "./src/**/*.Tests.*sproj"
+                                          ++ "./src/**/Akka.Streams.Tests.TCK.csproj"
                                 | _ -> !! "./src/**/*.Tests.*sproj" // if you need to filter specs for Linux vs. Windows, do it here
             rawProjects |> Seq.choose filterProjects
      
diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
index 09ee5da3684..d42da07c4d5 100644
--- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
+++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj
@@ -4,8 +4,7 @@
   <PropertyGroup>
     <AssemblyName>Akka.Streams.Tests.TCK</AssemblyName>
     <!-- Reactive.Streams.TCK isn't compatible with .NET Core -->
-    <!-- Reactive. -->
-    <TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
   </PropertyGroup>
  
   <ItemGroup>
@@ -24,10 +23,8 @@
     <PackageReference Include="Reactive.Streams.TCK" Version="1.0.2" />
     <!-- !!!WARNING!!! 
          NUNIT VERSION HAVE TO MATCH WITH THE VERSION USED BY REACTIVE TCK. 
-         NEVER ADD NUNIT PACKAGE, WE ARE RELYING ON REACTIVE.STREAMS.TCK TO PROVIDE 
-         THE DEPENDENCY 
          !!!WARNING!!! -->
-    <!-- <PackageReference Include="NUnit" Version="3.7.1" /> -->
+    <PackageReference Include="NUnit" Version="3.7.1" Condition="'$(TargetFramework)' == '$(NetCoreTestVersion)'"/>
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">