diff --git a/build.fsx b/build.fsx index 36b63155..ea67ada9 100644 --- a/build.fsx +++ b/build.fsx @@ -275,6 +275,8 @@ Target "Clean" (fun _ -> CleanDirs [ "out/api"; "out/docs"; "out/packages" ] CleanDirs [ "out/lib/Net35"; "out/lib/Net40"; "out/lib/Profile47"; "out/lib/Profile259"; "out/lib/Profile328" ] CleanDirs [ "out/test/Net35"; "out/test/Net40"; "out/test/Profile47"; "out/test/Profile259"; "out/test/Profile328" ] + CleanDirs [ "out/lib-debug/Net35"; "out/lib-debug/Net40"; "out/lib-debug/Profile47"; "out/lib-debug/Profile259"; "out/lib-debug/Profile328" ] + CleanDirs [ "out/test-debug/Net35"; "out/test-debug/Net40"; "out/test-debug/Profile47"; "out/test-debug/Profile259"; "out/test-debug/Profile328" ] CleanDirs [ "out/lib-signed/Net40"; "out/test-signed/Net40" ] // Signed Build CleanDirs [ "out/MKL"; "out/ATLAS" ] // Native Providers CleanDirs [ "out/Data" ]) // Data Extensions diff --git a/paket.lock b/paket.lock index adf54e46..4ea92ce0 100644 --- a/paket.lock +++ b/paket.lock @@ -3,12 +3,12 @@ NUGET specs: BenchShark (1.0.0) ConsoleDump (0.6.0.1) - FAKE (3.7.1) - FSharp.Compiler.Service (0.0.62) + FAKE (3.7.5) + FSharp.Compiler.Service (0.0.67) FSharp.Core.4.3.0.0.Microsoft.Signed (3.0.0.1) FSharp.Core.Microsoft.Signed (3.1.1.1) - FSharp.Formatting (2.4.33) - FSharp.Compiler.Service (>= 0.0.62) + FSharp.Formatting (2.4.36) + FSharp.Compiler.Service (0.0.67) Microsoft.AspNet.Razor (2.0.30506.0) RazorEngine (3.3.0) FsUnit (1.3.0.1) diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 1c0e4d57..2dae2eae 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -63,93 +63,4 @@ --> - - - - - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - True - - - - - - - True - - - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - \ No newline at end of file diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj index c39eb851..6580c2a2 100644 --- a/src/Data/Text/Text.csproj +++ b/src/Data/Text/Text.csproj @@ -59,93 +59,4 @@ --> - - - - - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - True - - - - - - - True - - - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - \ No newline at end of file diff --git a/src/DataUnitTests/UnitTests.csproj b/src/DataUnitTests/UnitTests.csproj index 4e92c581..f0f2a3a9 100644 --- a/src/DataUnitTests/UnitTests.csproj +++ b/src/DataUnitTests/UnitTests.csproj @@ -108,104 +108,11 @@ --> - - - - - - - - - - - - - ..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - True - - - - - - - True - - - - - - - - - - - ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - - - ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll - True - True - - - - - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/FSharp/FSharp-Net35.fsproj b/src/FSharp/FSharp-Net35.fsproj index 43273af6..dbda00f2 100644 --- a/src/FSharp/FSharp-Net35.fsproj +++ b/src/FSharp/FSharp-Net35.fsproj @@ -1,18 +1,17 @@  + FSharp-Net35 + MathNet.Numerics.FSharp + MathNet.Numerics + Library Debug AnyCPU {d5dbcec0-9d9d-4a62-9ee0-f78e1895d4f4} - Library - MathNet.Numerics - MathNet.Numerics.FSharp v3.5 - FSharp 4.3.0.0 - + ..\..\ ..\MathNet.Numerics.snk - pdbonly @@ -109,7 +108,7 @@ - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll True True @@ -144,14 +143,156 @@ + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + + + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + \ No newline at end of file diff --git a/src/FSharp/FSharp-Net35.fsproj.paket.references b/src/FSharp/FSharp-Net35.fsproj.paket.references index b55f0ca9..cfff6d69 100644 --- a/src/FSharp/FSharp-Net35.fsproj.paket.references +++ b/src/FSharp/FSharp-Net35.fsproj.paket.references @@ -1 +1,2 @@ FSharp.Core.4.3.0.0.Microsoft.Signed +TaskParallelLibrary diff --git a/src/FSharp/FSharp-Portable259.fsproj b/src/FSharp/FSharp-Portable259.fsproj index 55d3eab4..fb6be97a 100644 --- a/src/FSharp/FSharp-Portable259.fsproj +++ b/src/FSharp/FSharp-Portable259.fsproj @@ -2,16 +2,17 @@ + FSharp-Portable259 + MathNet.Numerics.FSharp + MathNet.Numerics + Library Debug AnyCPU {8A60894F-D090-4FC5-9535-E244E90A44C1} - Library v4.5 Profile259 3.259.3.1 - MathNet.Numerics.FSharp - MathNet.Numerics - FSharp-Portable259 + ..\..\ TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION @@ -80,6 +81,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -141,8 +149,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -163,14 +238,14 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + \ No newline at end of file diff --git a/src/FSharp/FSharp-Portable47.fsproj b/src/FSharp/FSharp-Portable47.fsproj index 45eba952..15610ae6 100644 --- a/src/FSharp/FSharp-Portable47.fsproj +++ b/src/FSharp/FSharp-Portable47.fsproj @@ -2,16 +2,17 @@ + FSharp-Portable47 + MathNet.Numerics.FSharp + MathNet.Numerics + Library Debug AnyCPU {F5F14D76-428D-43D7-8431-5B885F1BA419} - Library v4.0 Profile47 2.3.5.1 - MathNet.Numerics.FSharp - MathNet.Numerics - FSharp-Portable47 + ..\..\ TRACE;PORTABLE @@ -80,6 +81,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -141,8 +149,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -163,14 +238,14 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + \ No newline at end of file diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 2252e735..9f34bd5e 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -1,16 +1,16 @@  + FSharp + MathNet.Numerics.FSharp + MathNet.Numerics + Library Debug AnyCPU {37E8E802-A354-4114-BFC1-6E1357DA605B} - Library - MathNet.Numerics - MathNet.Numerics.FSharp v4.0 - FSharp 4.3.0.0 - + ..\..\ ..\MathNet.Numerics.snk @@ -98,6 +98,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -159,8 +166,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -181,14 +255,14 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + \ No newline at end of file diff --git a/src/FSharpUnitTests/DenseMatrixTests.fs b/src/FSharpUnitTests/DenseMatrixTests.fs index 5a706e81..41342e71 100644 --- a/src/FSharpUnitTests/DenseMatrixTests.fs +++ b/src/FSharpUnitTests/DenseMatrixTests.fs @@ -14,7 +14,7 @@ module DenseMatrixTests = /// A large matrix with increasingly large entries let largeM = - Array.init (100*120) (fun k -> let (j,i) = System.Math.DivRem(k,100) in float i * 100.0 + float j) + Array.init (100*120) (fun k -> let i, j = (k%100),(k/100) in float i * 100.0 + float j) |> DenseMatrix.raw 100 120 [] diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj index 286c718a..d428ee7c 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj @@ -1,18 +1,17 @@  + FSharpUnitTests + MathNet.Numerics.FSharp.UnitTests + FSharpUnitTests + Library + {8c96f2e9-681b-4201-8bdd-0aa901203725} Debug AnyCPU - {8c96f2e9-681b-4201-8bdd-0aa901203725} - Library - FSharpUnitTests - MathNet.Numerics.FSharp.UnitTests v3.5 - FSharpUnitTests - 11 4.3.0.0 + 11 ..\..\ - pdbonly @@ -108,7 +107,7 @@ - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll True True @@ -143,15 +142,82 @@ + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll True True + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -178,19 +244,92 @@ - + - ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll True True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + + + + + + + + + - - ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True @@ -198,16 +337,59 @@ - - - + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + - - ..\..\packages\NUnit\lib\nunit.framework.dll + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references index c7d6b012..a43e9903 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references @@ -1,2 +1,3 @@ FSharp.Core.4.3.0.0.Microsoft.Signed FsUnit +TaskParallelLibrary diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj index a7c577f9..b019dfe3 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj @@ -2,16 +2,16 @@ + FSharpUnitTests-Portable259 + MathNet.Numerics.FSharp.UnitTests259 + FSharpPortableUnitTests + Library Debug AnyCPU {EC24DA9F-8772-491D-BA56-3ADA75072B3D} - Library - FSharpPortableUnitTests - MathNet.Numerics.FSharp.UnitTests259 v4.5 - FSharpUnitTests-Portable259 - 11 4.3.0.0 + 11 ..\..\ @@ -40,15 +40,12 @@ - - $(DefineConstants);NOFSSLICESET1D + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + @@ -64,7 +61,7 @@ - + @@ -76,13 +73,6 @@ {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - @@ -95,6 +85,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -156,8 +153,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -178,15 +242,15 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + @@ -213,15 +277,6 @@ - - - - ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll - True - True - - - @@ -233,16 +288,66 @@ - - - + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - ..\..\packages\NUnit\lib\nunit.framework.dll + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll True True + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj index 5c74549b..797eb0e7 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj @@ -2,20 +2,20 @@ + FSharpUnitTests-Portable47 + MathNet.Numerics.FSharp.UnitTests47 + FSharpPortableUnitTests + Library Debug AnyCPU 90CE8E32-354E-4728-8FE6-87342F469321 - Library - FSharpPortableUnitTests - MathNet.Numerics.FSharp.UnitTests47 v4.5 - FSharpUnitTests-Portable47 - 11 4.3.0.0 + 11 ..\..\ - TRACE;PORTABLE + TRACE;PORTABLE;NOFSSLICESET1D ..\..\out\test\Profile47\ ..\..\obj\test\Profile47\ ..\..\obj\test\Profile47\ @@ -27,7 +27,7 @@ - DEBUG;TRACE;PORTABLE + DEBUG;TRACE;PORTABLE;NOFSSLICESET1D ..\..\out\test-debug\Profile47\ ..\..\obj\test-debug\Profile47\ ..\..\obj\test-debug\Profile47\ @@ -39,10 +39,6 @@ - - - $(DefineConstants);NOFSSLICESET1D - @@ -93,6 +89,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -154,8 +157,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -176,15 +246,15 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + @@ -211,15 +281,6 @@ - - - - ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll - True - True - - - @@ -231,16 +292,66 @@ - - - + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - ..\..\packages\NUnit\lib\nunit.framework.dll + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll True True + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index 0e802d18..951a344c 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -1,16 +1,16 @@  + FSharpUnitTests + MathNet.Numerics.FSharp.UnitTests + FSharpUnitTests + Library + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D} Debug AnyCPU - {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D} - Library - FSharpUnitTests - MathNet.Numerics.FSharp.UnitTests v4.5 - FSharpUnitTests - 11 4.3.0.0 + 11 ..\..\ @@ -98,6 +98,13 @@ + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\FSharp.Core.dll + True + True + + @@ -159,8 +166,75 @@ + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + True + True + + + @@ -181,15 +255,15 @@ - + - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll True True - + @@ -216,15 +290,6 @@ - - - - ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll - True - True - - - @@ -236,16 +301,66 @@ - - - + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - ..\..\packages\NUnit\lib\nunit.framework.dll + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll True True + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/FSharpUnitTests/Utilities.fs b/src/FSharpUnitTests/Utilities.fs index ebb0e6ed..9b1337f1 100644 --- a/src/FSharpUnitTests/Utilities.fs +++ b/src/FSharpUnitTests/Utilities.fs @@ -9,8 +9,8 @@ open System.Collections.Generic [] module Utilities = let test msg b = Assert.IsTrue(b, "MiniTest '" + msg + "'") - let logMessage msg = - System.Console.WriteLine("LOG:" + msg) + let logMessage msg = () +// System.Console.WriteLine("LOG:" + msg) // System.Diagnostics.Trace.WriteLine("LOG:" + msg) let check msg v1 v2 = test msg (v1 = v2) let reportFailure msg = Assert.Fail msg diff --git a/src/Numerics/Numerics-Net35.csproj b/src/Numerics/Numerics-Net35.csproj index 39d4756f..9f3a61dc 100644 --- a/src/Numerics/Numerics-Net35.csproj +++ b/src/Numerics/Numerics-Net35.csproj @@ -118,5 +118,59 @@ + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + \ No newline at end of file diff --git a/src/Performance/Performance.csproj b/src/Performance/Performance.csproj index ab9f56ab..a5d2f3f3 100644 --- a/src/Performance/Performance.csproj +++ b/src/Performance/Performance.csproj @@ -88,17 +88,13 @@ --> - - - - - ..\..\packages\BenchShark\lib\Benchmark.dll - True - True - - - - + + + ..\..\packages\BenchShark\lib\Benchmark.dll + True + True + + @@ -121,5 +117,59 @@ + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + + + + + ..\..\packages\ConsoleDump\lib\net40-Client\ConsoleDump.dll + True + True + + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests-MKL.csproj b/src/UnitTests/UnitTests-MKL.csproj index 64e01f36..bc39c306 100644 --- a/src/UnitTests/UnitTests-MKL.csproj +++ b/src/UnitTests/UnitTests-MKL.csproj @@ -13,6 +13,7 @@ MathNet.Numerics.UnitTestsMKL v4.5 512 + ..\..\ TRACE;NATIVEMKL @@ -385,15 +386,11 @@ - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj index faf26395..7618a92a 100644 --- a/src/UnitTests/UnitTests-Net35.csproj +++ b/src/UnitTests/UnitTests-Net35.csproj @@ -363,16 +363,66 @@ - - - + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + - - ..\..\packages\NUnit\lib\nunit.framework.dll + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Portable259.csproj b/src/UnitTests/UnitTests-Portable259.csproj index 8f9cf7ca..1a333088 100644 --- a/src/UnitTests/UnitTests-Portable259.csproj +++ b/src/UnitTests/UnitTests-Portable259.csproj @@ -330,15 +330,11 @@ - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Portable328.csproj b/src/UnitTests/UnitTests-Portable328.csproj index 02f2a2ba..d3fe413d 100644 --- a/src/UnitTests/UnitTests-Portable328.csproj +++ b/src/UnitTests/UnitTests-Portable328.csproj @@ -330,15 +330,11 @@ - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests-Portable47.csproj b/src/UnitTests/UnitTests-Portable47.csproj index 668954ae..ece9f34f 100644 --- a/src/UnitTests/UnitTests-Portable47.csproj +++ b/src/UnitTests/UnitTests-Portable47.csproj @@ -328,15 +328,11 @@ - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 01dde378..e833db3e 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -671,15 +671,11 @@ - - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - + + + ..\..\packages\NUnit\lib\nunit.framework.dll + True + True + + \ No newline at end of file