diff --git a/MathNet.Numerics.All.sln b/MathNet.Numerics.All.sln index a47244d1..7d7683fe 100644 --- a/MathNet.Numerics.All.sln +++ b/MathNet.Numerics.All.sln @@ -38,10 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable328", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable328", "src\UnitTests\UnitTests-Portable328.csproj", "{2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable328", "src\FSharp\FSharp-Portable328.fsproj", "{8A60894F-D090-4FC5-9535-E244E90A44C1}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable328", "src\FSharpUnitTests\FSharpUnitTests-Portable328.fsproj", "{EC24DA9F-8772-491D-BA56-3ADA75072B3D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net35", "Net35", "{14DAACDA-AD68-4AAE-B65F-9F6C60866327}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Net35", "src\Numerics\Numerics-Net35.csproj", "{E54E712D-EB6B-4FBF-B29A-6BB95E719BAC}" @@ -60,6 +56,16 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net35", "src\FSharp\ EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Net35", "src\FSharpUnitTests\FSharpUnitTests-Net35.fsproj", "{8C96F2E9-681B-4201-8BDD-0AA901203725}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable259", "Portable259", "{72E9BD2E-A088-490F-BB54-4D5BFB38134D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable259", "src\Numerics\Numerics-Portable259.csproj", "{1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable259", "src\UnitTests\UnitTests-Portable259.csproj", "{FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable259", "src\FSharp\FSharp-Portable259.fsproj", "{8A60894F-D090-4FC5-9535-E244E90A44C1}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable259", "src\FSharpUnitTests\FSharpUnitTests-Portable259.fsproj", "{EC24DA9F-8772-491D-BA56-3ADA75072B3D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -124,18 +130,6 @@ Global {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release|Any CPU.Build.0 = Release|Any CPU {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release|Any CPU.Build.0 = Release|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release|Any CPU.Build.0 = Release|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release-Signed|Any CPU.Build.0 = Release|Any CPU {E54E712D-EB6B-4FBF-B29A-6BB95E719BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E54E712D-EB6B-4FBF-B29A-6BB95E719BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E54E712D-EB6B-4FBF-B29A-6BB95E719BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -160,6 +154,30 @@ Global {8C96F2E9-681B-4201-8BDD-0AA901203725}.Release|Any CPU.Build.0 = Release|Any CPU {8C96F2E9-681B-4201-8BDD-0AA901203725}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU {8C96F2E9-681B-4201-8BDD-0AA901203725}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release|Any CPU.Build.0 = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release-Signed|Any CPU.Build.0 = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release|Any CPU.Build.0 = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release-Signed|Any CPU.Build.0 = Release|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release|Any CPU.Build.0 = Release|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release-Signed|Any CPU.Build.0 = Release|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release|Any CPU.Build.0 = Release|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D}.Release-Signed|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -171,12 +189,14 @@ Global {90CE8E32-354E-4728-8FE6-87342F469321} = {F60B1B07-8CE4-43C6-B40C-45CF4BE0A743} {1A3065FD-105D-4AF1-85B9-0A4A26FFB353} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} - {8A60894F-D090-4FC5-9535-E244E90A44C1} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} - {EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} {E54E712D-EB6B-4FBF-B29A-6BB95E719BAC} = {14DAACDA-AD68-4AAE-B65F-9F6C60866327} {9014A0CE-725D-4718-918C-923C0CA19FEE} = {14DAACDA-AD68-4AAE-B65F-9F6C60866327} {D5DBCEC0-9D9D-4A62-9EE0-F78E1895D4F4} = {14DAACDA-AD68-4AAE-B65F-9F6C60866327} {8C96F2E9-681B-4201-8BDD-0AA901203725} = {14DAACDA-AD68-4AAE-B65F-9F6C60866327} + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} = {72E9BD2E-A088-490F-BB54-4D5BFB38134D} + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5} = {72E9BD2E-A088-490F-BB54-4D5BFB38134D} + {8A60894F-D090-4FC5-9535-E244E90A44C1} = {72E9BD2E-A088-490F-BB54-4D5BFB38134D} + {EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {72E9BD2E-A088-490F-BB54-4D5BFB38134D} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = src\Numerics\Numerics.csproj diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln index 59aeb708..a11f224b 100644 --- a/MathNet.Numerics.Portable.sln +++ b/MathNet.Numerics.Portable.sln @@ -38,10 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable328", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable328", "src\UnitTests\UnitTests-Portable328.csproj", "{2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable328", "src\FSharp\FSharp-Portable328.fsproj", "{8A60894F-D090-4FC5-9535-E244E90A44C1}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable328", "src\FSharpUnitTests\FSharpUnitTests-Portable328.fsproj", "{EC24DA9F-8772-491D-BA56-3ADA75072B3D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}" ProjectSection(SolutionItems) = preProject build.fsx = build.fsx @@ -49,6 +45,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40 paket.lock = paket.lock EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable259", "Portable259", "{3B1F720C-0004-48DA-81B9-35471057E530}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable259", "src\Numerics\Numerics-Portable259.csproj", "{1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable259", "src\UnitTests\UnitTests-Portable259.csproj", "{FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable259", "src\FSharp\FSharp-Portable259.fsproj", "{8A60894F-D090-4FC5-9535-E244E90A44C1}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable259", "src\FSharpUnitTests\FSharpUnitTests-Portable259.fsproj", "{EC24DA9F-8772-491D-BA56-3ADA75072B3D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -113,6 +119,18 @@ Global {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release|Any CPU.Build.0 = Release|Any CPU {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}.Release-Signed|Any CPU.Build.0 = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release|Any CPU.Build.0 = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3}.Release-Signed|Any CPU.Build.0 = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release|Any CPU.Build.0 = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}.Release-Signed|Any CPU.Build.0 = Release|Any CPU {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A60894F-D090-4FC5-9535-E244E90A44C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {8A60894F-D090-4FC5-9535-E244E90A44C1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -136,8 +154,10 @@ Global {90CE8E32-354E-4728-8FE6-87342F469321} = {F60B1B07-8CE4-43C6-B40C-45CF4BE0A743} {1A3065FD-105D-4AF1-85B9-0A4A26FFB353} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} - {8A60894F-D090-4FC5-9535-E244E90A44C1} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} - {EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} = {3B1F720C-0004-48DA-81B9-35471057E530} + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5} = {3B1F720C-0004-48DA-81B9-35471057E530} + {8A60894F-D090-4FC5-9535-E244E90A44C1} = {3B1F720C-0004-48DA-81B9-35471057E530} + {EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {3B1F720C-0004-48DA-81B9-35471057E530} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = src\Numerics\Numerics.csproj diff --git a/README.md b/README.md index d252e936..74ee1904 100644 --- a/README.md +++ b/README.md @@ -48,13 +48,15 @@ Data/IO Packages for reading and writing data (optional): ### Platform Support and Dependencies - .Net 4.0, .Net 3.5 and Mono: Windows, Linux and Mac. -- PCL Portable Profiles 47 and 328: Windows 8, Silverlight 5, Windows Phone/SL 8, Windows Phone 8.1. +- PCL Portable Profiles 47, 259 and 328: Windows 8, Silverlight 5, Windows Phone/SL 8, Windows Phone 8.1. - Xamarin: Android, iOS Package Dependencies: - .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary) - .Net 4.0 and higher, Mono, PCL Profiles: None +- F# .Net 3.5: additionally [FSharp.Core.4.3.0.0.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.4.3.0.0.Microsoft.Signed +- F# .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed) Framework Dependencies (part of the .NET Framework): diff --git a/build.fsx b/build.fsx index 2d19d359..36b63155 100644 --- a/build.fsx +++ b/build.fsx @@ -83,14 +83,15 @@ type Bundle = let summary = "Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use." let description = "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. " -let support = "Supports .Net 4.0, .Net 3.5 and Mono on Windows, Linux and Mac; Silverlight 5, WindowsPhone/SL 8, WindowsPhone 8.1 and Windows 8 with PCL Portable Profiles 47 and 328; Android/iOS with Xamarin." -let supportFsharp = "Supports F# 3.0 on .Net 4.0, .Net 3.5 and Mono on Windows, Linux and Mac; Silverlight 5, WindowsPhone/SL 8, WindowsPhone 8.1 and Windows 8 with PCL Portable Profiles 47 and 328; Android/iOS with Xamarin." +let support = "Supports .Net 4.0, .Net 3.5 and Mono on Windows, Linux and Mac; Silverlight 5, WindowsPhone/SL 8, WindowsPhone 8.1 and Windows 8 with PCL Portable Profiles 47, 259 and 328; Android/iOS with Xamarin." +let supportFsharp = "Supports F# 3.0 on .Net 4.0, .Net 3.5 and Mono on Windows, Linux and Mac; Silverlight 5, WindowsPhone/SL 8, WindowsPhone 8.1 and Windows 8 with PCL Portable Profiles 47 and 259; Android/iOS with Xamarin." let supportSigned = "Supports .Net 4.0." let tags = "math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft" let libnet35 = "lib/net35" let libnet40 = "lib/net40" let libpcl47 = "lib/portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1" +let libpcl259 = "lib/portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" let libpcl328 = "lib/portable-net40+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" let numericsPack = @@ -111,6 +112,7 @@ let numericsPack = [ @"..\..\out\lib\Net35\MathNet.Numerics.*", Some libnet35, Some @"**\MathNet.Numerics.FSharp.*"; @"..\..\out\lib\Net40\MathNet.Numerics.*", Some libnet40, Some @"**\MathNet.Numerics.FSharp.*"; @"..\..\out\lib\Profile47\MathNet.Numerics.*", Some libpcl47, Some @"**\MathNet.Numerics.FSharp.*"; + @"..\..\out\lib\Profile259\MathNet.Numerics.*", Some libpcl259, Some @"**\MathNet.Numerics.FSharp.*"; @"..\..\out\lib\Profile328\MathNet.Numerics.*", Some libpcl328, Some @"**\MathNet.Numerics.FSharp.*"; @"..\..\src\Numerics\**\*.cs", Some "src/Common", None ] } @@ -135,8 +137,7 @@ let fsharpPack = [ @"..\..\out\lib\Net35\MathNet.Numerics.FSharp.*", Some libnet35, None; @"..\..\out\lib\Net40\MathNet.Numerics.FSharp.*", Some libnet40, None; @"..\..\out\lib\Profile47\MathNet.Numerics.FSharp.*", Some libpcl47, None; - @"..\..\out\lib\Profile328\MathNet.Numerics.FSharp.*", Some libpcl328, None; - @"..\..\out\lib\Profile328\MathNet.Numerics.FSharp.*", Some libpcl328, None; + @"..\..\out\lib\Profile259\MathNet.Numerics.FSharp.*", Some libpcl259, None; @"MathNet.Numerics.fsx", None, None; @"MathNet.Numerics.IfSharp.fsx", None, None; @"..\..\src\FSharp\**\*.fs", Some "src/Common", None ] } @@ -272,8 +273,8 @@ Target "Start" DoNothing Target "Clean" (fun _ -> CleanDirs [ "obj" ] CleanDirs [ "out/api"; "out/docs"; "out/packages" ] - CleanDirs [ "out/lib/Net35"; "out/lib/Net40"; "out/lib/Profile47"; "out/lib/Profile328" ] - CleanDirs [ "out/test/Net35"; "out/test/Net40"; "out/test/Profile47"; "out/test/Profile328" ] + 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-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 d71eea1b..adf54e46 100644 --- a/paket.lock +++ b/paket.lock @@ -3,19 +3,19 @@ NUGET specs: BenchShark (1.0.0) ConsoleDump (0.6.0.1) - FAKE (3.5.5) - FSharp.Compiler.Service (0.0.59) + FAKE (3.7.1) + FSharp.Compiler.Service (0.0.62) FSharp.Core.4.3.0.0.Microsoft.Signed (3.0.0.1) FSharp.Core.Microsoft.Signed (3.1.1.1) - FSharp.Formatting (2.4.25) + FSharp.Formatting (2.4.33) + FSharp.Compiler.Service (>= 0.0.62) Microsoft.AspNet.Razor (2.0.30506.0) RazorEngine (3.3.0) - FSharp.Compiler.Service (>= 0.0.59) FsUnit (1.3.0.1) NUnit (>= 2.6.3) MathNet.Numerics (3.0.0) Microsoft.AspNet.Razor (2.0.30506.0) - NuGet.CommandLine (2.8.2) + NuGet.CommandLine (2.8.3) NUnit (2.6.3) NUnit.Runners (2.6.3) RazorEngine (3.3.0) diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 6b4a750d..1c0e4d57 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -64,45 +64,76 @@ --> - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - + + + + + + + + + + + ..\..\..\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+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 @@ -111,10 +142,10 @@ - + - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll + ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj index a4984ff8..c39eb851 100644 --- a/src/Data/Text/Text.csproj +++ b/src/Data/Text/Text.csproj @@ -60,45 +60,76 @@ --> - - - - ..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - - - - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - + + + + + + + + + + + ..\..\..\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+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 @@ -107,10 +138,10 @@ - + - ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll + ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True diff --git a/src/DataUnitTests/UnitTests.csproj b/src/DataUnitTests/UnitTests.csproj index c5f61f50..4e92c581 100644 --- a/src/DataUnitTests/UnitTests.csproj +++ b/src/DataUnitTests/UnitTests.csproj @@ -109,45 +109,76 @@ --> - - - - ..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll - True - True - - - - - - - ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - - - - - ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll - True - True - - + + + + + + + + + + + ..\..\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+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 @@ -156,10 +187,10 @@ - + - ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll + ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True @@ -167,15 +198,6 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/FSharp/Complex.fs b/src/FSharp/Complex.fs index 9d99ea15..1581a970 100644 --- a/src/FSharp/Complex.fs +++ b/src/FSharp/Complex.fs @@ -118,7 +118,7 @@ module Complex = /// Cosine let cos x = Complex.Cos(x) - /// Tagent + /// Tangent let tan x = Complex.Tan(x) /// Cotangent @@ -141,7 +141,7 @@ module Complex = // numerically more stable than Complex.Acos Trig.Acos(x) - /// Arc Tagent + /// Arc Tangent let atan x = Complex.Atan(x) /// Arc Cotangent @@ -160,7 +160,7 @@ module Complex = /// Hyperbolic Cosine let cosh x = Complex.Cosh(x) - /// Hyperbolic Tagent + /// Hyperbolic Tangent let tanh x = Complex.Tanh(x) /// Hyperbolic Cotangent @@ -179,7 +179,7 @@ module Complex = /// Inverse Hyperbolic Cosine let acosh (x : complex) = Trig.Acosh(x) - /// Inverse Hyperbolic Tagent + /// Inverse Hyperbolic Tangent let atanh (x : complex) = Trig.Atanh(x) /// Inverse Hyperbolic Cotangent @@ -301,7 +301,7 @@ module Complex32 = /// Cosine let cos x = Complex32.Cos(x) - /// Tagent + /// Tangent let tan x = Complex32.Tan(x) /// Cotangent @@ -324,7 +324,7 @@ module Complex32 = // numerically more stable than Complex.Acos ofComplex <| Trig.Acos(x.ToComplex()) - /// Arc Tagent + /// Arc Tangent let atan x = Complex32.Atan(x) /// Arc Cotangent @@ -343,7 +343,7 @@ module Complex32 = /// Hyperbolic Cosine let cosh x = Complex32.Cosh(x) - /// Hyperbolic Tagent + /// Hyperbolic Tangent let tanh x = Complex32.Tanh(x) /// Hyperbolic Cotangent @@ -362,7 +362,7 @@ module Complex32 = /// Inverse Hyperbolic Cosine let acosh (x:complex32) = ofComplex <| Trig.Acosh(x.ToComplex()) - /// Inverse Hyperbolic Tagent + /// Inverse Hyperbolic Tangent let atanh (x:complex32) = ofComplex <| Trig.Atanh(x.ToComplex()) /// Inverse Hyperbolic Cotangent diff --git a/src/FSharp/FSharp-Net35.fsproj b/src/FSharp/FSharp-Net35.fsproj index 5a029089..43273af6 100644 --- a/src/FSharp/FSharp-Net35.fsproj +++ b/src/FSharp/FSharp-Net35.fsproj @@ -89,45 +89,53 @@ - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\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\net35\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\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 @@ -136,7 +144,7 @@ - + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll diff --git a/src/FSharp/FSharp-Portable259.fsproj b/src/FSharp/FSharp-Portable259.fsproj new file mode 100644 index 00000000..55d3eab4 --- /dev/null +++ b/src/FSharp/FSharp-Portable259.fsproj @@ -0,0 +1,176 @@ + + + + + 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 + ..\..\out\lib\Profile259\ + ..\..\obj\lib\Profile259\ + ..\..\obj\lib\Profile259\ + ..\..\out\lib\Profile259\MathNet.Numerics.FSharp.XML + true + true + pdbonly + 3 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + ..\..\out\lib-debug\Profile259\ + ..\..\obj\lib-debug\Profile259\ + ..\..\obj\lib-debug\Profile259\ + false + false + true + full + 3 + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets + + + + + + + + + + + + + + + + + + + + + + + Numerics-Portable259 + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} + + + + + + + + + + + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + \ No newline at end of file diff --git a/src/FSharp/FSharp-Portable328.fsproj b/src/FSharp/FSharp-Portable328.fsproj deleted file mode 100644 index b1ce820c..00000000 --- a/src/FSharp/FSharp-Portable328.fsproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - Debug - AnyCPU - {8A60894F-D090-4FC5-9535-E244E90A44C1} - Library - v4.0 - Profile328 - 2.3.5.0 - MathNet.Numerics.FSharp - MathNet.Numerics - FSharp-Portable328 - - - TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\lib\Profile328\ - ..\..\obj\lib\Profile328\ - ..\..\obj\lib\Profile328\ - ..\..\out\lib\Profile328\MathNet.Numerics.FSharp.XML - true - true - pdbonly - 3 - - - TRACE;DEBUG;PORTABLE;NOSYSNUMERICS - ..\..\out\lib-debug\Profile328\ - ..\..\obj\lib-debug\Profile328\ - ..\..\obj\lib-debug\Profile328\ - false - false - true - full - 3 - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.Portable.FSharp.Targets - - - - - - - - - - - - - - - - - - - - - - - Numerics-Portable328 - {1A3065FD-105D-4AF1-85B9-0A4A26FFB353} - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\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 16855fdb..45eba952 100644 --- a/src/FSharp/FSharp-Portable47.fsproj +++ b/src/FSharp/FSharp-Portable47.fsproj @@ -8,7 +8,7 @@ Library v4.0 Profile47 - 2.3.5.0 + 2.3.5.1 MathNet.Numerics.FSharp MathNet.Numerics FSharp-Portable47 @@ -69,72 +69,101 @@ - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + - + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index f86e1027..2252e735 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -87,72 +87,101 @@ - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + - + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj index 6ca2e9c7..286c718a 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj @@ -88,45 +88,53 @@ - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\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\net35\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\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 @@ -135,7 +143,7 @@ - + ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll @@ -146,44 +154,52 @@ - - - - ..\..\packages\FsUnit\lib\Net20\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\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj new file mode 100644 index 00000000..a7c577f9 --- /dev/null +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable259.fsproj @@ -0,0 +1,248 @@ + + + + + Debug + AnyCPU + {EC24DA9F-8772-491D-BA56-3ADA75072B3D} + Library + FSharpPortableUnitTests + MathNet.Numerics.FSharp.UnitTests259 + v4.5 + FSharpUnitTests-Portable259 + 11 + 4.3.0.0 + ..\..\ + + + TRACE;PORTABLE;NOSYSNUMERICS;NOFSSLICESET1D;NET45REFLECTION + ..\..\out\test\Profile259\ + ..\..\obj\test\Profile259\ + ..\..\obj\test\Profile259\ + true + true + pdbonly + 3 + + + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NOFSSLICESET1D;NET45REFLECTION + ..\..\out\test-debug\Profile259\ + ..\..\obj\test-debug\Profile259\ + ..\..\obj\test-debug\Profile259\ + false + false + true + full + 3 + + + + + + $(DefineConstants);NOFSSLICESET1D + + + + + + + + + + + + + + + + + + + + + + + + + + + FSharp-Portable259 + {8A60894F-D090-4FC5-9535-E244E90A44C1} + + + Numerics-Portable259 + {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 + + + + + + + + + + + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + + + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\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-Portable328.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable328.fsproj deleted file mode 100644 index 33feed75..00000000 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable328.fsproj +++ /dev/null @@ -1,211 +0,0 @@ - - - - - Debug - AnyCPU - {EC24DA9F-8772-491D-BA56-3ADA75072B3D} - Library - FSharpPortableUnitTests - MathNet.Numerics.FSharp.UnitTests328 - v4.5 - FSharpUnitTests-Portable328 - 11 - 4.3.0.0 - ..\..\ - - - TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\test\Profile328\ - ..\..\obj\test\Profile328\ - ..\..\obj\test\Profile328\ - true - true - pdbonly - 3 - - - - - DEBUG;TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\test-debug\Profile328\ - ..\..\obj\test-debug\Profile328\ - ..\..\obj\test-debug\Profile328\ - false - false - true - full - 3 - - - - - - $(DefineConstants);NOFSSLICESET1D - - - - - - - - - - - - - - - - - - - - - - - - - - - FSharp-Portable328 - {8A60894F-D090-4FC5-9535-E244E90A44C1} - - - Numerics-Portable328 - {1A3065FD-105D-4AF1-85B9-0A4A26FFB353} - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\FsUnit\lib\Net20\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\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 a75fd23e..5c74549b 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj @@ -82,72 +82,101 @@ - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + - + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll @@ -158,44 +187,52 @@ - - - - ..\..\packages\FsUnit\lib\Net20\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\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index 1b19b1d6..0e802d18 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -87,72 +87,101 @@ - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + + + + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net40\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+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\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\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.Core.dll + True + True + + + + - + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll @@ -163,44 +192,52 @@ - - - - ..\..\packages\FsUnit\lib\Net20\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\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net20\FsUnit.NUnit.dll + True + True + + + + + + + ..\..\packages\FsUnit\lib\Net40\FsUnit.NUnit.dll + True + True + + + + - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/Numerics/LinearAlgebra/Solvers/SolverSetup.cs b/src/Numerics/LinearAlgebra/Solvers/SolverSetup.cs index 2c6197b4..2c073dd5 100644 --- a/src/Numerics/LinearAlgebra/Solvers/SolverSetup.cs +++ b/src/Numerics/LinearAlgebra/Solvers/SolverSetup.cs @@ -45,11 +45,18 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers /// The types that should not be loaded. public static IEnumerable> LoadFromAssembly(Assembly assembly, bool ignoreFailed = true, params Type[] typesToExclude) { - var excludedTypes = new List(typesToExclude); - var setupInterfaceType = typeof (IIterativeSolverSetup); - var candidates = assembly.GetTypes() +#if NET45REFLECTION + TypeInfo setupInterfaceType = typeof(IIterativeSolverSetup).GetTypeInfo(); + IEnumerable candidates = assembly.DefinedTypes + .Where(typeInfo => !typeInfo.IsAbstract && !typeInfo.IsEnum && !typeInfo.IsInterface && typeInfo.IsVisible) + .Where(setupInterfaceType.IsAssignableFrom) + .Select(typeInfo => typeInfo.GetType()); +#else + Type setupInterfaceType = typeof (IIterativeSolverSetup); + IEnumerable candidates = assembly.GetTypes() .Where(type => !type.IsAbstract && !type.IsEnum && !type.IsInterface && type.IsVisible) .Where(type => type.GetInterfaces().Any(setupInterfaceType.IsAssignableFrom)); +#endif var setups = new List>(); foreach (var type in candidates) @@ -67,9 +74,17 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers } } +#if NET45REFLECTION + var excludedTypes = new List(typesToExclude.Select(type => type.GetTypeInfo())); + return setups + .Where(s => !excludedTypes.Any(t => t.IsAssignableFrom(s.SolverType.GetTypeInfo()) || t.IsAssignableFrom(s.PreconditionerType.GetTypeInfo()))) + .OrderBy(s => s.SolutionSpeed/s.Reliability); +#else + var excludedTypes = new List(typesToExclude); return setups .Where(s => !excludedTypes.Any(t => t.IsAssignableFrom(s.SolverType) || t.IsAssignableFrom(s.PreconditionerType))) .OrderBy(s => s.SolutionSpeed/s.Reliability); +#endif } /// @@ -80,7 +95,11 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers /// The types that should not be loaded. public static IEnumerable> LoadFromAssembly(Type typeInAssembly, bool ignoreFailed = true, params Type[] typesToExclude) { +#if NET45REFLECTION + return LoadFromAssembly(typeInAssembly.GetTypeInfo().Assembly, ignoreFailed, typesToExclude); +#else return LoadFromAssembly(typeInAssembly.Assembly, ignoreFailed, typesToExclude); +#endif } /// @@ -91,7 +110,11 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers /// The types that should not be loaded. public static IEnumerable> LoadFromAssembly(AssemblyName assemblyName, bool ignoreFailed = true, params Type[] typesToExclude) { +#if NET45REFLECTION + return LoadFromAssembly(Assembly.Load(assemblyName), ignoreFailed, typesToExclude); +#else return LoadFromAssembly(Assembly.Load(assemblyName.FullName), ignoreFailed, typesToExclude); +#endif } /// @@ -100,7 +123,7 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers /// The types that should not be loaded. public static IEnumerable> Load(Type[] typesToExclude) { - return LoadFromAssembly(Assembly.GetExecutingAssembly(), false, typesToExclude); + return LoadFromAssembly(typeof(SolverSetup), false, typesToExclude); } /// @@ -108,7 +131,7 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers /// public static IEnumerable> Load() { - return LoadFromAssembly(Assembly.GetExecutingAssembly(), false); + return LoadFromAssembly(typeof(SolverSetup), false); } } } diff --git a/src/Numerics/Numerics-Net35.csproj b/src/Numerics/Numerics-Net35.csproj index 4f18b775..39d4756f 100644 --- a/src/Numerics/Numerics-Net35.csproj +++ b/src/Numerics/Numerics-Net35.csproj @@ -99,23 +99,24 @@ - - - - ..\..\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/Numerics/Numerics-Portable259.csproj b/src/Numerics/Numerics-Portable259.csproj new file mode 100644 index 00000000..e092acaf --- /dev/null +++ b/src/Numerics/Numerics-Portable259.csproj @@ -0,0 +1,64 @@ + + + + + 10.0 + Debug + AnyCPU + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} + Library + Properties + MathNet.Numerics + MathNet.Numerics + v4.5 + Profile259 + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + ..\..\ + + + TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + ..\..\out\lib\Profile259\ + ..\..\obj\lib\Profile259\ + ..\..\obj\lib\Profile259\ + ..\..\out\lib\Profile259\MathNet.Numerics.XML + true + pdbonly + prompt + 4 + AllRules.ruleset + 1591 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + ..\..\out\lib-debug\Profile259\ + ..\..\obj\lib-debug\Profile259\ + ..\..\obj\lib-debug\Profile259\ + false + full + true + prompt + 4 + AllRules.ruleset + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + True + True + Resources.resx + + + + + + + \ No newline at end of file diff --git a/src/Numerics/Properties/AssemblyInfo.cs b/src/Numerics/Properties/AssemblyInfo.cs index 6c56a34b..5a92f4de 100644 --- a/src/Numerics/Properties/AssemblyInfo.cs +++ b/src/Numerics/Properties/AssemblyInfo.cs @@ -54,6 +54,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Math.NET Numerics - Portable Edition")] [assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests")] [assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests47")] +[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests259")] [assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests328")] #elif NET35 diff --git a/src/Numerics/Properties/Resources.Designer.cs b/src/Numerics/Properties/Resources.Designer.cs index 68c42390..6cd31155 100644 --- a/src/Numerics/Properties/Resources.Designer.cs +++ b/src/Numerics/Properties/Resources.Designer.cs @@ -8,6 +8,8 @@ // //------------------------------------------------------------------------------ +using System.Reflection; + namespace MathNet.Numerics.Properties { using System; @@ -38,10 +40,18 @@ namespace MathNet.Numerics.Properties { [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { get { +#if NET45REFLECTION + if (object.ReferenceEquals(resourceMan, null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MathNet.Numerics.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly); + resourceMan = temp; + } +#else if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MathNet.Numerics.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } +#endif return resourceMan; } } diff --git a/src/Performance/Performance.csproj b/src/Performance/Performance.csproj index 3614b12c..ab9f56ab 100644 --- a/src/Performance/Performance.csproj +++ b/src/Performance/Performance.csproj @@ -89,15 +89,6 @@ --> - - - - ..\..\packages\BenchShark\lib\Benchmark.dll - True - True - - - @@ -109,23 +100,26 @@ - - - - ..\..\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/App.config b/src/UnitTests/App.config index 4db4e57f..b24b6130 100644 --- a/src/UnitTests/App.config +++ b/src/UnitTests/App.config @@ -1,18 +1,8 @@  - - -
- - - - - - Managed - - - - + + + diff --git a/src/UnitTests/UnitTests-MKL.csproj b/src/UnitTests/UnitTests-MKL.csproj index 610a5824..64e01f36 100644 --- a/src/UnitTests/UnitTests-MKL.csproj +++ b/src/UnitTests/UnitTests-MKL.csproj @@ -386,15 +386,6 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj index 240b9cf5..faf26395 100644 --- a/src/UnitTests/UnitTests-Net35.csproj +++ b/src/UnitTests/UnitTests-Net35.csproj @@ -344,39 +344,31 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - - - - ..\..\packages\NUnit\lib\nunit.framework.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 + + ..\..\packages\NUnit\lib\nunit.framework.dll True True diff --git a/src/UnitTests/UnitTests-Portable259.csproj b/src/UnitTests/UnitTests-Portable259.csproj new file mode 100644 index 00000000..8f9cf7ca --- /dev/null +++ b/src/UnitTests/UnitTests-Portable259.csproj @@ -0,0 +1,344 @@ + + + + 10.0 + Debug + AnyCPU + {FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5} + Library + Properties + MathNet.Numerics.UnitTests + MathNet.Numerics.UnitTests259 + v4.5 + 512 + ..\..\ + + + TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + ..\..\out\test\Profile259\ + ..\..\obj\test\Profile259\ + ..\..\obj\test\Profile259\ + true + pdbonly + prompt + MinimumRecommendedRules.ruleset + 1591 + 4 + + + TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + ..\..\out\test-debug\Profile259\ + ..\..\obj\test-debug\Profile259\ + ..\..\obj\test-debug\Profile259\ + false + full + true + prompt + 4 + 1591 + + + + + + + + + + + + + + data\Codeplex-5667.csv + PreserveNewest + + + data\Github-Cureos-1.csv + PreserveNewest + + + data\Matlab\A.mat + PreserveNewest + + + data\Matlab\collection-nocompress.mat + PreserveNewest + + + data\Matlab\collection.mat + PreserveNewest + + + data\Matlab\complex.mat + PreserveNewest + + + data\Matlab\sparse-large.mat + PreserveNewest + + + data\Matlab\sparse-small.mat + PreserveNewest + + + data\Matlab\sparse_complex.mat + PreserveNewest + + + data\Matlab\v.mat + PreserveNewest + + + data\NIST\AtmWtAgt.dat + PreserveNewest + + + data\NIST\Bennett5.dat + PreserveNewest + + + data\NIST\BoxBOD.dat + PreserveNewest + + + data\NIST\Chwirut1.dat + PreserveNewest + + + data\NIST\Chwirut2.dat + PreserveNewest + + + data\NIST\DanWood.dat + PreserveNewest + + + data\NIST\Eckerle4.dat + PreserveNewest + + + data\NIST\ENSO.dat + PreserveNewest + + + data\NIST\Filip.dat + PreserveNewest + + + data\NIST\Gauss1.dat + PreserveNewest + + + data\NIST\Gauss2.dat + PreserveNewest + + + data\NIST\Gauss3.dat + PreserveNewest + + + data\NIST\Hahn1.dat + PreserveNewest + + + data\NIST\Kirby2.dat + PreserveNewest + + + data\NIST\Lanczos1.dat + PreserveNewest + + + data\NIST\Lanczos2.dat + PreserveNewest + + + data\NIST\Lanczos3.dat + PreserveNewest + + + data\NIST\Lew.dat + PreserveNewest + + + data\NIST\Longley.dat + PreserveNewest + + + data\NIST\Lottery.dat + PreserveNewest + + + data\NIST\Mavro.dat + PreserveNewest + + + data\NIST\MGH09.dat + PreserveNewest + + + data\NIST\MGH10.dat + PreserveNewest + + + data\NIST\MGH17.dat + PreserveNewest + + + data\NIST\Michelso.dat + PreserveNewest + + + data\NIST\Misra1a.dat + PreserveNewest + + + data\NIST\Misra1b.dat + PreserveNewest + + + data\NIST\Misra1c.dat + PreserveNewest + + + data\NIST\Misra1d.dat + PreserveNewest + + + data\NIST\Nelson.dat + PreserveNewest + + + data\NIST\NoInt1.dat + PreserveNewest + + + data\NIST\NoInt2.dat + PreserveNewest + + + data\NIST\Norris.dat + PreserveNewest + + + data\NIST\NumAcc1.dat + PreserveNewest + + + data\NIST\NumAcc2.dat + PreserveNewest + + + data\NIST\NumAcc3.dat + PreserveNewest + + + data\NIST\NumAcc4.dat + PreserveNewest + + + data\NIST\Pontius.dat + PreserveNewest + + + data\NIST\Rat42.dat + PreserveNewest + + + data\NIST\Rat43.dat + PreserveNewest + + + data\NIST\Roszman1.dat + PreserveNewest + + + data\NIST\SiRstvt.dat + PreserveNewest + + + data\NIST\SmLs01t.dat + PreserveNewest + + + data\NIST\SmLs02t.dat + PreserveNewest + + + data\NIST\SmLs03t.dat + PreserveNewest + + + data\NIST\SmLs04t.dat + PreserveNewest + + + data\NIST\SmLs05t.dat + PreserveNewest + + + data\NIST\SmLs06t.dat + PreserveNewest + + + data\NIST\SmLs07t.dat + PreserveNewest + + + data\NIST\SmLs08t.dat + PreserveNewest + + + data\NIST\SmLs09t.dat + PreserveNewest + + + data\NIST\Thurber.dat + PreserveNewest + + + data\NIST\Wampler1.dat + PreserveNewest + + + data\NIST\Wampler2.dat + PreserveNewest + + + data\NIST\Wampler3.dat + PreserveNewest + + + data\NIST\Wampler4.dat + PreserveNewest + + + data\NIST\Wampler5.dat + PreserveNewest + + + + data\NIST\Meixner.dat + PreserveNewest + + + + + + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} + Numerics-Portable259 + + + + + + + + ..\..\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 427abb10..02f2a2ba 100644 --- a/src/UnitTests/UnitTests-Portable328.csproj +++ b/src/UnitTests/UnitTests-Portable328.csproj @@ -331,15 +331,6 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/UnitTests/UnitTests-Portable47.csproj b/src/UnitTests/UnitTests-Portable47.csproj index 9c78ad1f..668954ae 100644 --- a/src/UnitTests/UnitTests-Portable47.csproj +++ b/src/UnitTests/UnitTests-Portable47.csproj @@ -329,15 +329,6 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index b51e85a8..01dde378 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -672,15 +672,6 @@ - - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - diff --git a/tools/paket/paket.bootstrapper.exe b/tools/paket/paket.bootstrapper.exe index 2da0984c..d0374b8b 100644 Binary files a/tools/paket/paket.bootstrapper.exe and b/tools/paket/paket.bootstrapper.exe differ