diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln
index c7b71d1a..5bb16739 100644
--- a/MathNet.Numerics.Portable.sln
+++ b/MathNet.Numerics.Portable.sln
@@ -1,39 +1,42 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}"
- ProjectSection(SolutionItems) = preProject
- AUTHORS.markdown = AUTHORS.markdown
- COPYRIGHT.markdown = COPYRIGHT.markdown
- README.markdown = README.markdown
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable", "src\Numerics\Portable.csproj", "{D877F358-A2D2-4CC3-A921-8AA5CF6187E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable47", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}"
EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable", "src\FSharpPortable\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable47", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}"
+ ProjectSection(ProjectDependencies) = postProject
+ {49205185-621E-FFB9-2104-887C9F1BBD13} = {49205185-621E-FFB9-2104-887C9F1BBD13}
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{81D2CBEF-1C80-4389-A341-F010E8F86CDB}"
EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortableUnitTests", "src\FSharpPortableUnitTests\FSharpPortableUnitTests.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable47", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
+ Debug47|Any CPU = Debug47|Any CPU
+ Release136|Any CPU = Release136|Any CPU
+ Release47|Any CPU = Release47|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D877F358-A2D2-4CC3-A921-8AA5CF6187E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D877F358-A2D2-4CC3-A921-8AA5CF6187E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D877F358-A2D2-4CC3-A921-8AA5CF6187E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D877F358-A2D2-4CC3-A921-8AA5CF6187E8}.Release|Any CPU.Build.0 = Release|Any CPU
- {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release|Any CPU.Build.0 = Release|Any CPU
- {90CE8E32-354E-4728-8FE6-87342F469321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {90CE8E32-354E-4728-8FE6-87342F469321}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {90CE8E32-354E-4728-8FE6-87342F469321}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {90CE8E32-354E-4728-8FE6-87342F469321}.Release|Any CPU.Build.0 = Release|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Debug47|Any CPU.Build.0 = Debug47|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Release136|Any CPU.ActiveCfg = Release136|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Release136|Any CPU.Build.0 = Release136|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Release47|Any CPU.ActiveCfg = Release47|Any CPU
+ {49205185-621E-FFB9-2104-887C9F1BBD13}.Release47|Any CPU.Build.0 = Release47|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Debug47|Any CPU.Build.0 = Debug47|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release136|Any CPU.ActiveCfg = Release136|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release136|Any CPU.Build.0 = Release136|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release47|Any CPU.ActiveCfg = Release47|Any CPU
+ {F5F14D76-428D-43D7-8431-5B885F1BA419}.Release47|Any CPU.Build.0 = Release47|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Debug47|Any CPU.Build.0 = Debug47|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.ActiveCfg = Release136|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.Build.0 = Release136|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.ActiveCfg = Release47|Any CPU
+ {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.Build.0 = Release47|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
index 15994dd7..7702fdd4 100644
--- a/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
+++ b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
@@ -6,7 +6,7 @@
Math.NET Numerics for F# - Code Samples
This package contains samples that demonstrate the use of the F# Modules for the Math.NET Numerics library.
This package contains samples that demonstrate the use of the F# Modules for the Math.NET Numerics library. Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.
- Marcus Cuda, Christoph Ruegg, Jurgen Van Gael
+ Christoph Ruegg, Marcus Cuda, Jurgen Van Gael
Christoph Ruegg
http://numerics.mathdotnet.com/
http://www.mathdotnet.com/images/MathNet128.png
@@ -17,7 +17,7 @@
-
+
\ No newline at end of file
diff --git a/build/NuGet/FSharp/MathNet.Numerics.FSharp.nuspec b/build/NuGet/FSharp/MathNet.Numerics.FSharp.nuspec
index 19efa8bd..53b59074 100644
--- a/build/NuGet/FSharp/MathNet.Numerics.FSharp.nuspec
+++ b/build/NuGet/FSharp/MathNet.Numerics.FSharp.nuspec
@@ -6,7 +6,7 @@
Math.NET Numerics for F#
F# Modules for Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use. Supports F# 3.0 with .Net 4 and higher, SL5 and .NET for Windows Store apps.
F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both. Also includes a portable build supporting .Net 4.5, SL5 and .NET for Windows Store apps.
- Marcus Cuda, Christoph Ruegg, Jurgen Van Gael
+ Christoph Ruegg, Marcus Cuda, Jurgen Van Gael
Christoph Ruegg
http://numerics.mathdotnet.com/
http://www.mathdotnet.com/images/MathNet128.png
@@ -17,7 +17,7 @@
-
+
\ No newline at end of file
diff --git a/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec b/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
index b08f037d..2c74a415 100644
--- a/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
+++ b/build/NuGet/Numerics.Sample/MathNet.Numerics.Sample.nuspec
@@ -6,7 +6,7 @@
Math.NET Numerics - Code Samples
This package contains samples that demonstrate the use of the Math.NET Numerics library.
This package contains samples that demonstrate the use of the Math.NET Numerics library. Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.
- Marcus Cuda, Christoph Ruegg, Jurgen Van Gael
+ Christoph Ruegg, Marcus Cuda, Jurgen Van Gael
Christoph Ruegg
http://numerics.mathdotnet.com/
http://www.mathdotnet.com/images/MathNet128.png
@@ -17,7 +17,7 @@
-
+
\ No newline at end of file
diff --git a/build/NuGet/Numerics.Signed/MathNet.Numerics.Signed.nuspec b/build/NuGet/Numerics.Signed/MathNet.Numerics.Signed.nuspec
index 69912ab2..b8ecd235 100644
--- a/build/NuGet/Numerics.Signed/MathNet.Numerics.Signed.nuspec
+++ b/build/NuGet/Numerics.Signed/MathNet.Numerics.Signed.nuspec
@@ -6,7 +6,7 @@
Math.NET Numerics - Signed Edition
Math.NET Numerics, signed and thus with a strong name. We strongly discourage using this package and recommend using MathNet.Numerics instead, which is unsigned and weakly named.
Math.NET Numerics, signed and thus with a strong name. We strongly discourage using this package and recommend using MathNet.Numerics instead, which is unsigned and weakly named.
- Marcus Cuda, Christoph Ruegg, Jurgen Van Gael
+ Christoph Ruegg, Marcus Cuda, Jurgen Van Gael
Christoph Ruegg
http://numerics.mathdotnet.com/
http://www.mathdotnet.com/images/MathNet128.png
@@ -14,7 +14,7 @@
false
math numeric statistics probability integration interpolation linear algebra matrix fft signed strongname
-
+
\ No newline at end of file
diff --git a/build/NuGet/Numerics/MathNet.Numerics.nuspec b/build/NuGet/Numerics/MathNet.Numerics.nuspec
index cdae1728..044c55d2 100644
--- a/build/NuGet/Numerics/MathNet.Numerics.nuspec
+++ b/build/NuGet/Numerics/MathNet.Numerics.nuspec
@@ -6,7 +6,7 @@
Math.NET Numerics
Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net 4 and higher, SL5, WP8 and .NET for Windows Store apps.
Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both. Also includes a portable build supporting .Net 4 and higher, SL5, WP8 and .NET for Windows Store apps.
- Marcus Cuda, Christoph Ruegg, Jurgen Van Gael
+ Christoph Ruegg, Marcus Cuda, Jurgen Van Gael
Christoph Ruegg
http://numerics.mathdotnet.com/
http://www.mathdotnet.com/images/MathNet128.png
@@ -14,7 +14,7 @@
false
math numeric statistics probability integration interpolation linear algebra matrix fft
-
+
\ No newline at end of file
diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj
index 92ab3ce5..c14e48a6 100644
--- a/build/NuGet/nuget.proj
+++ b/build/NuGet/nuget.proj
@@ -17,9 +17,11 @@
-
+
+
-
+
+
@@ -36,11 +38,13 @@
-
+
+
-
+
+
diff --git a/packages/repositories.config b/packages/repositories.config
index dc96c5df..dc9d9a50 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -1,6 +1,5 @@
-
\ No newline at end of file
diff --git a/src/FSharp/BigIntegerExtensions.fs b/src/FSharp/BigIntegerExtensions.fs
index 3260b207..f4ab83bb 100644
--- a/src/FSharp/BigIntegerExtensions.fs
+++ b/src/FSharp/BigIntegerExtensions.fs
@@ -1,6 +1,8 @@
namespace System.Numerics
#if PORTABLE
+#if NOSYSNUMERICS
+#else
open System
@@ -32,3 +34,4 @@ module BigIntegerExtensions =
parse text
#endif
+#endif
diff --git a/src/FSharp/BigRational.fs b/src/FSharp/BigRational.fs
index 3f78da44..d711a4a1 100644
--- a/src/FSharp/BigRational.fs
+++ b/src/FSharp/BigRational.fs
@@ -7,6 +7,9 @@
namespace MathNet.Numerics
+#if NOSYSNUMERICS
+#else
+
open System
open System.Numerics
open System.Globalization
@@ -305,3 +308,5 @@ namespace MathNet.Numerics
let FromInt32 i = BigRational.FromInt i
let FromInt64 (i64:int64) = BigRational.FromBigInt (new BigInteger(i64))
let FromString s = BigRational.Parse s
+
+#endif
diff --git a/src/FSharp/BigRational.fsi b/src/FSharp/BigRational.fsi
index 2b863431..302c364d 100644
--- a/src/FSharp/BigRational.fsi
+++ b/src/FSharp/BigRational.fsi
@@ -4,6 +4,9 @@
namespace MathNet.Numerics
+#if NOSYSNUMERICS
+#else
+
open System
open System.Numerics
@@ -92,3 +95,5 @@ namespace MathNet.Numerics
val FromInt32 : int32 -> BigRational
val FromInt64 : int64 -> BigRational
val FromString : string -> BigRational
+
+#endif
diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj
index 75f345b5..f3aa92ea 100644
--- a/src/FSharp/FSharp.fsproj
+++ b/src/FSharp/FSharp.fsproj
@@ -47,8 +47,8 @@
true
TRACE;STRONGNAME
3
- ..\..\out\lib\Net40\MathNet.Numerics.FSharp.xml
- ..\..\out\lib\Net40\
+ ..\..\out\signed\Net40\MathNet.Numerics.FSharp.xml
+ ..\..\out\signed\Net40\
true
diff --git a/src/FSharpPortable/FSharpPortable.fsproj b/src/FSharp/FSharpPortable.fsproj
similarity index 52%
rename from src/FSharpPortable/FSharpPortable.fsproj
rename to src/FSharp/FSharpPortable.fsproj
index c37bb122..e863a270 100644
--- a/src/FSharpPortable/FSharpPortable.fsproj
+++ b/src/FSharp/FSharpPortable.fsproj
@@ -10,28 +10,39 @@
FSharpPortable
MathNet.Numerics.FSharp
v4.0
- Profile47
FSharpPortable
+ 11
-
- true
- full
+
+ Profile47
+ TRACE;DEBUG;PORTABLE
+ ..\..\out\debug\Portable47\
false
false
- ..\..\out\debug\Portable\
- TRACE;DEBUG;PORTABLE;NOSYSNUMERICS
+ true
+ full
3
-
-
+
-
- pdbonly
+
+ Profile47
+ TRACE;PORTABLE
+ ..\..\out\lib\Portable47\
+ ..\..\out\lib\Portable47\MathNet.Numerics.FSharp.XML
true
true
- ..\..\out\lib\Portable\
+ pdbonly
+ 3
+
+
+ Profile136
TRACE;PORTABLE;NOSYSNUMERICS
+ ..\..\out\lib\Portable136\
+ ..\..\out\lib\Portable136\MathNet.Numerics.FSharp.XML
+ true
+ true
+ pdbonly
3
- ..\..\out\lib\Portable\MathNet.Numerics.FSharp.XML
@@ -41,62 +52,26 @@
-
- AssemblyInfo.fs
-
-
- Random.fs
-
-
- Distributions.fs
-
-
- LinearAlgebra.Matrix.fs
-
-
- LinearAlgebra.Vector.fs
-
-
- Complex.fsi
-
-
- Complex.fs
-
-
- BigIntegerExtensions.fs
-
-
- BigRational.fsi
-
-
- BigRational.fs
-
-
- Fit.fs
-
-
- FindRoots.fs
-
-
- RandomVariable.fs
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Portable
- {d877f358-a2d2-4cc3-a921-8aa5cf6187e8}
+ {49205185-621e-ffb9-2104-887c9f1bbd13}
True
-
- 11
-
-
\ No newline at end of file
diff --git a/src/FSharp/RandomVariable.fs b/src/FSharp/RandomVariable.fs
index 352b7ff4..a0113850 100644
--- a/src/FSharp/RandomVariable.fs
+++ b/src/FSharp/RandomVariable.fs
@@ -2,6 +2,9 @@
#nowarn "40"
+#if NOSYSNUMERICS
+#else
+
open System
open System.Collections
open System.Collections.Generic
@@ -93,3 +96,5 @@ module RandomVariable =
|> map (fst >> List.rev)
let remove items = Seq.filter (fun v -> Seq.forall ((<>) v) items)
+
+#endif
diff --git a/src/FSharpPortableUnitTests/App.config b/src/FSharpPortableUnitTests/App.config
deleted file mode 100644
index d89f1d5b..00000000
--- a/src/FSharpPortableUnitTests/App.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/FSharpPortableUnitTests/packages.config b/src/FSharpPortableUnitTests/packages.config
deleted file mode 100644
index 61d00378..00000000
--- a/src/FSharpPortableUnitTests/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/FSharpUnitTests/BigRationalTests.fs b/src/FSharpUnitTests/BigRationalTests.fs
index d6f2bd5c..376e6dbc 100644
--- a/src/FSharpUnitTests/BigRationalTests.fs
+++ b/src/FSharpUnitTests/BigRationalTests.fs
@@ -3,6 +3,9 @@
namespace MathNet.Numerics.Tests
+#if NOSYSNUMERICS
+#else
+
open MathNet.Numerics
open NUnit.Framework
open System
@@ -598,9 +601,4 @@ type BigNumType() =
Assert.AreEqual(g_negative1.Numerator, g_bigintnegative)
Assert.AreEqual(0N.Numerator, 0I)
- ()
-
-
-
-
-
+#endif
diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj
index dddc6c1c..6cffd845 100644
--- a/src/FSharpUnitTests/FSharpUnitTests.fsproj
+++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj
@@ -36,7 +36,7 @@
true
TRACE
3
- bin\Release-Signed\
+ ..\..\out\test\signed\Net40\
11
diff --git a/src/FSharpPortableUnitTests/FSharpPortableUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj
similarity index 58%
rename from src/FSharpPortableUnitTests/FSharpPortableUnitTests.fsproj
rename to src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj
index 95ed6be1..c65d3307 100644
--- a/src/FSharpPortableUnitTests/FSharpPortableUnitTests.fsproj
+++ b/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj
@@ -11,38 +11,38 @@
FSharpPortableUnitTests
v4.5
FSharpPortableUnitTests
+ 11
-
- true
- full
+
+ DEBUG;TRACE
+ ..\..\out\test\debug\Portable47\
false
false
- ..\..\out\test\debug\Portable\
- DEBUG;TRACE
+ true
+ full
3
-
-
+
-
- pdbonly
+
+ TRACE
+ ..\..\out\test\Portable47\
true
true
- ..\..\out\test\Portable\
- TRACE
+ pdbonly
3
-
-
+
-
- 11
+
+ TRACE;NOSYSNUMERICS
+ ..\..\out\test\Portable136\
+ true
+ true
+ pdbonly
+ 3
+
-
- Portable
- {d877f358-a2d2-4cc3-a921-8aa5cf6187e8}
- True
-
..\..\packages\FsUnit.1.2.1.0\Lib\Net40\FsUnit.NUnit.dll
@@ -55,57 +55,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
FSharpPortable
{f5f14d76-428d-43d7-8431-5b885f1ba419}
True
+
+ Portable
+ {49205185-621e-ffb9-2104-887c9f1bbd13}
+ True
+
-
-
- VectorTests.fs
-
-
- SparseVectorTests.fs
-
-
- DenseVectorTests.fs
-
-
- MatrixTests.fs
-
-
- SparseMatrixTests.fs
-
-
- DenseMatrixTests.fs
-
-
- Utilities.fs
-
-
- BigRationalTests.fs
-
-
- RandomVariableTests.fs
-
-
- PokerTests.fs
-
-
- FitTests.fs
-
-
- FindRootsTests.fs
-
-
-
-
-
\ No newline at end of file
diff --git a/src/FSharpUnitTests/PokerTests.fs b/src/FSharpUnitTests/PokerTests.fs
index 86703f26..12750b94 100644
--- a/src/FSharpUnitTests/PokerTests.fs
+++ b/src/FSharpUnitTests/PokerTests.fs
@@ -1,5 +1,8 @@
module MathNet.Numerics.Tests.PokerTests
+#if NOSYSNUMERICS
+#else
+
open MathNet.Numerics
open MathNet.Numerics.Probability
open NUnit.Framework
@@ -96,3 +99,5 @@ let ``When holding 3 Spades after the flop, than the probability for drawing a f
|> RandomVariable.filter (fun (c1::c2::_) -> suit c1 = Spades && suit c2 = Spades)
|> RandomVariable.probability
|> should equal (10N/47N*9N/46N)
+
+#endif
diff --git a/src/FSharpUnitTests/RandomVariableTests.fs b/src/FSharpUnitTests/RandomVariableTests.fs
index 3d4267a0..b2130220 100644
--- a/src/FSharpUnitTests/RandomVariableTests.fs
+++ b/src/FSharpUnitTests/RandomVariableTests.fs
@@ -1,5 +1,8 @@
module MathNet.Numerics.Tests.RandomVariableTests
+#if NOSYSNUMERICS
+#else
+
open MathNet.Numerics
open MathNet.Numerics.Probability
open NUnit.Framework
@@ -76,4 +79,6 @@ let ``When switching in a MontyHall situation, the chances to win should be 2/3`
montyHallWithSwitch
|> RandomVariable.filter ((=) Car)
|> RandomVariable.probability
- |> should equal (2N/3N)
\ No newline at end of file
+ |> should equal (2N/3N)
+
+#endif
diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj
index 80b7e2ee..428744ad 100644
--- a/src/Numerics/Numerics.csproj
+++ b/src/Numerics/Numerics.csproj
@@ -64,8 +64,8 @@
1591
- ..\..\out\lib\Net40\
- ..\..\out\lib\Net40\MathNet.Numerics.xml
+ ..\..\out\signed\Net40\
+ ..\..\out\signed\Net40\MathNet.Numerics.xml
true
pdbonly
@@ -75,6 +75,7 @@
prompt
4
AllRules.ruleset
+ 1591
@@ -205,9 +206,7 @@
-
- Code
-
+
@@ -344,9 +343,7 @@
-
- Code
-
+
diff --git a/src/Numerics/Portable.csproj b/src/Numerics/Portable.csproj
index d04920fa..9742d922 100644
--- a/src/Numerics/Portable.csproj
+++ b/src/Numerics/Portable.csproj
@@ -5,33 +5,45 @@
10.0
Debug
AnyCPU
- {D877F358-A2D2-4CC3-A921-8AA5CF6187E8}
+ {49205185-621E-FFB9-2104-887C9F1BBD13}
Library
Properties
MathNet.Numerics
MathNet.Numerics
v4.0
- Profile136
512
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
- true
- full
+
+ Profile47
+ TRACE;DEBUG;PORTABLE
+ ..\..\out\debug\Portable47\
false
- ..\..\out\debug\Portable\
- TRACE;DEBUG;PORTABLE;NOSYSNUMERICS
+ full
+ true
prompt
4
-
- pdbonly
+
+ Profile47
+ TRACE;PORTABLE
+ ..\..\out\lib\Portable47\
+ ..\..\out\lib\Portable47\MathNet.Numerics.XML
true
- ..\..\out\lib\Portable\
+ pdbonly
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ Profile136
TRACE;PORTABLE;NOSYSNUMERICS
+ bin\Portable136\
+ ..\..\out\lib\Portable136\MathNet.Numerics.XML
+ true
+ pdbonly
+ AnyCPU
prompt
- 4
- ..\..\out\lib\Portable\MathNet.Numerics.XML
+ MinimumRecommendedRules.ruleset
@@ -55,11 +67,4 @@
-
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index 5bccbf55..ce682207 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -40,7 +40,7 @@
AllRules.ruleset
- ..\..\out\test\Net40\
+ ..\..\out\test\signed\Net40\
true
pdbonly
diff --git a/tools/NuGet/nuget.exe b/tools/NuGet/nuget.exe
index cb3ed036..2c936984 100644
Binary files a/tools/NuGet/nuget.exe and b/tools/NuGet/nuget.exe differ