diff --git a/build/build-framework.fsx b/build/build-framework.fsx index d1e60efe..f6f5e656 100644 --- a/build/build-framework.fsx +++ b/build/build-framework.fsx @@ -34,20 +34,30 @@ trace rootDir // -------------------------------------------------------------------------------------- let msbuild targets configuration project = + let properties = + [ + yield "Configuration", configuration + if hasBuildParam "strongname" then yield "StrongName", "True" + ] MSBuildHelper.build (fun p -> { p with NoLogo = true NodeReuse = true Targets = targets - Properties = [ "Configuration", configuration ] + Properties = properties RestorePackagesFlag = false Verbosity = Some MSBuildVerbosity.Minimal }) project let dotnet workingDir command = + let properties = + [ + if hasBuildParam "strongname" then yield "StrongName", "True" + ] + let suffix = properties |> List.map (fun (name, value) -> sprintf """ /p:%s="%s" """ name value) |> String.concat "" DotNetCli.RunCommand (fun c -> { c with WorkingDir = workingDir}) - command + (command + suffix) // -------------------------------------------------------------------------------------- diff --git a/src/Data.Tests/Data.Tests.csproj b/src/Data.Tests/Data.Tests.csproj index 845981f9..f0ae3dab 100644 --- a/src/Data.Tests/Data.Tests.csproj +++ b/src/Data.Tests/Data.Tests.csproj @@ -3,7 +3,6 @@ Exe net45;netcoreapp1.1;netcoreapp2.0 - 2.0.7 false MathNet.Numerics.Data.Tests MathNet.Numerics.Data.Tests diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 7f5698d1..43c48967 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -3,27 +3,18 @@ Library net40;netstandard1.3;netstandard2.0 - 2.0.2 MathNet.Numerics.Data.Matlab MathNet.Numerics.Data.Matlab true - MathNet.Numerics.Data.Matlab + MathNet.Numerics.Data.Matlab$(PackageIdSuffix) 4.0.0 4.0.0 4.0.0 4.0.0.0 4.0.0.0 - Math.NET Numerics - MATLAB Data I/O Extensions - Christoph Ruegg, Marcus Cuda - Math.NET Project - Math.NET Numerics - 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. - Copyright Math.NET Project - false - https://numerics.mathdotnet.com/License.html - https://numerics.mathdotnet.com/ - https://www.mathdotnet.com/images/MathNet128.png + 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 In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0. math numeric data matlab diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj index b69a5222..0bff7e69 100644 --- a/src/Data/Text/Text.csproj +++ b/src/Data/Text/Text.csproj @@ -3,27 +3,18 @@ Library net40;netstandard1.3;netstandard2.0 - 2.0.2 MathNet.Numerics.Data.Text MathNet.Numerics.Data.Text true - MathNet.Numerics.Data.Text + MathNet.Numerics.Data.Text$(PackageIdSuffix) 4.0.0 4.0.0 4.0.0 4.0.0.0 4.0.0.0 - Math.NET Numerics - Text Data I/O Extensions - Christoph Ruegg, Marcus Cuda - Math.NET Project - Math.NET Numerics - 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. - Copyright Math.NET Project - false - https://numerics.mathdotnet.com/License.html - https://numerics.mathdotnet.com/ - https://www.mathdotnet.com/images/MathNet128.png + 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 In addition to .Net 4.0 and newer now also targets .Net Standard 1.3 and 2.0. math numeric data text csv tsv json xml diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5767de7d..b6255546 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,4 +14,17 @@ git en + + true + ../MathNet.Numerics.snk + false + STRONGNAME + .Signed + - Strong Name Edition + This package contains strong-named assemblies for legacy use cases (not recommended). + $(CommonConstants) + + + NATIVE;$(CommonConstants) + diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 8cdd61f7..85d9d6b8 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -6,15 +6,15 @@ MathNet.Numerics.FSharp MathNet.Numerics true - MathNet.Numerics.FSharp + MathNet.Numerics.FSharp$(PackageIdSuffix) 4.4.0 4.4.0 4.4.0 4.4.0.0 4.4.0.0 - Math.NET Numerics for F# - F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.5 or higher and .Net Standard 1.6 or higher, on Windows, Linux and Mac. + Math.NET Numerics for F#$(TitleSuffix) + F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.5 or higher and .Net Standard 1.6 or higher, on Windows, Linux and Mac.$(DescriptionSuffix) Linear Algebra: managed provider performance improvements on basic vector arithmetics fsharp F# math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft false diff --git a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj b/src/Numerics.Tests/Numerics.Tests.CUDA.csproj index 3b3b5265..54596316 100644 --- a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj +++ b/src/Numerics.Tests/Numerics.Tests.CUDA.csproj @@ -8,7 +8,7 @@ MathNet.Numerics.Tests.CUDA MathNet.Numerics.Tests false - NATIVE;CUDA + NATIVE;CUDA;$(CommonConstants) diff --git a/src/Numerics.Tests/Numerics.Tests.MKL.csproj b/src/Numerics.Tests/Numerics.Tests.MKL.csproj index 53a209cc..a0eb1a51 100644 --- a/src/Numerics.Tests/Numerics.Tests.MKL.csproj +++ b/src/Numerics.Tests/Numerics.Tests.MKL.csproj @@ -8,7 +8,7 @@ MathNet.Numerics.Tests.MKL MathNet.Numerics.Tests false - NATIVE;MKL + NATIVE;MKL;$(CommonConstants) diff --git a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj b/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj index 9b23e590..dadcf950 100644 --- a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj +++ b/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj @@ -8,7 +8,7 @@ MathNet.Numerics.Tests.OpenBLAS MathNet.Numerics.Tests false - NATIVE;OPENBLAS + NATIVE;OPENBLAS;$(CommonConstants) diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 2f128da9..ac6d1c68 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -6,15 +6,15 @@ MathNet.Numerics MathNet.Numerics true - MathNet.Numerics + MathNet.Numerics$(PackageIdSuffix) 4.4.0 4.4.0 4.4.0 4.4.0.0 4.4.0.0 - Math.NET Numerics - Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.0 or higher and .Net Standard 1.3 or higher, on Windows, Linux and Mac. + Math.NET Numerics$(TitleSuffix) + Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.0 or higher and .Net Standard 1.3 or higher, on Windows, Linux and Mac.$(DescriptionSuffix) Linear Algebra: managed provider performance improvements on basic vector arithmetics math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft false @@ -28,9 +28,6 @@ true 1701;1702;1705;1591;1573 - - NATIVE - diff --git a/src/Numerics/Properties/AssemblyInfo.cs b/src/Numerics/Properties/AssemblyInfo.cs index fbda4906..d45babb9 100644 --- a/src/Numerics/Properties/AssemblyInfo.cs +++ b/src/Numerics/Properties/AssemblyInfo.cs @@ -37,6 +37,10 @@ using System.Runtime.InteropServices; #if STRONGNAME [assembly: InternalsVisibleTo("MathNet.Numerics.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")] +[assembly: InternalsVisibleTo("MathNet.Numerics.Tests.MKL, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")] +[assembly: InternalsVisibleTo("MathNet.Numerics.Tests.CUDA, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")] +[assembly: InternalsVisibleTo("MathNet.Numerics.Tests.OpenBLAS, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")] +[assembly: InternalsVisibleTo("Benchmark, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")] #else [assembly: InternalsVisibleTo("MathNet.Numerics.Tests")] [assembly: InternalsVisibleTo("MathNet.Numerics.Tests.MKL")]