From 25af89d1a907ecccb69fbe421633b19748c7ff87 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Tue, 26 Dec 2017 19:52:14 +0100 Subject: [PATCH] Build: update FAKE, NuGet.CommandLine, NUnit, FSharp.Compiler.Tools --- MathNet.Numerics.sln.DotSettings | 8 ++++++++ build.fsx | 7 ++++--- paket.lock | 12 ++++++------ src/FSharpUnitTests/FSharpUnitTests.fsproj | 5 +++-- src/UnitTests/UnitTests.csproj | 6 +++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/MathNet.Numerics.sln.DotSettings b/MathNet.Numerics.sln.DotSettings index 742eedd0..0979a69e 100644 --- a/MathNet.Numerics.sln.DotSettings +++ b/MathNet.Numerics.sln.DotSettings @@ -17,7 +17,10 @@ False False True + NEVER + NEVER False + NEVER False True False @@ -70,7 +73,12 @@ OTHER DEALINGS IN THE SOFTWARE. SVD TFQMR WH + True + True + True + True True + True True True <data /> diff --git a/build.fsx b/build.fsx index 5c7170b5..b0c53a14 100644 --- a/build.fsx +++ b/build.fsx @@ -316,8 +316,7 @@ let dataBundle = Target "Start" DoNothing Target "Clean" (fun _ -> - DotNetCli.RunCommand id "clean MathNet.Numerics.sln" - DotNetCli.RunCommand id "clean MathNet.Numerics.Data.sln" + // Force delete the obj folder first (dotnet SDK has a habbit of fucking this folder up to a state where not even clean works...) CleanDirs [ "src/Numerics/bin"; "src/FSharp/bin"; "src/TestData/bin"; "src/UnitTests/bin"; "src/FSharpUnitTests/bin" ] CleanDirs [ "src/Numerics/obj"; "src/FSharp/obj"; "src/TestData/obj"; "src/UnitTests/obj"; "src/FSharpUnitTests/obj" ] CleanDirs [ "obj" ] @@ -328,7 +327,9 @@ Target "Clean" (fun _ -> CleanDirs [ "out/test-debug/Net40" ] CleanDirs [ "out/lib-signed/Net40"; "out/test-signed/Net40" ] // Signed Build CleanDirs [ "out/MKL"; "out/ATLAS"; "out/CUDA"; "out/OpenBLAS" ] // Native Providers - CleanDirs [ "out/Data" ]) // Data Extensions + CleanDirs [ "out/Data" ] // Data Extensions + DotNetCli.RunCommand id "clean MathNet.Numerics.sln" + DotNetCli.RunCommand id "clean MathNet.Numerics.Data.sln") Target "ApplyVersion" (fun _ -> patchVersionInAssemblyInfo "src/Numerics" numericsRelease diff --git a/paket.lock b/paket.lock index ad02bceb..d693e3f2 100644 --- a/paket.lock +++ b/paket.lock @@ -1,13 +1,13 @@ NUGET remote: https://www.nuget.org/api/v2 - FSharp.Compiler.Tools (4.1.23) + FSharp.Compiler.Tools (4.1.29) FSharp.Core (4.0.0.1) - NUnit (3.8.1) - restriction: || (== net35) (== net45) + NUnit (3.9) - restriction: || (== net35) (== net45) TaskParallelLibrary (1.0.2856) GITHUB remote: fsprojects/FsUnit - src/FsUnit.NUnit/FsUnit.fs (ccd7f01fe792b149731261c816b851bf4e8e5e43) - src/FsUnit.NUnit/FsUnitTyped.fs (ccd7f01fe792b149731261c816b851bf4e8e5e43) + src/FsUnit.NUnit/FsUnit.fs (4c0812f4b96de85cc20f02fca87f852735e2eaeb) + src/FsUnit.NUnit/FsUnitTyped.fs (4c0812f4b96de85cc20f02fca87f852735e2eaeb) GROUP Benchmark RESTRICTION: == net45 NUGET @@ -18,14 +18,14 @@ NUGET GROUP Build NUGET remote: https://www.nuget.org/api/v2 - FAKE (4.63.2) + FAKE (4.64.3) FSharp.Compiler.Service (2.0.0.6) FSharp.Formatting (2.14.4) FSharp.Compiler.Service (2.0.0.6) FSharpVSPowerTools.Core (>= 2.3 < 2.4) FSharpVSPowerTools.Core (2.3) FSharp.Compiler.Service (>= 2.0.0.3) - NuGet.CommandLine (4.3) + NuGet.CommandLine (4.4.1) NUnit.ConsoleRunner (3.7) GROUP Data diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index 38aeaa4d..f81ac31f 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -9,9 +9,10 @@ NETSTANDARD + - - + + diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index cdcef758..76a691e7 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -27,9 +27,9 @@ - - + + - + \ No newline at end of file