From affa89663595db6eed5501a0775a95bdc71c317b Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Sat, 5 May 2018 18:51:46 +0200
Subject: [PATCH] Tests: test against NetCoreApp2.0 instead of 1.1; print
 dotnet --info as part of build

---
 build.fsx                                     | 12 ++---
 build/build-framework.fsx                     | 49 +++++++++++--------
 .../Random/RandomSerializationTests.cs        |  3 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/build.fsx b/build.fsx
index c5db7e16..e335859d 100644
--- a/build.fsx
+++ b/build.fsx
@@ -392,8 +392,8 @@ Target "TestNumericsNET40" (fun _ -> testNumerics "net40")
 Target "TestNumericsNET45" (fun _ -> testNumerics "net45")
 Target "TestNumericsNET461" (fun _ -> testNumerics "net461")
 Target "TestNumericsNET47"  (fun _ -> testNumerics "net47")
-"Build" ==> "TestNumericsCore1.1" ==> "TestNumerics"
-"Build" ==> "TestNumericsCore2.0"
+"Build" ==> "TestNumericsCore1.1"
+"Build" ==> "TestNumericsCore2.0" ==> "TestNumerics"
 "Build" =?> ("TestNumericsNET40", isWindows)
 "Build" =?> ("TestNumericsNET45", isWindows)
 "Build" =?> ("TestNumericsNET461", isWindows) ==> "TestNumerics"
@@ -405,8 +405,8 @@ Target "TestFsharpCore2.0" (fun _ -> testFsharp "netcoreapp2.0")
 Target "TestFsharpNET45" (fun _ -> testFsharp "net45")
 Target "TestFsharpNET461" (fun _ -> testFsharp "net461")
 Target "TestFsharpNET47" (fun _ -> testFsharp "net47")
-"Build" ==> "TestFsharpCore1.1" ==> "TestFsharp"
-"Build" ==> "TestFsharpCore2.0"
+"Build" ==> "TestFsharpCore1.1"
+"Build" ==> "TestFsharpCore2.0" ==> "TestFsharp"
 "Build" =?> ("TestFsharpNET45", isWindows)
 "Build" =?> ("TestFsharpNET461", isWindows) ==> "TestFsharp"
 "Build" =?> ("TestFsharpNET47", isWindows)
@@ -440,8 +440,8 @@ Target "DataTest" DoNothing
 Target "DataTestCore1.1" (fun _ -> testData "netcoreapp1.1")
 Target "DataTestCore2.0" (fun _ -> testData "netcoreapp2.0")
 Target "DataTestNET45" (fun _ -> testData "net45")
-"DataBuild" ==> "DataTestCore1.1" ==> "DataTest"
-"DataBuild" ==> "DataTestCore2.0"
+"DataBuild" ==> "DataTestCore1.1"
+"DataBuild" ==> "DataTestCore2.0" ==> "DataTest"
 "DataBuild" =?> ("DataTestNET45", isWindows) ==> "DataTest"
 
 
diff --git a/build/build-framework.fsx b/build/build-framework.fsx
index 122fbc36..d1e60efe 100644
--- a/build/build-framework.fsx
+++ b/build/build-framework.fsx
@@ -28,6 +28,32 @@ let rootDir = Path.GetFullPath (Path.Combine (__SOURCE_DIRECTORY__ + "/../"))
 Environment.CurrentDirectory <- rootDir
 trace rootDir
 
+
+// --------------------------------------------------------------------------------------
+// .Net SDK
+// --------------------------------------------------------------------------------------
+
+let msbuild targets configuration project =
+    MSBuildHelper.build (fun p ->
+        { p with
+            NoLogo = true
+            NodeReuse = true
+            Targets = targets
+            Properties = [ "Configuration", configuration ]
+            RestorePackagesFlag = false
+            Verbosity = Some MSBuildVerbosity.Minimal
+        }) project
+
+let dotnet workingDir command =
+    DotNetCli.RunCommand
+        (fun c -> { c with WorkingDir = workingDir})
+        command
+
+
+// --------------------------------------------------------------------------------------
+// Header
+// --------------------------------------------------------------------------------------
+
 let header = ReadFile(__SOURCE_DIRECTORY__ </> __SOURCE_FILE__) |> Seq.take 10 |> Seq.map (fun s -> s.Substring(2)) |> toLines
 
 type Release =
@@ -73,6 +99,8 @@ let traceHeader (releases:Release list) =
     for release in releases do
         trace ([ " "; release.Title.PadRight titleLength; "  v"; release.PackageVersion ] |> String.concat "")
     trace ""
+    dotnet rootDir "--info"
+    trace ""
 
 
 // --------------------------------------------------------------------------------------
@@ -92,27 +120,6 @@ let libpcl259 = "lib/portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"
 let libpcl328 = "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"
 
 
-// --------------------------------------------------------------------------------------
-// .Net SDK
-// --------------------------------------------------------------------------------------
-
-let msbuild targets configuration project =
-    MSBuildHelper.build (fun p ->
-        { p with
-            NoLogo = true
-            NodeReuse = true
-            Targets = targets
-            Properties = [ "Configuration", configuration ]
-            RestorePackagesFlag = false
-            Verbosity = Some MSBuildVerbosity.Minimal
-        }) project
-
-let dotnet workingDir command =
-    DotNetCli.RunCommand
-        (fun c -> { c with WorkingDir = workingDir})
-        command
-
-
 // --------------------------------------------------------------------------------------
 // PREPARE
 // --------------------------------------------------------------------------------------
diff --git a/src/Numerics.Tests/Random/RandomSerializationTests.cs b/src/Numerics.Tests/Random/RandomSerializationTests.cs
index aa886aa1..8fced810 100644
--- a/src/Numerics.Tests/Random/RandomSerializationTests.cs
+++ b/src/Numerics.Tests/Random/RandomSerializationTests.cs
@@ -27,7 +27,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
-#if !NETCOREAPP1_1
+#if !NETCOREAPP1_1 && !NETCOREAPP2_0
+// Rationale: System.Random is no longer serializable in .Net Core
 
 using System;
 using System.IO;