diff --git a/MathNet.Numerics.Data.sln b/MathNet.Numerics.Data.sln deleted file mode 100644 index 8671fe9b..00000000 --- a/MathNet.Numerics.Data.sln +++ /dev/null @@ -1,71 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28922.388 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Matlab", "src\Data\Matlab\Matlab.csproj", "{550FB330-C86F-4C9D-9B4C-6D830CEB7520}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{6B0247F6-B332-41BC-B100-C0E5509EE612}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Text", "src\Data\Text\Text.csproj", "{9D3A08E1-6B96-4552-A535-412E589B3264}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{F510F04E-7503-4F87-A1EC-3A5FBA1DF7B8}" - ProjectSection(SolutionItems) = preProject - CONTRIBUTING.md = CONTRIBUTING.md - CONTRIBUTORS.md = CONTRIBUTORS.md - LICENSE.md = LICENSE.md - README.md = README.md - RELEASENOTES-Data.md = RELEASENOTES-Data.md - RELEASENOTES.md = RELEASENOTES.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D954831A-F51A-436A-9F17-0DFC7AEC7113}" - ProjectSection(SolutionItems) = preProject - build\build-framework.fsx = build\build-framework.fsx - build.fsx = build.fsx - paket.dependencies = paket.dependencies - paket.lock = paket.lock - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Release-Signed|Any CPU = Release-Signed|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Debug|Any CPU.Build.0 = Debug|Any CPU - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Release|Any CPU.ActiveCfg = Release|Any CPU - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Release|Any CPU.Build.0 = Release|Any CPU - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {550FB330-C86F-4C9D-9B4C-6D830CEB7520}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Release|Any CPU.Build.0 = Release|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {6B0247F6-B332-41BC-B100-C0E5509EE612}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Release|Any CPU.Build.0 = Release|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {9D3A08E1-6B96-4552-A535-412E589B3264}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Any CPU.Build.0 = Release|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU - {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release-Signed|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8EB85351-0EA6-4FE9-BF02-091C0328718C} - EndGlobalSection -EndGlobal diff --git a/MathNet.Numerics.Data.sln.DotSettings b/MathNet.Numerics.Data.sln.DotSettings deleted file mode 100644 index 218923a1..00000000 --- a/MathNet.Numerics.Data.sln.DotSettings +++ /dev/null @@ -1,94 +0,0 @@ - - True - HINT - HINT - <?xml version="1.0" encoding="utf-16"?><Profile name="Full Cleanup (Math.NET)"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSRemoveCodeRedundancies>True</CSRemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUpdateFileHeader>True</CSUpdateFileHeader><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><XMLReformatCode>True</XMLReformatCode><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><JsReformatCode>True</JsReformatCode><JsInsertSemicolon>True</JsInsertSemicolon><VBFormatDocComments>True</VBFormatDocComments><VBReformatCode>True</VBReformatCode><VBShortenReferences>True</VBShortenReferences><VBOptimizeImports>True</VBOptimizeImports><HtmlReformatCode>True</HtmlReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><CSReorderTypeMembers>True</CSReorderTypeMembers><CSUseVar><BehavourStyle>CAN_CHANGE_BOTH</BehavourStyle><LocalVariableStyle>IMPLICIT_WHEN_INITIALIZER_HAS_TYPE</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar></Profile> - Full Cleanup (Math.NET) - False - False - False - False - False - False - False - False - False - False - False - True - NEVER - NEVER - False - NEVER - False - False - True - True - False - <copyright file="$FILENAME$" company="Math.NET"> -Math.NET Numerics, part of the Math.NET Project -https://numerics.mathdotnet.com -https://github.com/mathnet/mathnet-numerics -https://mathnetnumerics.codeplex.com - -Copyright (c) 2009-$CURRENT_YEAR$ Math.NET - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -</copyright> - AVX - CDF - DFT - FFT - IA - ILU - ILUTP - IX - LU - MAE - MC - MCMC - MILU - MKL - MSE - PDF - PMF - QR - SAD - SAS - SPSS - SSD - SSE - SVD - TFQMR - WH - True - True - True - True - True - True - True - True - True - True - <data /> - <data><IncludeFilters /><ExcludeFilters /></data> diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index 159cdb95..832800d4 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -76,6 +76,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.CUDA", "src\Provi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.OpenBLAS", "src\Providers.OpenBLAS\Providers.OpenBLAS.csproj", "{FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Matlab", "src\Data.Matlab\Data.Matlab.csproj", "{2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Text", "src\Data.Text\Data.Text.csproj", "{B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{1FBB8988-3F40-4FCE-BEA8-2C705888804A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,6 +143,24 @@ Global {FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}.Release|Any CPU.Build.0 = Release|Any CPU {FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU {FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Release|Any CPU.Build.0 = Release|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU + {2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Release|Any CPU.Build.0 = Release|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU + {B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Release|Any CPU.Build.0 = Release|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Release-Signed|Any CPU.ActiveCfg = Debug|Any CPU + {1FBB8988-3F40-4FCE-BEA8-2C705888804A}.Release-Signed|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build.fsx b/build.fsx index 5eee58b7..ddb6fb75 100644 --- a/build.fsx +++ b/build.fsx @@ -37,8 +37,7 @@ let numericsRelease = release "numerics" "Math.NET Numerics" "RELEASENOTES.md" let mklRelease = release "numerics" "MKL Provider" "RELEASENOTES-MKL.md" let cudaRelease = release "numerics" "CUDA Provider" "RELEASENOTES-CUDA.md" let openBlasRelease = release "numerics" "OpenBLAS Provider" "RELEASENOTES-OpenBLAS.md" -let dataRelease = release "numerics" "Data Extensions" "RELEASENOTES-Data.md" -let releases = [ numericsRelease; mklRelease; openBlasRelease; dataRelease ] // skip cuda +let releases = [ numericsRelease; mklRelease; openBlasRelease ] // skip cuda traceHeader releases @@ -54,28 +53,19 @@ let numericsFSharpStrongNameNuGetPackage = nugetPackage "MathNet.Numerics.FSharp let numericsProvidersMklNuGetPackage = nugetPackage "MathNet.Numerics.Providers.MKL" numericsRelease let numericsProvidersOpenBlasNuGetPackage = nugetPackage "MathNet.Numerics.Providers.OpenBLAS" numericsRelease let numericsProvidersCudaNuGetPackage = nugetPackage "MathNet.Numerics.Providers.CUDA" numericsRelease +let numericsDataTextNuGetPackage = nugetPackage "MathNet.Numerics.Data.Text" numericsRelease +let numericsDataMatlabNuGetPackage = nugetPackage "MathNet.Numerics.Data.Matlab" numericsRelease +let numericsDataTextStrongNameNuGetPackage = nugetPackage "MathNet.Numerics.Data.Text.Signed" numericsRelease +let numericsDataMatlabStrongNameNuGetPackage = nugetPackage "MathNet.Numerics.Data.Matlab.Signed" numericsRelease let numericsProject = project "MathNet.Numerics" "src/Numerics/Numerics.csproj" [numericsNuGetPackage; numericsStrongNameNuGetPackage] let numericsFsharpProject = project "MathNet.Numerics.FSharp" "src/FSharp/FSharp.fsproj" [numericsFSharpNuGetPackage; numericsFSharpStrongNameNuGetPackage] let numericsProvidersMklProject = project "MathNet.Numerics.Providers.MKL" "src/Providers.MKL/Providers.MKL.csproj" [numericsProvidersMklNuGetPackage] let numericsProvidersOpenBlasProject = project "MathNet.Numerics.Providers.OpenBLAS" "src/Providers.OpenBLAS/Providers.OpenBLAS.csproj" [numericsProvidersOpenBlasNuGetPackage] let numericsProvidersCudaProject = project "MathNet.Numerics.Providers.CUDA" "src/Providers.CUDA/Providers.CUDA.csproj" [numericsProvidersCudaNuGetPackage] -let numericsSolution = solution "Numerics" "MathNet.Numerics.sln" [numericsProject; numericsFsharpProject; numericsProvidersMklProject; numericsProvidersOpenBlasProject; numericsProvidersCudaProject] [numericsZipPackage; numericsStrongNameZipPackage] - - -// DATA EXTENSION PACKAGES - -let dataZipPackage = zipPackage "MathNet.Numerics.Data" "Math.NET Numerics Data Extensions" dataRelease -let dataStrongNameZipPackage = zipPackage "MathNet.Numerics.Data.Signed" "Math.NET Numerics Data Extensions" dataRelease - -let dataTextNuGetPackage = nugetPackage "MathNet.Numerics.Data.Text" dataRelease -let dataMatlabNuGetPackage = nugetPackage "MathNet.Numerics.Data.Matlab" dataRelease -let dataTextStrongNameNuGetPackage = nugetPackage "MathNet.Numerics.Data.Text.Signed" dataRelease -let dataMatlabStrongNameNuGetPackage = nugetPackage "MathNet.Numerics.Data.Matlab.Signed" dataRelease - -let dataTextProject = project "MathNet.Numerics.Data.Text" "src/Data/Text/Text.csproj" [dataTextNuGetPackage; dataTextStrongNameNuGetPackage] -let dataMatlabProject = project "MathNet.Numerics.Data.Matlab" "src/Data/Matlab/Matlab.csproj" [dataMatlabNuGetPackage; dataMatlabStrongNameNuGetPackage] -let dataSolution = solution "Data" "MathNet.Numerics.Data.sln" [dataTextProject; dataMatlabProject] [dataZipPackage; dataStrongNameZipPackage] +let numericsDataTextProject = project "MathNet.Numerics.Data.Text" "src/Data.Text/Data.Text.csproj" [numericsDataTextNuGetPackage; numericsDataTextStrongNameNuGetPackage] +let numericsDataMatlabProject = project "MathNet.Numerics.Data.Matlab" "src/Data.Matlab/Data.Matlab.csproj" [numericsDataMatlabNuGetPackage; numericsDataMatlabStrongNameNuGetPackage] +let numericsSolution = solution "Numerics" "MathNet.Numerics.sln" [numericsProject; numericsFsharpProject; numericsProvidersMklProject; numericsProvidersOpenBlasProject; numericsProvidersCudaProject; numericsDataTextProject; numericsDataMatlabProject] [numericsZipPackage; numericsStrongNameZipPackage] // MKL NATIVE PROVIDER PACKAGES @@ -155,7 +145,7 @@ let openBlasWinPack = // ALL -let allSolutions = [numericsSolution; dataSolution] +let allSolutions = [numericsSolution] let allProjects = allSolutions |> List.collect (fun s -> s.Projects) |> List.distinct @@ -177,7 +167,7 @@ Target "ApplyVersion" (fun _ -> patchVersionInAssemblyInfo "src/TestData" numericsRelease patchVersionInAssemblyInfo "src/Numerics.Tests" numericsRelease patchVersionInAssemblyInfo "src/FSharp.Tests" numericsRelease - patchVersionInAssemblyInfo "src/Data.Tests" dataRelease + patchVersionInAssemblyInfo "src/Data.Tests" numericsRelease patchVersionInResource "src/NativeProviders/MKL/resource.rc" mklRelease patchVersionInResource "src/NativeProviders/CUDA/resource.rc" cudaRelease patchVersionInResource "src/NativeProviders/OpenBLAS/resource.rc" openBlasRelease) @@ -232,39 +222,6 @@ Target "Build" (fun _ -> ) "Prepare" ==> "Build" -Target "DataBuild" (fun _ -> - - // Strong Name Build (with strong name, without certificate signature) - if hasBuildParam "strongname" then - CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" ) - restoreStrong dataSolution - buildStrong dataSolution - if isWindows && hasBuildParam "sign" then sign fingerprint timeserver dataSolution - collectBinariesSN dataSolution - zip dataStrongNameZipPackage dataSolution.OutputZipDir dataSolution.OutputLibStrongNameDir (fun f -> f.Contains("MathNet.Numerics.Data.")) - if isWindows then - packProjectStrong dataTextProject - packProjectStrong dataMatlabProject - collectNuGetPackages dataSolution - - // Normal Build (without strong name, with certificate signature) - CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" ) - restoreWeak dataSolution - buildWeak dataSolution - if isWindows && hasBuildParam "sign" then sign fingerprint timeserver dataSolution - collectBinaries dataSolution - zip dataZipPackage dataSolution.OutputZipDir dataSolution.OutputLibDir (fun f -> f.Contains("MathNet.Numerics.Data.")) - if isWindows then - packProjectWeak dataTextProject - packProjectWeak dataMatlabProject - collectNuGetPackages dataSolution - - // NuGet Sign (all or nothing) - if isWindows && hasBuildParam "sign" then signNuGet fingerprint timeserver [dataSolution] - - ) -"Prepare" ==> "DataBuild" - Target "MklWinBuild" (fun _ -> restoreWeak mklSolution @@ -329,9 +286,16 @@ Target "TestFsharpNET50" (fun _ -> testFsharp "net5.0") Target "TestFsharpNET48" (fun _ -> testFsharp "net48") "Build" ==> "TestFsharpNET50" ==> "TestFsharp" "Build" =?> ("TestFsharpNET48", isWindows) ==> "TestFsharp" +let testData framework = test "src/Data.Tests" "Data.Tests.csproj" framework +Target "TestData" DoNothing +Target "TestDataNET50" (fun _ -> testData "net5.0") +Target "TestDataNET48" (fun _ -> testData "net48") +"Build" ==> "TestDataNET50" ==> "TestData" +"Build" =?> ("TestDataNET48", isWindows) ==> "TestData" Target "Test" DoNothing "TestNumerics" ==> "Test" "TestFsharp" ==> "Test" +"TestData" ==> "Test" let testMKL framework = test "src/Numerics.Tests" "Numerics.Tests.MKL.csproj" framework Target "MklTest" DoNothing @@ -354,13 +318,6 @@ Target "CudaTestNET48" (fun _ -> testCUDA "net48") "CudaWinBuild" ==> "CudaTestNET50" ==> "CudaTest" "CudaWinBuild" =?> ("CudaTestNET48", isWindows) ==> "CudaTest" -let testData framework = test "src/Data.Tests" "Data.Tests.csproj" framework -Target "DataTest" DoNothing -Target "DataTestNET50" (fun _ -> testData "net5.0") -Target "DataTestNET48" (fun _ -> testData "net48") -"DataBuild" ==> "DataTestNET50" ==> "DataTest" -"DataBuild" =?> ("DataTestNET48", isWindows) ==> "DataTest" - // -------------------------------------------------------------------------------------- // LINUX PACKAGES @@ -441,7 +398,6 @@ Target "Api" (fun _ -> // -------------------------------------------------------------------------------------- Target "PublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics" "" numericsRelease) -Target "DataPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics Data Extensions" "data-" dataRelease) Target "MklPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics MKL Provider" "mkl-" mklRelease) Target "CudaPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics CUDA Provider" "cuda-" cudaRelease) Target "OpenBlasPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics OpenBLAS Provider" "openblas-" openBlasRelease) @@ -450,13 +406,11 @@ Target "PublishDocs" (fun _ -> publishDocs numericsRelease) Target "PublishApi" (fun _ -> publishApi numericsRelease) Target "PublishArchive" (fun _ -> publishArchives [numericsSolution]) -Target "DataPublishArchive" (fun _ -> publishArchives [dataSolution]) Target "MklPublishArchive" (fun _ -> publishArchives [mklSolution]) Target "CudaPublishArchive" (fun _ -> publishArchives [cudaSolution]) Target "OpenBlasPublishArchive" (fun _ -> publishArchives [openBlasSolution]) Target "PublishNuGet" (fun _ -> publishNuGet [numericsSolution]) -Target "DataPublishNuGet" (fun _ -> publishNuGet [dataSolution]) Target "MklPublishNuGet" (fun _ -> publishNuGet [mklSolution]) Target "CudaPublishNuGet" (fun _ -> publishNuGet [cudaSolution]) Target "OpenBlasPublishNuGet" (fun _ -> publishNuGet [openBlasSolution]) @@ -464,9 +418,6 @@ Target "OpenBlasPublishNuGet" (fun _ -> publishNuGet [openBlasSolution]) Target "Publish" DoNothing Dependencies "Publish" [ "PublishTag"; "PublishDocs"; "PublishApi"; "PublishArchive"; "PublishNuGet" ] -Target "DataPublish" DoNothing -Dependencies "DataPublish" [ "DataPublishTag"; "DataPublishArchive"; "DataPublishNuGet" ] - Target "MklPublish" DoNothing Dependencies "MklPublish" [ "MklPublishTag"; "PublishDocs"; "MklPublishArchive"; "MklPublishNuGet" ] @@ -484,9 +435,6 @@ Dependencies "OpenBlasPublish" [ "OpenBlasPublishTag"; "PublishDocs"; "OpenBlasP Target "All" DoNothing Dependencies "All" [ "Build"; "Docs"; "Api"; "Test" ] -Target "DataAll" DoNothing -Dependencies "DataAll" [ "DataBuild"; "DataTest" ] - Target "MklWinAll" DoNothing Dependencies "MklWinAll" [ "MklWinBuild"; "MklTest" ] diff --git a/paket.dependencies b/paket.dependencies index 1738b218..910494fc 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -16,9 +16,6 @@ nuget NUnit3TestAdapter framework:net48,net5.0 // Benchmarks nuget BenchmarkDotNet lowest_matching, strategy:min, framework:net5.0,net48 -// Data -nuget MathNet.Numerics 4.12.0 - nuget Microsoft.NETFramework.ReferenceAssemblies copy_local:true, framework:net48,net461,net40 nuget NETStandard.Library lowest_matching, strategy:min, framework:netstandard2.0 diff --git a/paket.lock b/paket.lock index 087a2459..e33eb146 100644 --- a/paket.lock +++ b/paket.lock @@ -26,7 +26,6 @@ NUGET NETStandard.Library (>= 2.0.3) - restriction: || (&& (== net40) (== net48)) (&& (== net40) (>= netstandard2.0)) (&& (== net461) (< net46) (>= netstandard2.0)) (&& (== net48) (< net46)) (== net50) (== netstandard2.0) NUnit (>= 3.12 < 4.0) - restriction: || (&& (== net40) (>= net46)) (&& (== net40) (>= netstandard2.0)) (== net461) (== net48) (== net50) (== netstandard2.0) Iced (1.4) - restriction: || (== net48) (== net50) - MathNet.Numerics (4.12) Microsoft.CodeAnalysis.Analyzers (2.6.1) - restriction: || (== net48) (== net50) Microsoft.CodeAnalysis.Common (2.10) - restriction: || (== net48) (== net50) Microsoft.CodeAnalysis.Analyzers (>= 2.6.1) - restriction: || (&& (== net40) (>= netstandard1.3)) (== net461) (== net48) (== net50) (== netstandard2.0) diff --git a/src/Data/Matlab/Adler32.cs b/src/Data.Matlab/Adler32.cs similarity index 100% rename from src/Data/Matlab/Adler32.cs rename to src/Data.Matlab/Adler32.cs diff --git a/src/Data/Matlab/ArrayClass.cs b/src/Data.Matlab/ArrayClass.cs similarity index 100% rename from src/Data/Matlab/ArrayClass.cs rename to src/Data.Matlab/ArrayClass.cs diff --git a/src/Data/Matlab/ArrayFlags.cs b/src/Data.Matlab/ArrayFlags.cs similarity index 100% rename from src/Data/Matlab/ArrayFlags.cs rename to src/Data.Matlab/ArrayFlags.cs diff --git a/src/Data.Matlab/Data.Matlab.csproj b/src/Data.Matlab/Data.Matlab.csproj new file mode 100644 index 00000000..80d85d4b --- /dev/null +++ b/src/Data.Matlab/Data.Matlab.csproj @@ -0,0 +1,40 @@ + + + + Library + net5.0;net40;net461;netstandard2.0 + MathNet.Numerics.Data.Matlab + MathNet.Numerics.Data.Matlab + true + MathNet.Numerics.Data.Matlab$(PackageIdSuffix) + 4.15.0 + + Math.NET Numerics - MATLAB Data I/O Extensions$(TitleSuffix) + MathWorks MATLAB Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix) + Precision: Round (with integer part rounding) ~Jon Larborn +Precision: RoundToMultiple, RoundToPower +F#: BigRational.FromDecimal ~Brian Berns + math numeric data matlab + false + https://github.com/mathnet/mathnet-numerics + git + en + false + true + false + true + true + 1701;1702;1705;1591;1573 + true + + + + + + + + + + + + diff --git a/src/Data/Matlab/DataType.cs b/src/Data.Matlab/DataType.cs similarity index 100% rename from src/Data/Matlab/DataType.cs rename to src/Data.Matlab/DataType.cs diff --git a/src/Data/Matlab/Formatter.cs b/src/Data.Matlab/Formatter.cs similarity index 100% rename from src/Data/Matlab/Formatter.cs rename to src/Data.Matlab/Formatter.cs diff --git a/src/Data/Matlab/MatlabMatrix.cs b/src/Data.Matlab/MatlabMatrix.cs similarity index 100% rename from src/Data/Matlab/MatlabMatrix.cs rename to src/Data.Matlab/MatlabMatrix.cs diff --git a/src/Data/Matlab/MatlabReader.cs b/src/Data.Matlab/MatlabReader.cs similarity index 100% rename from src/Data/Matlab/MatlabReader.cs rename to src/Data.Matlab/MatlabReader.cs diff --git a/src/Data/Matlab/MatlabWriter.cs b/src/Data.Matlab/MatlabWriter.cs similarity index 100% rename from src/Data/Matlab/MatlabWriter.cs rename to src/Data.Matlab/MatlabWriter.cs diff --git a/src/Data/Matlab/Parser.cs b/src/Data.Matlab/Parser.cs similarity index 100% rename from src/Data/Matlab/Parser.cs rename to src/Data.Matlab/Parser.cs diff --git a/src/Data/Matlab/Settings.StyleCop b/src/Data.Matlab/Settings.StyleCop similarity index 100% rename from src/Data/Matlab/Settings.StyleCop rename to src/Data.Matlab/Settings.StyleCop diff --git a/src/Data/Matlab/paket.references b/src/Data.Matlab/paket.references similarity index 71% rename from src/Data/Matlab/paket.references rename to src/Data.Matlab/paket.references index e3e91dda..a954f0e2 100644 --- a/src/Data/Matlab/paket.references +++ b/src/Data.Matlab/paket.references @@ -1,2 +1 @@ Microsoft.NETFramework.ReferenceAssemblies -MathNet.Numerics diff --git a/src/Data.Tests/Data.Tests.csproj b/src/Data.Tests/Data.Tests.csproj index d8eb9bcd..af424767 100644 --- a/src/Data.Tests/Data.Tests.csproj +++ b/src/Data.Tests/Data.Tests.csproj @@ -1,30 +1,31 @@  - - Exe - false - net5.0;net48 - false - MathNet.Numerics.Data.Tests - MathNet.Numerics.Data.Tests - false - true - - - - - - - - - - - - - - - - - - + + Exe + false + net5.0;net48 + false + MathNet.Numerics.Data.Tests + MathNet.Numerics.Data.Tests + false + true + + + + + + + + + + + + + + + + + + + diff --git a/src/Data.Tests/Properties/AssemblyInfo.cs b/src/Data.Tests/Properties/AssemblyInfo.cs index 682981ac..01ee1e50 100644 --- a/src/Data.Tests/Properties/AssemblyInfo.cs +++ b/src/Data.Tests/Properties/AssemblyInfo.cs @@ -14,6 +14,6 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("bb41bee6-eb4c-48c9-8edd-7a5ae2422567")] -[assembly: AssemblyVersion("4.1.0.0")] -[assembly: AssemblyFileVersion("4.1.0.0")] -[assembly: AssemblyInformationalVersion("4.1.0")] +[assembly: AssemblyVersion("4.15.0.0")] +[assembly: AssemblyFileVersion("4.15.0.0")] +[assembly: AssemblyInformationalVersion("4.15.0")] diff --git a/src/Data.Tests/paket.references b/src/Data.Tests/paket.references index c43ad1eb..bb8728eb 100644 --- a/src/Data.Tests/paket.references +++ b/src/Data.Tests/paket.references @@ -3,4 +3,3 @@ Microsoft.NETFramework.ReferenceAssemblies NUnit3TestAdapter NUnit NUnitLite content:none -MathNet.Numerics diff --git a/src/Data.Text/Data.Text.csproj b/src/Data.Text/Data.Text.csproj new file mode 100644 index 00000000..9525d8d0 --- /dev/null +++ b/src/Data.Text/Data.Text.csproj @@ -0,0 +1,40 @@ + + + + Library + net5.0;net40;net461;netstandard2.0 + MathNet.Numerics.Data.Text + MathNet.Numerics.Data.Text + true + MathNet.Numerics.Data.Text$(PackageIdSuffix) + 4.15.0 + + Math.NET Numerics - Text Data I/O Extensions$(TitleSuffix) + Text Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix) + Precision: Round (with integer part rounding) ~Jon Larborn +Precision: RoundToMultiple, RoundToPower +F#: BigRational.FromDecimal ~Brian Berns + math numeric data text csv tsv json xml + false + https://github.com/mathnet/mathnet-numerics + git + en + false + true + false + true + true + 1701;1702;1705;1591;1573 + true + + + + + + + + + + + + diff --git a/src/Data/Text/DelimitedReader.cs b/src/Data.Text/DelimitedReader.cs similarity index 100% rename from src/Data/Text/DelimitedReader.cs rename to src/Data.Text/DelimitedReader.cs diff --git a/src/Data/Text/DelimitedWriter.cs b/src/Data.Text/DelimitedWriter.cs similarity index 100% rename from src/Data/Text/DelimitedWriter.cs rename to src/Data.Text/DelimitedWriter.cs diff --git a/src/Data/Text/MatrixMarketReader.cs b/src/Data.Text/MatrixMarketReader.cs similarity index 100% rename from src/Data/Text/MatrixMarketReader.cs rename to src/Data.Text/MatrixMarketReader.cs diff --git a/src/Data/Text/MatrixMarketWriter.cs b/src/Data.Text/MatrixMarketWriter.cs similarity index 100% rename from src/Data/Text/MatrixMarketWriter.cs rename to src/Data.Text/MatrixMarketWriter.cs diff --git a/src/Data/Text/Options.cs b/src/Data.Text/Options.cs similarity index 100% rename from src/Data/Text/Options.cs rename to src/Data.Text/Options.cs diff --git a/src/Data/Text/Settings.StyleCop b/src/Data.Text/Settings.StyleCop similarity index 100% rename from src/Data/Text/Settings.StyleCop rename to src/Data.Text/Settings.StyleCop diff --git a/src/Data/Text/paket.references b/src/Data.Text/paket.references similarity index 71% rename from src/Data/Text/paket.references rename to src/Data.Text/paket.references index e3e91dda..a954f0e2 100644 --- a/src/Data/Text/paket.references +++ b/src/Data.Text/paket.references @@ -1,2 +1 @@ Microsoft.NETFramework.ReferenceAssemblies -MathNet.Numerics diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj deleted file mode 100644 index 62d5ff5a..00000000 --- a/src/Data/Matlab/Matlab.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - Library - net5.0;net40;net461;netstandard2.0 - MathNet.Numerics.Data.Matlab - MathNet.Numerics.Data.Matlab - true - MathNet.Numerics.Data.Matlab$(PackageIdSuffix) - 4.1.0 - - Math.NET Numerics - MATLAB Data I/O Extensions$(TitleSuffix) - MathWorks MATLAB Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix) - Support for Math.NET Numerics v4.12 -Resources inlined ~Philipp Huber - math numeric data matlab - false - https://github.com/mathnet/mathnet-numerics - git - en - false - true - false - true - true - 1701;1702;1705;1591;1573 - true - - - - - - - - - diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj deleted file mode 100644 index c6e37cd9..00000000 --- a/src/Data/Text/Text.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - Library - net5.0;net40;net461;netstandard2.0 - MathNet.Numerics.Data.Text - MathNet.Numerics.Data.Text - true - MathNet.Numerics.Data.Text$(PackageIdSuffix) - 4.1.0 - - Math.NET Numerics - Text Data I/O Extensions$(TitleSuffix) - Text Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix) - Support for Math.NET Numerics v4.12 -Resources inlined ~Philipp Huber - math numeric data text csv tsv json xml - false - https://github.com/mathnet/mathnet-numerics - git - en - false - true - false - true - true - 1701;1702;1705;1591;1573 - true - - - - - - - - -