diff --git a/MathNet.Numerics.All.sln b/MathNet.Numerics.All.sln index 01598578..40e67c8c 100644 --- a/MathNet.Numerics.All.sln +++ b/MathNet.Numerics.All.sln @@ -13,35 +13,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F374 RELEASENOTES.md = RELEASENOTES.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "src\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Net40", "build\Numerics-Net40.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp", "src\FSharp\FSharp.fsproj", "{37E8E802-A354-4114-BFC1-6E1357DA605B}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net40", "build\FSharp-Net40.fsproj", "{37E8E802-A354-4114-BFC1-6E1357DA605B}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests", "src\FSharpUnitTests\FSharpUnitTests.fsproj", "{F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Net40", "build\FSharpUnitTests-Net40.fsproj", "{F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\UnitTests.csproj", "{DAF07AA8-C5C9-4963-98F7-2C3285064DAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Net40", "build\UnitTests-Net40.csproj", "{DAF07AA8-C5C9-4963-98F7-2C3285064DAD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable47", "Portable47", "{F60B1B07-8CE4-43C6-B40C-45CF4BE0A743}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable47", "src\Numerics\Numerics-Portable47.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable47", "build\Numerics-Portable47.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable47", "src\FSharp\FSharp-Portable47.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Portable47", "build\FSharp-Portable47.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable47", "src\UnitTests\UnitTests-Portable47.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable47", "build\UnitTests-Portable47.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable47", "src\FSharpUnitTests\FSharpUnitTests-Portable47.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Portable47", "build\FSharpUnitTests-Portable47.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable328", "Portable328", "{9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable328", "src\Numerics\Numerics-Portable328.csproj", "{1A3065FD-105D-4AF1-85B9-0A4A26FFB353}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable328", "build\Numerics-Portable328.csproj", "{1A3065FD-105D-4AF1-85B9-0A4A26FFB353}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable328", "src\UnitTests\UnitTests-Portable328.csproj", "{2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable328", "build\UnitTests-Portable328.csproj", "{2B6BE5F8-843E-4E36-8B8E-9CA3C9503198}" 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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Net35", "build\Numerics-Net35.csproj", "{E54E712D-EB6B-4FBF-B29A-6BB95E719BAC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Net35", "src\UnitTests\UnitTests-Net35.csproj", "{9014A0CE-725D-4718-918C-923C0CA19FEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Net35", "build\UnitTests-Net35.csproj", "{9014A0CE-725D-4718-918C-923C0CA19FEE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}" ProjectSection(SolutionItems) = preProject @@ -51,34 +51,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40 paket.lock = paket.lock EndProjectSection EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net35", "src\FSharp\FSharp-Net35.fsproj", "{D5DBCEC0-9D9D-4A62-9EE0-F78E1895D4F4}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net35", "build\FSharp-Net35.fsproj", "{D5DBCEC0-9D9D-4A62-9EE0-F78E1895D4F4}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Net35", "src\FSharpUnitTests\FSharpUnitTests-Net35.fsproj", "{8C96F2E9-681B-4201-8BDD-0AA901203725}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTests-Net35", "build\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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable259", "build\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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable259", "build\UnitTests-Portable259.csproj", "{FCB9D3B5-FEFF-4ACB-BDA9-2FA4AB7E85E5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable7", "Portable7", "{021F915C-C0E3-468B-A183-5FCF1DEC3754}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable7", "src\Numerics\Numerics-Portable7.csproj", "{25E6E93B-56A2-4F14-8458-03665F122B3F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable7", "build\Numerics-Portable7.csproj", "{25E6E93B-56A2-4F14-8458-03665F122B3F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable78", "Portable78", "{5351407F-74BA-4850-A3E7-D5C2BACEF419}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable78", "src\Numerics\Numerics-Portable78.csproj", "{2EBD6F22-9BD6-4AF2-A21B-7198C9C5571F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-Portable78", "build\Numerics-Portable78.csproj", "{2EBD6F22-9BD6-4AF2-A21B-7198C9C5571F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable7", "src\UnitTests\UnitTests-Portable7.csproj", "{B170F78B-8C95-4C6A-A437-F05D9302B0B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable7", "build\UnitTests-Portable7.csproj", "{B170F78B-8C95-4C6A-A437-F05D9302B0B3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable78", "src\UnitTests\UnitTests-Portable78.csproj", "{2769BADC-02D9-48D9-88B4-C7E1C064BDF2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-Portable78", "build\UnitTests-Portable78.csproj", "{2769BADC-02D9-48D9-88B4-C7E1C064BDF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestData-Net35", "build\TestData-Net35.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetStandard", "NetStandard", "{DEB3950D-8280-4E85-9003-E155C241993F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics-NetStandard", "src\Numerics\Numerics-NetStandard.csproj", "{CD54C200-6E8C-4820-96B9-26497C689D64}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net40", "Net40", "{5AB8C662-ECCB-44BD-90F1-C66898E48C41}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -220,6 +222,10 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {B7CAE5F4-A23F-4438-B5BE-41226618B695} = {5AB8C662-ECCB-44BD-90F1-C66898E48C41} + {37E8E802-A354-4114-BFC1-6E1357DA605B} = {5AB8C662-ECCB-44BD-90F1-C66898E48C41} + {F2F8032B-A31D-4E33-A05E-F2CDCBFAA75D} = {5AB8C662-ECCB-44BD-90F1-C66898E48C41} + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD} = {5AB8C662-ECCB-44BD-90F1-C66898E48C41} {49205185-621E-FFB9-2104-887C9F1BBD13} = {F60B1B07-8CE4-43C6-B40C-45CF4BE0A743} {F5F14D76-428D-43D7-8431-5B885F1BA419} = {F60B1B07-8CE4-43C6-B40C-45CF4BE0A743} {0672ED13-CE61-4D3C-B879-282472817235} = {F60B1B07-8CE4-43C6-B40C-45CF4BE0A743} diff --git a/src/FSharp/FSharp-Net35.fsproj b/build/FSharp-Net35.fsproj similarity index 63% rename from src/FSharp/FSharp-Net35.fsproj rename to build/FSharp-Net35.fsproj index 0de84ce5..8274613d 100644 --- a/src/FSharp/FSharp-Net35.fsproj +++ b/build/FSharp-Net35.fsproj @@ -10,17 +10,17 @@ {d5dbcec0-9d9d-4a62-9ee0-f78e1895d4f4} v3.5 4.3.0.0 - ..\..\ - ..\MathNet.Numerics.snk + ..\ + ..\src\MathNet.Numerics.snk pdbonly true true - ..\..\out\lib\Net35\ - ..\..\obj\lib\Net35\ - ..\..\obj\lib\Net35\ - ..\..\out\lib\Net35\MathNet.Numerics.FSharp.xml + ..\out\lib\Net35\ + ..\obj\lib\Net35\ + ..\obj\lib\Net35\ + ..\out\lib\Net35\MathNet.Numerics.FSharp.xml TRACE;NET35;NOSYSNUMERICS 3 @@ -30,9 +30,9 @@ full false false - ..\..\out\lib-debug\Net35\ - ..\..\obj\lib-debug\Net35\ - ..\..\obj\lib-debug\Net35\ + ..\out\lib-debug\Net35\ + ..\obj\lib-debug\Net35\ + ..\obj\lib-debug\Net35\ TRACE;DEBUG;NET35;NOSYSNUMERICS 3 @@ -43,10 +43,10 @@ true TRACE;NET35;NOSYSNUMERICS;STRONGNAME 3 - ..\..\out\lib-signed\Net35\ - ..\..\obj\lib-signed\Net35\ - ..\..\obj\lib-signed\Net35\ - ..\..\out\lib-signed\Net35\MathNet.Numerics.FSharp.xml + ..\out\lib-signed\Net35\ + ..\obj\lib-signed\Net35\ + ..\obj\lib-signed\Net35\ + ..\out\lib-signed\Net35\MathNet.Numerics.FSharp.xml true @@ -58,24 +58,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -86,7 +86,7 @@ - + Numerics-Net35 {e54e712d-eb6b-4fbf-b29a-6bb95e719bac} True @@ -96,11 +96,11 @@ - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True - \ No newline at end of file + diff --git a/src/FSharp/FSharp-Net35.fsproj.paket.references b/build/FSharp-Net35.fsproj.paket.references similarity index 100% rename from src/FSharp/FSharp-Net35.fsproj.paket.references rename to build/FSharp-Net35.fsproj.paket.references diff --git a/src/FSharp/FSharp.fsproj b/build/FSharp-Net40.fsproj similarity index 69% rename from src/FSharp/FSharp.fsproj rename to build/FSharp-Net40.fsproj index f7a88cce..fafef77d 100644 --- a/src/FSharp/FSharp.fsproj +++ b/build/FSharp-Net40.fsproj @@ -10,17 +10,17 @@ {37E8E802-A354-4114-BFC1-6E1357DA605B} v4.0 4.3.0.0 - ..\..\ + ..\ ..\MathNet.Numerics.snk pdbonly true true - ..\..\out\lib\Net40\ - ..\..\obj\lib\Net40\ - ..\..\obj\lib\Net40\ - ..\..\out\lib\Net40\MathNet.Numerics.FSharp.xml + ..\out\lib\Net40\ + ..\obj\lib\Net40\ + ..\obj\lib\Net40\ + ..\out\lib\Net40\MathNet.Numerics.FSharp.xml TRACE 3 @@ -30,9 +30,9 @@ full false false - ..\..\out\lib-debug\Net40\ - ..\..\obj\lib-debug\Net40\ - ..\..\obj\lib-debug\Net40\ + ..\out\lib-debug\Net40\ + ..\obj\lib-debug\Net40\ + ..\obj\lib-debug\Net40\ TRACE;DEBUG 3 @@ -43,10 +43,10 @@ true TRACE;STRONGNAME 3 - ..\..\out\lib-signed\Net40\ - ..\..\obj\lib-signed\Net40\ - ..\..\obj\lib-signed\Net40\ - ..\..\out\lib-signed\Net40\MathNet.Numerics.FSharp.xml + ..\out\lib-signed\Net40\ + ..\obj\lib-signed\Net40\ + ..\obj\lib-signed\Net40\ + ..\out\lib-signed\Net40\MathNet.Numerics.FSharp.xml true @@ -58,33 +58,33 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - Numerics + + Numerics-Net40 {B7CAE5F4-A23F-4438-B5BE-41226618B695} @@ -92,7 +92,7 @@ - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll True True @@ -101,7 +101,7 @@ - ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll True True @@ -110,7 +110,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll True True @@ -119,7 +119,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll True True @@ -128,7 +128,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True @@ -137,7 +137,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True @@ -146,11 +146,11 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True - \ No newline at end of file + diff --git a/src/FSharp/FSharp-Portable47.fsproj b/build/FSharp-Portable47.fsproj similarity index 72% rename from src/FSharp/FSharp-Portable47.fsproj rename to build/FSharp-Portable47.fsproj index 175766e7..25b113e6 100644 --- a/src/FSharp/FSharp-Portable47.fsproj +++ b/build/FSharp-Portable47.fsproj @@ -12,14 +12,14 @@ v4.0 Profile47 2.3.5.1 - ..\..\ + ..\ TRACE;PORTABLE - ..\..\out\lib\Profile47\ - ..\..\obj\lib\Profile47\ - ..\..\obj\lib\Profile47\ - ..\..\out\lib\Profile47\MathNet.Numerics.FSharp.XML + ..\out\lib\Profile47\ + ..\obj\lib\Profile47\ + ..\obj\lib\Profile47\ + ..\out\lib\Profile47\MathNet.Numerics.FSharp.XML true true pdbonly @@ -27,9 +27,9 @@ TRACE;DEBUG;PORTABLE - ..\..\out\lib-debug\Profile47\ - ..\..\obj\lib-debug\Profile47\ - ..\..\obj\lib-debug\Profile47\ + ..\out\lib-debug\Profile47\ + ..\obj\lib-debug\Profile47\ + ..\obj\lib-debug\Profile47\ false false true @@ -46,26 +46,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + Numerics-Portable47 {49205185-621E-FFB9-2104-887C9F1BBD13} @@ -74,7 +74,7 @@ - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll True True @@ -83,7 +83,7 @@ - ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll True True @@ -92,7 +92,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll True True @@ -101,7 +101,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll True True @@ -110,7 +110,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True @@ -119,7 +119,7 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True @@ -128,11 +128,11 @@ - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True - \ No newline at end of file + diff --git a/src/FSharp/FSharp-XamariniOS.fsproj b/build/FSharp-XamariniOS.fsproj similarity index 56% rename from src/FSharp/FSharp-XamariniOS.fsproj rename to build/FSharp-XamariniOS.fsproj index 652f566f..70f8c0e2 100644 --- a/src/FSharp/FSharp-XamariniOS.fsproj +++ b/build/FSharp-XamariniOS.fsproj @@ -10,14 +10,14 @@ {F5F14E76-428D-43D7-8431-5B895F1BA419} {FEACFBD2-3405-455C-9665-78FE426C6842};{F2A71F9B-5D33-465A-A702-920D77279786} Resources - ..\..\obj\lib-debug\XamariniOS + ..\obj\lib-debug\XamariniOS TRACE;PORTABLE - ..\..\out\lib\XamariniOS\ - ..\..\obj\lib\XamariniOS\ - ..\..\obj\lib\XamariniOS\ - ..\..\out\lib\XamariniOS\MathNet.Numerics.FSharp.XML + ..\out\lib\XamariniOS\ + ..\obj\lib\XamariniOS\ + ..\obj\lib\XamariniOS\ + ..\out\lib\XamariniOS\MathNet.Numerics.FSharp.XML true true true @@ -28,9 +28,9 @@ TRACE;DEBUG;PORTABLE - ..\..\out\lib-debug\XamariniOS\ - ..\..\obj\lib-debug\XamariniOS\ - ..\..\obj\lib-debug\XamariniOS\ + ..\out\lib-debug\XamariniOS\ + ..\obj\lib-debug\XamariniOS\ + ..\obj\lib-debug\XamariniOS\ false false true @@ -50,32 +50,32 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + {1C8DCFB2-DB75-4C4B-888B-4AF315FCE3C3} Numerics-XamariniOS - \ No newline at end of file + diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj b/build/FSharpUnitTests-Net35.fsproj similarity index 75% rename from src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj rename to build/FSharpUnitTests-Net35.fsproj index 46a2b08c..db72f979 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj +++ b/build/FSharpUnitTests-Net35.fsproj @@ -11,15 +11,15 @@ v3.5 4.3.0.0 11 - ..\..\ + ..\ pdbonly true true - ..\..\out\test\Net35\ - ..\..\obj\test\Net35\ - ..\..\obj\test\Net35\ + ..\out\test\Net35\ + ..\obj\test\Net35\ + ..\obj\test\Net35\ TRACE;NET35;NOSYSNUMERICS 3 @@ -28,9 +28,9 @@ full false false - ..\..\out\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ + ..\out\test-debug\Net35\ + ..\obj\test-debug\Net35\ + ..\obj\test-debug\Net35\ DEBUG;TRACE;NET35;NOSYSNUMERICS 3 @@ -40,9 +40,9 @@ true TRACE;NET35;NOSYSNUMERICS 3 - ..\..\out\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ + ..\out\test-signed\Net35\ + ..\obj\test-signed\Net35\ + ..\obj\test-signed\Net35\ @@ -56,29 +56,29 @@ - + True paket-files/FsUnit.fs - + True paket-files/FsUnitTyped.fs - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -86,18 +86,18 @@ - + Numerics-Net35 {e54e712d-eb6b-4fbf-b29a-6bb95e719bac} True - + FSharp-Net35 {d5dbcec0-9d9d-4a62-9ee0-f78e1895d4f4} True - - TestData + + TestData-Net35 {af3253c9-4db5-45a0-98cf-c105fda9da47} True @@ -106,7 +106,7 @@ - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True @@ -117,7 +117,7 @@ - ..\..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll True True @@ -126,7 +126,7 @@ - ..\..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll True True @@ -135,7 +135,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll True True @@ -144,7 +144,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll True True @@ -153,7 +153,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True @@ -162,7 +162,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True @@ -171,7 +171,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True @@ -182,12 +182,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -196,7 +196,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -205,7 +205,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -214,7 +214,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -223,11 +223,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references b/build/FSharpUnitTests-Net35.fsproj.paket.references similarity index 100% rename from src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references rename to build/FSharpUnitTests-Net35.fsproj.paket.references diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/build/FSharpUnitTests-Net40.fsproj similarity index 74% rename from src/FSharpUnitTests/FSharpUnitTests.fsproj rename to build/FSharpUnitTests-Net40.fsproj index f2ade658..5b3f54d5 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/build/FSharpUnitTests-Net40.fsproj @@ -13,15 +13,15 @@ v4.5 4.3.0.0 11 - ..\..\ + ..\ pdbonly true true - ..\..\out\test\Net40\ - ..\..\obj\test\Net40\ - ..\..\obj\test\Net40\ + ..\out\test\Net40\ + ..\obj\test\Net40\ + ..\obj\test\Net40\ TRACE 3 @@ -30,9 +30,9 @@ full false false - ..\..\out\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ + ..\out\test-debug\Net40\ + ..\obj\test-debug\Net40\ + ..\obj\test-debug\Net40\ DEBUG;TRACE 3 @@ -42,20 +42,20 @@ true TRACE 3 - ..\..\out\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ + ..\out\test-signed\Net40\ + ..\obj\test-signed\Net40\ + ..\obj\test-signed\Net40\ $(DefineConstants);NOFSSLICESET1D - + True paket-files/FsUnit.fs - + True paket-files/FsUnitTyped.fs @@ -65,37 +65,37 @@ - - Numerics + + Numerics-Net40 {B7CAE5F4-A23F-4438-B5BE-41226618B695} - - FSharp + + FSharp-Net40 {37E8E802-A354-4114-BFC1-6E1357DA605B} - - TestData + + TestData-Net35 {af3253c9-4db5-45a0-98cf-c105fda9da47} True - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets @@ -108,7 +108,7 @@ - ..\..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll True True @@ -117,7 +117,7 @@ - ..\..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll True True @@ -126,7 +126,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll True True @@ -135,7 +135,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll True True @@ -144,7 +144,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True @@ -153,7 +153,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True @@ -162,7 +162,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True @@ -173,12 +173,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -187,7 +187,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -196,7 +196,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -205,7 +205,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -214,11 +214,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj b/build/FSharpUnitTests-Portable47.fsproj similarity index 76% rename from src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj rename to build/FSharpUnitTests-Portable47.fsproj index 05b09c4b..333ea198 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj +++ b/build/FSharpUnitTests-Portable47.fsproj @@ -14,13 +14,13 @@ v4.5 4.3.0.0 11 - ..\..\ + ..\ TRACE;PORTABLE;NOFSSLICESET1D - ..\..\out\test\Profile47\ - ..\..\obj\test\Profile47\ - ..\..\obj\test\Profile47\ + ..\out\test\Profile47\ + ..\obj\test\Profile47\ + ..\obj\test\Profile47\ true true pdbonly @@ -30,9 +30,9 @@ DEBUG;TRACE;PORTABLE;NOFSSLICESET1D - ..\..\out\test-debug\Profile47\ - ..\..\obj\test-debug\Profile47\ - ..\..\obj\test-debug\Profile47\ + ..\out\test-debug\Profile47\ + ..\obj\test-debug\Profile47\ + ..\obj\test-debug\Profile47\ false false true @@ -42,11 +42,11 @@ - + True paket-files/FsUnit.fs - + True paket-files/FsUnitTyped.fs @@ -56,36 +56,36 @@ - + Numerics-Portable47 {49205185-621E-FFB9-2104-887C9F1BBD13} - + FSharp-Portable47 {F5F14D76-428D-43D7-8431-5B885F1BA419} - - TestData + + TestData-Net35 {af3253c9-4db5-45a0-98cf-c105fda9da47} True - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets @@ -98,7 +98,7 @@ - ..\..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net20\FSharp.Core.dll True True @@ -107,7 +107,7 @@ - ..\..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\net40\FSharp.Core.dll True True @@ -116,7 +116,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll True True @@ -125,7 +125,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll True True @@ -134,7 +134,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True @@ -143,7 +143,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True @@ -152,7 +152,7 @@ - ..\..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\packages\test\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True @@ -163,12 +163,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -177,7 +177,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -186,7 +186,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -195,7 +195,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -204,11 +204,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Net35.csproj b/build/Numerics-Net35.csproj similarity index 74% rename from src/Numerics/Numerics-Net35.csproj rename to build/Numerics-Net35.csproj index 29d7f096..dbf40efb 100644 --- a/src/Numerics/Numerics-Net35.csproj +++ b/build/Numerics-Net35.csproj @@ -13,7 +13,6 @@ false - publish\ true Disk false @@ -28,14 +27,14 @@ false true - ..\MathNet.Numerics.snk - ..\..\ + ..\src\MathNet.Numerics.snk + ..\ - ..\..\out\lib\Net35\ - ..\..\obj\lib\Net35\ - ..\..\obj\lib\Net35\ - ..\..\out\lib\Net35\MathNet.Numerics.xml + ..\out\lib\Net35\ + ..\obj\lib\Net35\ + ..\obj\lib\Net35\ + ..\out\lib\Net35\MathNet.Numerics.xml pdbonly true @@ -47,9 +46,9 @@ 5 - ..\..\out\lib-debug\Net35\ - ..\..\obj\lib-debug\Net35\ - ..\..\obj\lib-debug\Net35\ + ..\out\lib-debug\Net35\ + ..\obj\lib-debug\Net35\ + ..\obj\lib-debug\Net35\ true full @@ -61,10 +60,10 @@ 5 - ..\..\out\lib-signed\Net35\ - ..\..\obj\lib-signed\Net35\ - ..\..\obj\lib-signed\Net35\ - ..\..\out\lib-signed\Net35\MathNet.Numerics.xml + ..\out\lib-signed\Net35\ + ..\obj\lib-signed\Net35\ + ..\obj\lib-signed\Net35\ + ..\out\lib-signed\Net35\MathNet.Numerics.xml true pdbonly @@ -83,19 +82,19 @@ - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx @@ -106,11 +105,11 @@ - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Net35.csproj.paket.references b/build/Numerics-Net35.csproj.paket.references similarity index 100% rename from src/Numerics/Numerics-Net35.csproj.paket.references rename to build/Numerics-Net35.csproj.paket.references diff --git a/build/Numerics-Net40.csproj b/build/Numerics-Net40.csproj new file mode 100644 index 00000000..10590fc3 --- /dev/null +++ b/build/Numerics-Net40.csproj @@ -0,0 +1,480 @@ + + + + Debug + AnyCPU + {B7CAE5F4-A23F-4438-B5BE-41226618B695} + Library + Properties + MathNet.Numerics + MathNet.Numerics + v4.0 + 512 + + false + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + ..\MathNet.Numerics.snk + ..\ + + + ..\out\lib\Net40\ + ..\obj\lib\Net40\ + ..\obj\lib\Net40\ + ..\out\lib\Net40\MathNet.Numerics.xml + + pdbonly + true + TRACE;NATIVE + prompt + 4 + AllRules.ruleset + 1591 + 5 + + + ..\out\lib-debug\Net40\ + ..\obj\lib-debug\Net40\ + ..\obj\lib-debug\Net40\ + + true + full + false + TRACE;DEBUG;NATIVE + prompt + 4 + AllRules.ruleset + 5 + + + ..\out\lib-signed\Net40\ + ..\obj\lib-signed\Net40\ + ..\obj\lib-signed\Net40\ + ..\out\lib-signed\Net40\MathNet.Numerics.xml + + true + pdbonly + AnyCPU + true + TRACE;NATIVE;STRONGNAME + prompt + 4 + AllRules.ruleset + 1591 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + ..\src\Numerics\Resources.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PublicResXFileCodeGenerator + Designer + ..\src\Numerics\Resources.Designer.cs + + + + diff --git a/src/Numerics/Numerics-Portable259.csproj b/build/Numerics-Portable259.csproj similarity index 72% rename from src/Numerics/Numerics-Portable259.csproj rename to build/Numerics-Portable259.csproj index a51a5b61..99b7508a 100644 --- a/src/Numerics/Numerics-Portable259.csproj +++ b/build/Numerics-Portable259.csproj @@ -14,14 +14,14 @@ 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 + ..\out\lib\Profile259\ + ..\obj\lib\Profile259\ + ..\obj\lib\Profile259\ + ..\out\lib\Profile259\MathNet.Numerics.XML true pdbonly prompt @@ -32,9 +32,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\lib-debug\Profile259\ - ..\..\obj\lib-debug\Profile259\ - ..\..\obj\lib-debug\Profile259\ + ..\out\lib-debug\Profile259\ + ..\obj\lib-debug\Profile259\ + ..\obj\lib-debug\Profile259\ false full true @@ -44,23 +44,23 @@ 5 - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Portable328.csproj b/build/Numerics-Portable328.csproj similarity index 72% rename from src/Numerics/Numerics-Portable328.csproj rename to build/Numerics-Portable328.csproj index 58c6c792..ffe1f14f 100644 --- a/src/Numerics/Numerics-Portable328.csproj +++ b/build/Numerics-Portable328.csproj @@ -14,14 +14,14 @@ Profile328 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\ + ..\ TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\lib\Profile328\ - ..\..\obj\lib\Profile328\ - ..\..\obj\lib\Profile328\ - ..\..\out\lib\Profile328\MathNet.Numerics.XML + ..\out\lib\Profile328\ + ..\obj\lib\Profile328\ + ..\obj\lib\Profile328\ + ..\out\lib\Profile328\MathNet.Numerics.XML true pdbonly prompt @@ -32,9 +32,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS - ..\..\out\lib-debug\Profile328\ - ..\..\obj\lib-debug\Profile328\ - ..\..\obj\lib-debug\Profile328\ + ..\out\lib-debug\Profile328\ + ..\obj\lib-debug\Profile328\ + ..\obj\lib-debug\Profile328\ false full true @@ -44,23 +44,23 @@ 5 - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Portable47.csproj b/build/Numerics-Portable47.csproj similarity index 72% rename from src/Numerics/Numerics-Portable47.csproj rename to build/Numerics-Portable47.csproj index 6b0f79a8..2e2eb088 100644 --- a/src/Numerics/Numerics-Portable47.csproj +++ b/build/Numerics-Portable47.csproj @@ -14,14 +14,14 @@ Profile47 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\ + ..\ TRACE;PORTABLE - ..\..\out\lib\Profile47\ - ..\..\obj\lib\Profile47\ - ..\..\obj\lib\Profile47\ - ..\..\out\lib\Profile47\MathNet.Numerics.XML + ..\out\lib\Profile47\ + ..\obj\lib\Profile47\ + ..\obj\lib\Profile47\ + ..\out\lib\Profile47\MathNet.Numerics.XML true pdbonly prompt @@ -32,9 +32,9 @@ TRACE;DEBUG;PORTABLE - ..\..\out\lib-debug\Profile47\ - ..\..\obj\lib-debug\Profile47\ - ..\..\obj\lib-debug\Profile47\ + ..\out\lib-debug\Profile47\ + ..\obj\lib-debug\Profile47\ + ..\obj\lib-debug\Profile47\ false full true @@ -44,23 +44,23 @@ 5 - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Portable7.csproj b/build/Numerics-Portable7.csproj similarity index 72% rename from src/Numerics/Numerics-Portable7.csproj rename to build/Numerics-Portable7.csproj index 0610d8f3..178cb29a 100644 --- a/src/Numerics/Numerics-Portable7.csproj +++ b/build/Numerics-Portable7.csproj @@ -14,14 +14,14 @@ 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 11 - ..\..\ + ..\ TRACE;PORTABLE;NET45REFLECTION - ..\..\out\lib\Profile7\ - ..\..\obj\lib\Profile7\ - ..\..\obj\lib\Profile7\ - ..\..\out\lib\Profile7\MathNet.Numerics.XML + ..\out\lib\Profile7\ + ..\obj\lib\Profile7\ + ..\obj\lib\Profile7\ + ..\out\lib\Profile7\MathNet.Numerics.XML true pdbonly prompt @@ -32,9 +32,9 @@ TRACE;DEBUG;PORTABLE;NET45REFLECTION - ..\..\out\lib-debug\Profile7\ - ..\..\obj\lib-debug\Profile7\ - ..\..\obj\lib-debug\Profile7\ + ..\out\lib-debug\Profile7\ + ..\obj\lib-debug\Profile7\ + ..\obj\lib-debug\Profile7\ false full true @@ -44,23 +44,23 @@ 5 - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/Numerics/Numerics-Portable78.csproj b/build/Numerics-Portable78.csproj similarity index 72% rename from src/Numerics/Numerics-Portable78.csproj rename to build/Numerics-Portable78.csproj index d3fbf8b1..b23b4975 100644 --- a/src/Numerics/Numerics-Portable78.csproj +++ b/build/Numerics-Portable78.csproj @@ -14,14 +14,14 @@ 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 11 - ..\..\ + ..\ TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\lib\Profile78\ - ..\..\obj\lib\Profile78\ - ..\..\obj\lib\Profile78\ - ..\..\out\lib\Profile78\MathNet.Numerics.XML + ..\out\lib\Profile78\ + ..\obj\lib\Profile78\ + ..\obj\lib\Profile78\ + ..\out\lib\Profile78\MathNet.Numerics.XML true pdbonly prompt @@ -32,9 +32,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\lib-debug\Profile78\ - ..\..\obj\lib-debug\Profile78\ - ..\..\obj\lib-debug\Profile78\ + ..\out\lib-debug\Profile78\ + ..\obj\lib-debug\Profile78\ + ..\obj\lib-debug\Profile78\ false full true @@ -44,23 +44,23 @@ 5 - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/Numerics/Numerics-XamariniOS.csproj b/build/Numerics-XamariniOS.csproj similarity index 71% rename from src/Numerics/Numerics-XamariniOS.csproj rename to build/Numerics-XamariniOS.csproj index b404c5c1..50d28bf7 100644 --- a/src/Numerics/Numerics-XamariniOS.csproj +++ b/build/Numerics-XamariniOS.csproj @@ -9,15 +9,15 @@ MathNet.Numerics {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Resources - ..\..\obj\lib-debug\XamariniOS + ..\obj\lib-debug\XamariniOS true full false - ..\..\out\lib-debug\XamariniOS\ - ..\..\obj\lib-debug\XamariniOS\ - ..\..\obj\lib-debug\XamariniOS\ + ..\out\lib-debug\XamariniOS\ + ..\obj\lib-debug\XamariniOS\ + ..\obj\lib-debug\XamariniOS\ DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 @@ -31,13 +31,13 @@ true true - ..\..\out\lib\XamariniOS\ - ..\..\obj\lib\XamariniOS\ - ..\..\obj\lib\XamariniOS\ + ..\out\lib\XamariniOS\ + ..\obj\lib\XamariniOS\ + ..\obj\lib\XamariniOS\ PORTABLE;NOSYSNUMERICS;NET45REFLECTION prompt 4 - ..\..\out\lib\XamariniOS\MathNet.Numerics.xml + ..\out\lib\XamariniOS\MathNet.Numerics.xml false true true @@ -56,20 +56,20 @@ - + PublicResXFileCodeGenerator - Resources.Designer.cs + ..\src\Numerics\Resources.Designer.cs Designer - + - + True True - Resources.resx + ..\src\Numerics\Resources.resx - \ No newline at end of file + diff --git a/src/TestData/TestData.csproj b/build/TestData-Net35.csproj similarity index 59% rename from src/TestData/TestData.csproj rename to build/TestData-Net35.csproj index aa3d569c..1ffce08a 100644 --- a/src/TestData/TestData.csproj +++ b/build/TestData-Net35.csproj @@ -15,9 +15,9 @@ - ..\..\out\test\Net35\ - ..\..\obj\test\Net35\ - ..\..\obj\test\Net35\ + ..\out\test\Net35\ + ..\obj\test\Net35\ + ..\obj\test\Net35\ pdbonly true TRACE @@ -30,9 +30,9 @@ DEBUG;TRACE - ..\..\out\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ + ..\out\test-debug\Net35\ + ..\obj\test-debug\Net35\ + ..\obj\test-debug\Net35\ true full false @@ -44,9 +44,9 @@ 5 - ..\..\out\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ + ..\out\test-signed\Net35\ + ..\obj\test-signed\Net35\ + ..\obj\test-signed\Net35\ true pdbonly @@ -68,248 +68,248 @@ - - + + - + Data\Codeplex-5667.csv - + Data\Github-Cureos-1.csv - + Data\Matlab\A.mat - + Data\Matlab\collection-nocompress.mat - + Data\Matlab\collection.mat - + Data\Matlab\complex.mat - + Data\Matlab\sparse-large.mat - + Data\Matlab\sparse-small.mat - + Data\Matlab\sparse_complex.mat - + Data\Matlab\v.mat - + Data\NIST\AtmWtAgt.dat - + Data\NIST\Bennett5.dat - + Data\NIST\BoxBOD.dat - + Data\NIST\Chwirut1.dat - + Data\NIST\Chwirut2.dat - + Data\NIST\DanWood.dat - + Data\NIST\Eckerle4.dat - + Data\NIST\ENSO.dat - + Data\NIST\Filip.dat - + Data\NIST\Gauss1.dat - + Data\NIST\Gauss2.dat - + Data\NIST\Gauss3.dat - + Data\NIST\Hahn1.dat - + Data\NIST\Kirby2.dat - + Data\NIST\Lanczos1.dat - + Data\NIST\Lanczos2.dat - + Data\NIST\Lanczos3.dat - + Data\NIST\Lew.dat - + Data\NIST\Longley.dat - + Data\NIST\Lottery.dat - + Data\NIST\Mavro.dat - + Data\NIST\Meixner.dat - + Data\NIST\MGH09.dat - + Data\NIST\MGH10.dat - + Data\NIST\MGH17.dat - + Data\NIST\Michelso.dat - + Data\NIST\Misra1a.dat - + Data\NIST\Misra1b.dat - + Data\NIST\Misra1c.dat - + Data\NIST\Misra1d.dat - + Data\NIST\Nelson.dat - + Data\NIST\NoInt1.dat - + Data\NIST\NoInt2.dat - + Data\NIST\Norris.dat - + Data\NIST\NumAcc1.dat - + Data\NIST\NumAcc2.dat - + Data\NIST\NumAcc3.dat - + Data\NIST\NumAcc4.dat - + Data\NIST\Pontius.dat - + Data\NIST\Rat42.dat - + Data\NIST\Rat43.dat - + Data\NIST\Roszman1.dat - + Data\NIST\SiRstvt.dat - + Data\NIST\SmLs01t.dat - + Data\NIST\SmLs02t.dat - + Data\NIST\SmLs03t.dat - + Data\NIST\SmLs04t.dat - + Data\NIST\SmLs05t.dat - + Data\NIST\SmLs06t.dat - + Data\NIST\SmLs07t.dat - + Data\NIST\SmLs08t.dat - + Data\NIST\SmLs09t.dat - + Data\NIST\Thurber.dat - + Data\NIST\Wampler1.dat - + Data\NIST\Wampler2.dat - + Data\NIST\Wampler3.dat - + Data\NIST\Wampler4.dat - + Data\NIST\Wampler5.dat - + Data\MatrixMarket\fidap007.mtx - + Data\MatrixMarket\bp___200.mtx - + Data\MatrixMarket\can24_pattern_symmetric_coordinate_24.mtx - + Data\MatrixMarket\gear_integer_general_coordinate_100.mtx - + Data\MatrixMarket\hilbert_real_symmetric_array_10.mtx - + Data\MatrixMarket\random_real_general_array_100.mtx - + Data\MatrixMarket\random_real_general_array_10_20.mtx - + Data\MatrixMarket\random_real_general_array_20_10.mtx - + Data\MatrixMarket\random_real_general_coordinate_10_20.mtx - + Data\MatrixMarket\random_real_general_dense_10_20.comma - + Data\MatrixMarket\random_real_general_dense_10_20.space - + Data\MatrixMarket\random_real_general_dense_10_20.tab @@ -321,4 +321,4 @@ --> - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Net35.csproj b/build/UnitTests-Net35.csproj similarity index 80% rename from src/UnitTests/UnitTests-Net35.csproj rename to build/UnitTests-Net35.csproj index 3361d61c..05ff26f9 100644 --- a/src/UnitTests/UnitTests-Net35.csproj +++ b/build/UnitTests-Net35.csproj @@ -12,13 +12,13 @@ v3.5 512 - ..\..\ + ..\ TRACE;NET35;NOSYSNUMERICS - ..\..\out\test\Net35\ - ..\..\obj\test\Net35\ - ..\..\obj\test\Net35\ + ..\out\test\Net35\ + ..\obj\test\Net35\ + ..\obj\test\Net35\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;NET35;NOSYSNUMERICS - ..\..\out\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ - ..\..\obj\test-debug\Net35\ + ..\out\test-debug\Net35\ + ..\obj\test-debug\Net35\ + ..\obj\test-debug\Net35\ false full true @@ -44,9 +44,9 @@ TRACE;NET35;NOSYSNUMERICS - ..\..\out\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ - ..\..\obj\test-signed\Net35\ + ..\out\test-signed\Net35\ + ..\obj\test-signed\Net35\ + ..\obj\test-signed\Net35\ true pdbonly prompt @@ -63,17 +63,17 @@ - + {E54E712D-EB6B-4FBF-B29A-6BB95E719BAC} Numerics-Net35 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -87,7 +87,7 @@ - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True @@ -98,12 +98,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -112,7 +112,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -121,7 +121,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -130,7 +130,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -139,11 +139,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Net35.csproj.paket.references b/build/UnitTests-Net35.csproj.paket.references similarity index 100% rename from src/UnitTests/UnitTests-Net35.csproj.paket.references rename to build/UnitTests-Net35.csproj.paket.references diff --git a/build/UnitTests-Net40.csproj b/build/UnitTests-Net40.csproj new file mode 100644 index 00000000..fa59fcea --- /dev/null +++ b/build/UnitTests-Net40.csproj @@ -0,0 +1,473 @@ + + + + Debug + AnyCPU + {DAF07AA8-C5C9-4963-98F7-2C3285064DAD} + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + UnitTest + Library + Properties + MathNet.Numerics.UnitTests + MathNet.Numerics.UnitTests + v4.5 + 512 + + ..\MathNet.Numerics.snk + + ..\ + + + ..\out\test\Net40\ + ..\obj\test\Net40\ + ..\obj\test\Net40\ + + pdbonly + true + TRACE + prompt + 4 + AllRules.ruleset + 1591 + false + 5 + + + DEBUG;TRACE + ..\out\test-debug\Net40\ + ..\obj\test-debug\Net40\ + ..\obj\test-debug\Net40\ + + true + full + false + prompt + 4 + AnyCPU + 1591 + false + 5 + + + ..\out\test-signed\Net40\ + ..\obj\test-signed\Net40\ + ..\obj\test-signed\Net40\ + + true + pdbonly + true + TRACE;STRONGNAME + prompt + 4 + AllRules.ruleset + 1591 + false + 5 + + + + + + + + + + + + {B7CAE5F4-A23F-4438-B5BE-41226618B695} + Numerics-Net40 + + + {af3253c9-4db5-45a0-98cf-c105fda9da47} + TestData-Net35 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + True + True + + + ..\packages\test\NUnit\lib\net20\nunit.framework.dll + True + True + + + + + + + ..\packages\test\NUnit\lib\net35\nunit.framework.dll + True + True + + + + + + + ..\packages\test\NUnit\lib\net40\nunit.framework.dll + True + True + + + + + + + ..\packages\test\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + + + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + True + True + + + + + diff --git a/src/UnitTests/UnitTests-Portable259.csproj b/build/UnitTests-Portable259.csproj similarity index 81% rename from src/UnitTests/UnitTests-Portable259.csproj rename to build/UnitTests-Portable259.csproj index 35c5b669..7ec920ad 100644 --- a/src/UnitTests/UnitTests-Portable259.csproj +++ b/build/UnitTests-Portable259.csproj @@ -13,13 +13,13 @@ MathNet.Numerics.UnitTests259 v4.5 512 - ..\..\ + ..\ TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\test\Profile259\ - ..\..\obj\test\Profile259\ - ..\..\obj\test\Profile259\ + ..\out\test\Profile259\ + ..\obj\test\Profile259\ + ..\obj\test\Profile259\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\test-debug\Profile259\ - ..\..\obj\test-debug\Profile259\ - ..\..\obj\test-debug\Profile259\ + ..\out\test-debug\Profile259\ + ..\obj\test-debug\Profile259\ + ..\obj\test-debug\Profile259\ false full true @@ -50,17 +50,17 @@ - + {1C8DBFB2-DB75-4C4B-888B-4AF314FCE3C3} Numerics-Portable259 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -71,12 +71,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -85,7 +85,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -94,7 +94,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -103,7 +103,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -112,11 +112,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Portable328.csproj b/build/UnitTests-Portable328.csproj similarity index 81% rename from src/UnitTests/UnitTests-Portable328.csproj rename to build/UnitTests-Portable328.csproj index eefa45ec..6c3e9574 100644 --- a/src/UnitTests/UnitTests-Portable328.csproj +++ b/build/UnitTests-Portable328.csproj @@ -13,13 +13,13 @@ MathNet.Numerics.UnitTests328 v4.5 512 - ..\..\ + ..\ TRACE;PORTABLE;NOSYSNUMERICS - ..\..\out\test\Profile328\ - ..\..\obj\test\Profile328\ - ..\..\obj\test\Profile328\ + ..\out\test\Profile328\ + ..\obj\test\Profile328\ + ..\obj\test\Profile328\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS - ..\..\out\test-debug\Profile328\ - ..\..\obj\test-debug\Profile328\ - ..\..\obj\test-debug\Profile328\ + ..\out\test-debug\Profile328\ + ..\obj\test-debug\Profile328\ + ..\obj\test-debug\Profile328\ false full true @@ -50,17 +50,17 @@ - + {1A3065FD-105D-4AF1-85B9-0A4A26FFB353} Numerics-Portable328 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -71,12 +71,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -85,7 +85,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -94,7 +94,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -103,7 +103,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -112,11 +112,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Portable47.csproj b/build/UnitTests-Portable47.csproj similarity index 81% rename from src/UnitTests/UnitTests-Portable47.csproj rename to build/UnitTests-Portable47.csproj index f1cb3670..cc3853cc 100644 --- a/src/UnitTests/UnitTests-Portable47.csproj +++ b/build/UnitTests-Portable47.csproj @@ -13,13 +13,13 @@ MathNet.Numerics.UnitTests47 v4.5 512 - ..\..\ + ..\ TRACE;PORTABLE - ..\..\out\test\Profile47\ - ..\..\obj\test\Profile47\ - ..\..\obj\test\Profile47\ + ..\out\test\Profile47\ + ..\obj\test\Profile47\ + ..\obj\test\Profile47\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;PORTABLE - ..\..\out\test-debug\Profile47\ - ..\..\obj\test-debug\Profile47\ - ..\..\obj\test-debug\Profile47\ + ..\out\test-debug\Profile47\ + ..\obj\test-debug\Profile47\ + ..\obj\test-debug\Profile47\ false full true @@ -50,17 +50,17 @@ - + {49205185-621E-FFB9-2104-887C9F1BBD13} Numerics-Portable47 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -71,12 +71,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -85,7 +85,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -94,7 +94,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -103,7 +103,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -112,11 +112,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Portable7.csproj b/build/UnitTests-Portable7.csproj similarity index 81% rename from src/UnitTests/UnitTests-Portable7.csproj rename to build/UnitTests-Portable7.csproj index d9f87ef6..319bb766 100644 --- a/src/UnitTests/UnitTests-Portable7.csproj +++ b/build/UnitTests-Portable7.csproj @@ -13,13 +13,13 @@ MathNet.Numerics.UnitTests7 v4.5 512 - ..\..\ + ..\ TRACE;PORTABLE;NET45REFLECTION - ..\..\out\test\Profile7\ - ..\..\obj\test\Profile7\ - ..\..\obj\test\Profile7\ + ..\out\test\Profile7\ + ..\obj\test\Profile7\ + ..\obj\test\Profile7\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;PORTABLE;NET45REFLECTION - ..\..\out\test-debug\Profile7\ - ..\..\obj\test-debug\Profile7\ - ..\..\obj\test-debug\Profile7\ + ..\out\test-debug\Profile7\ + ..\obj\test-debug\Profile7\ + ..\obj\test-debug\Profile7\ false full true @@ -50,17 +50,17 @@ - + {25E6E93B-56A2-4F14-8458-03665F122B3F} Numerics-Portable7 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -71,12 +71,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -85,7 +85,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -94,7 +94,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -103,7 +103,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -112,11 +112,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/UnitTests/UnitTests-Portable78.csproj b/build/UnitTests-Portable78.csproj similarity index 81% rename from src/UnitTests/UnitTests-Portable78.csproj rename to build/UnitTests-Portable78.csproj index b8992a2f..830f3014 100644 --- a/src/UnitTests/UnitTests-Portable78.csproj +++ b/build/UnitTests-Portable78.csproj @@ -13,13 +13,13 @@ MathNet.Numerics.UnitTests78 v4.5 512 - ..\..\ + ..\ TRACE;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\test\Profile78\ - ..\..\obj\test\Profile78\ - ..\..\obj\test\Profile78\ + ..\out\test\Profile78\ + ..\obj\test\Profile78\ + ..\obj\test\Profile78\ true pdbonly prompt @@ -30,9 +30,9 @@ TRACE;DEBUG;PORTABLE;NOSYSNUMERICS;NET45REFLECTION - ..\..\out\test-debug\Profile78\ - ..\..\obj\test-debug\Profile78\ - ..\..\obj\test-debug\Profile78\ + ..\out\test-debug\Profile78\ + ..\obj\test-debug\Profile78\ + ..\obj\test-debug\Profile78\ false full true @@ -50,17 +50,17 @@ - + {2EBD6F22-9BD6-4AF2-A21B-7198C9C5571F} Numerics-Portable78 - + {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData + TestData-Net35 - + @@ -71,12 +71,12 @@ - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + ..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll True True - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + ..\packages\test\NUnit\lib\net20\nunit.framework.dll True True @@ -85,7 +85,7 @@ - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + ..\packages\test\NUnit\lib\net35\nunit.framework.dll True True @@ -94,7 +94,7 @@ - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + ..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -103,7 +103,7 @@ - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + ..\packages\test\NUnit\lib\net45\nunit.framework.dll True True @@ -112,11 +112,11 @@ - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll + ..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll True True - \ No newline at end of file + diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj deleted file mode 100644 index 0063697a..00000000 --- a/src/Numerics/Numerics.csproj +++ /dev/null @@ -1,480 +0,0 @@ - - - - Debug - AnyCPU - {B7CAE5F4-A23F-4438-B5BE-41226618B695} - Library - Properties - MathNet.Numerics - MathNet.Numerics - v4.0 - 512 - - false - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - ..\MathNet.Numerics.snk - ..\..\ - - - ..\..\out\lib\Net40\ - ..\..\obj\lib\Net40\ - ..\..\obj\lib\Net40\ - ..\..\out\lib\Net40\MathNet.Numerics.xml - - pdbonly - true - TRACE;NATIVE - prompt - 4 - AllRules.ruleset - 1591 - 5 - - - ..\..\out\lib-debug\Net40\ - ..\..\obj\lib-debug\Net40\ - ..\..\obj\lib-debug\Net40\ - - true - full - false - TRACE;DEBUG;NATIVE - prompt - 4 - AllRules.ruleset - 5 - - - ..\..\out\lib-signed\Net40\ - ..\..\obj\lib-signed\Net40\ - ..\..\obj\lib-signed\Net40\ - ..\..\out\lib-signed\Net40\MathNet.Numerics.xml - - true - pdbonly - AnyCPU - true - TRACE;NATIVE;STRONGNAME - prompt - 4 - AllRules.ruleset - 1591 - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PublicResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - \ No newline at end of file diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj deleted file mode 100644 index 633a62f7..00000000 --- a/src/UnitTests/UnitTests.csproj +++ /dev/null @@ -1,473 +0,0 @@ - - - - Debug - AnyCPU - {DAF07AA8-C5C9-4963-98F7-2C3285064DAD} - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - UnitTest - Library - Properties - MathNet.Numerics.UnitTests - MathNet.Numerics.UnitTests - v4.5 - 512 - - ..\MathNet.Numerics.snk - - ..\..\ - - - ..\..\out\test\Net40\ - ..\..\obj\test\Net40\ - ..\..\obj\test\Net40\ - - pdbonly - true - TRACE - prompt - 4 - AllRules.ruleset - 1591 - false - 5 - - - DEBUG;TRACE - ..\..\out\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ - - true - full - false - prompt - 4 - AnyCPU - 1591 - false - 5 - - - ..\..\out\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ - - true - pdbonly - true - TRACE;STRONGNAME - prompt - 4 - AllRules.ruleset - 1591 - false - 5 - - - - - - - - - - - - {B7CAE5F4-A23F-4438-B5BE-41226618B695} - Numerics - - - {af3253c9-4db5-45a0-98cf-c105fda9da47} - TestData - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll - True - True - - - ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll - True - True - - - - - - - ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10\nunit.framework.dll - True - True - - - - - \ No newline at end of file