From b6e2b0c16e91946111ce016e33ac267329ba168f Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 11:12:34 -0700 Subject: [PATCH 1/6] Hand hack an iOS project --- src/Numerics/Numerics-XamariniOS.csproj | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 src/Numerics/Numerics-XamariniOS.csproj diff --git a/src/Numerics/Numerics-XamariniOS.csproj b/src/Numerics/Numerics-XamariniOS.csproj new file mode 100644 index 00000000..d309a76c --- /dev/null +++ b/src/Numerics/Numerics-XamariniOS.csproj @@ -0,0 +1,70 @@ + + + + Debug + AnyCPU + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3} + Library + MathNet.Numerics + MathNet.Numerics + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Resources + + + true + full + false + bin\Debug + DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION + prompt + 4 + false + true + true + + + + + + true + bin\Release + PORTABLE;NOSYSNUMERICS;NET45REFLECTION + prompt + 4 + false + true + true + + + + + + + + + + + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + True + True + Resources.resx + + + + + + + \ No newline at end of file From 8c7f1dbdf76f9d6cde6efaeb0ae7085c34869a80 Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 11:26:05 -0700 Subject: [PATCH 2/6] Build Xamarin iOS specific version --- MathNet.Numerics.XamariniOSOnly.sln | 17 ++ src/Numerics/Numerics-XamariniOS.csproj | 386 +++++++++++++++++++++++- 2 files changed, 399 insertions(+), 4 deletions(-) create mode 100644 MathNet.Numerics.XamariniOSOnly.sln diff --git a/MathNet.Numerics.XamariniOSOnly.sln b/MathNet.Numerics.XamariniOSOnly.sln new file mode 100644 index 00000000..b8b4e681 --- /dev/null +++ b/MathNet.Numerics.XamariniOSOnly.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-XamariniOS", "src\Numerics\Numerics-XamariniOS.csproj", "{1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/src/Numerics/Numerics-XamariniOS.csproj b/src/Numerics/Numerics-XamariniOS.csproj index d309a76c..015dc5cd 100644 --- a/src/Numerics/Numerics-XamariniOS.csproj +++ b/src/Numerics/Numerics-XamariniOS.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug + ..\..\out\lib-debug\XamariniOS\ DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 @@ -27,10 +27,11 @@ true - bin\Release + ..\..\out\lib\XamariniOS\ PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 + ..\..\out\lib\XamariniOS\MathNet.Numerics.xml false true true @@ -43,6 +44,7 @@ + @@ -55,13 +57,389 @@ - - True True Resources.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a8d9d105cdcf0adef7b690930242b7f087aca8ac Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 11:26:28 -0700 Subject: [PATCH 3/6] Fix .DS_Store entry for macOS --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 15b0563c..831886c2 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,7 @@ UpgradeLog*.htm # OS $RECYCLE.BIN/ -.DS_Store/ +.DS_Store Thumbs.db ehthumbs.db Desktop.ini From 50feb9873b617685a1f98c38b96e40407b214460 Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 14:02:59 -0700 Subject: [PATCH 4/6] Switch to using globs for includes --- src/Numerics/Numerics-XamariniOS.csproj | 388 +----------------------- 1 file changed, 7 insertions(+), 381 deletions(-) diff --git a/src/Numerics/Numerics-XamariniOS.csproj b/src/Numerics/Numerics-XamariniOS.csproj index 015dc5cd..46009c10 100644 --- a/src/Numerics/Numerics-XamariniOS.csproj +++ b/src/Numerics/Numerics-XamariniOS.csproj @@ -15,6 +15,8 @@ full false ..\..\out\lib-debug\XamariniOS\ + ..\..\obj\lib-debug\XamariniOS\ + ..\..\obj\lib-debug\XamariniOS\ DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 @@ -26,8 +28,11 @@ + true true ..\..\out\lib\XamariniOS\ + ..\..\obj\lib\XamariniOS\ + ..\..\obj\lib\XamariniOS\ PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 @@ -57,392 +62,13 @@ + + True True Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 32b095b0aa77425aa0944a8b176d081007114881 Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 14:17:19 -0700 Subject: [PATCH 5/6] Add FSharp Xamarin.iOS project --- MathNet.Numerics.XamariniOSOnly.sln | 6 ++ src/FSharp/FSharp-XamariniOS.fsproj | 81 +++++++++++++++++++++++++ src/Numerics/Numerics-XamariniOS.csproj | 1 + 3 files changed, 88 insertions(+) create mode 100644 src/FSharp/FSharp-XamariniOS.fsproj diff --git a/MathNet.Numerics.XamariniOSOnly.sln b/MathNet.Numerics.XamariniOSOnly.sln index b8b4e681..8fe99ad4 100644 --- a/MathNet.Numerics.XamariniOSOnly.sln +++ b/MathNet.Numerics.XamariniOSOnly.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-XamariniOS", "src\Numerics\Numerics-XamariniOS.csproj", "{1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}" EndProject +Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FSharp-XamariniOS", "src\FSharp\FSharp-XamariniOS.fsproj", "{F5F14E76-428D-43D7-8431-5B895F1BA419}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,5 +15,9 @@ Global {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3}.Release|Any CPU.Build.0 = Release|Any CPU + {F5F14E76-428D-43D7-8431-5B895F1BA419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5F14E76-428D-43D7-8431-5B895F1BA419}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5F14E76-428D-43D7-8431-5B895F1BA419}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5F14E76-428D-43D7-8431-5B895F1BA419}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/FSharp/FSharp-XamariniOS.fsproj b/src/FSharp/FSharp-XamariniOS.fsproj new file mode 100644 index 00000000..652f566f --- /dev/null +++ b/src/FSharp/FSharp-XamariniOS.fsproj @@ -0,0 +1,81 @@ + + + + FSharp-XamariniOS + MathNet.Numerics.FSharp + MathNet.Numerics + Library + Debug + AnyCPU + {F5F14E76-428D-43D7-8431-5B895F1BA419} + {FEACFBD2-3405-455C-9665-78FE426C6842};{F2A71F9B-5D33-465A-A702-920D77279786} + Resources + ..\..\obj\lib-debug\XamariniOS + + + TRACE;PORTABLE + ..\..\out\lib\XamariniOS\ + ..\..\obj\lib\XamariniOS\ + ..\..\obj\lib\XamariniOS\ + ..\..\out\lib\XamariniOS\MathNet.Numerics.FSharp.XML + true + true + true + full + 3 + true + true + + + TRACE;DEBUG;PORTABLE + ..\..\out\lib-debug\XamariniOS\ + ..\..\obj\lib-debug\XamariniOS\ + ..\..\obj\lib-debug\XamariniOS\ + false + false + true + full + 3 + false + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3} + Numerics-XamariniOS + + + + \ No newline at end of file diff --git a/src/Numerics/Numerics-XamariniOS.csproj b/src/Numerics/Numerics-XamariniOS.csproj index 46009c10..b404c5c1 100644 --- a/src/Numerics/Numerics-XamariniOS.csproj +++ b/src/Numerics/Numerics-XamariniOS.csproj @@ -9,6 +9,7 @@ MathNet.Numerics {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Resources + ..\..\obj\lib-debug\XamariniOS true From ffe7cd71f86e50b63589fbec61aa9876211a691e Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Sat, 9 Jul 2016 14:18:22 -0700 Subject: [PATCH 6/6] Replace bigint.Negate because it doesn't exist in Xamarin --- src/FSharp/BigIntegerExtensions.fs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/FSharp/BigIntegerExtensions.fs b/src/FSharp/BigIntegerExtensions.fs index 9696a61e..e3aff48d 100644 --- a/src/FSharp/BigIntegerExtensions.fs +++ b/src/FSharp/BigIntegerExtensions.fs @@ -27,8 +27,7 @@ module BigIntegerExtensions = raise <| FormatException ("The value could not be parsed.") if str.[0] = '-' then - parseImpl str len 0I 1 - |> bigint.Negate + -(parseImpl str len 0I 1) else parseImpl str len 0I 0