diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 07c49637..998a8cc6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,6 @@ +### 4.0.0-alpha01 - 2017-11-26 +* Prerelease to test .Net Standard support and establish dotnet SDK build automation + ### 3.20.0 - 2017-07-15 * Optimization: non-linear optimization algorithms *~Scott Stephens, Erik Ovegard, bdodson, et al.* * Native Providers: from now on also supported in the .Net 3.5 build. diff --git a/build.fsx b/build.fsx index 5074c636..feabb813 100644 --- a/build.fsx +++ b/build.fsx @@ -337,6 +337,11 @@ Target "ApplyVersion" (fun _ -> patchVersionInAssemblyInfo "src/FSharpUnitTests" numericsRelease patchVersionInAssemblyInfo "src/Data" dataRelease patchVersionInAssemblyInfo "src/DataUnitTests" dataRelease + patchVersionInProjectFile "src/Numerics/Numerics.csproj" numericsRelease + patchVersionInProjectFile "src/FSharp/FSharp.fsproj" numericsRelease + patchVersionInProjectFile "src/TestData/TestData.csproj" numericsRelease + patchVersionInProjectFile "src/UnitTests/UnitTests.csproj" numericsRelease + patchVersionInProjectFile "src/FSharpUnitTests/FSharpUnitTests.fsproj" numericsRelease patchVersionInResource "src/NativeProviders/MKL/resource.rc" mklRelease patchVersionInResource "src/NativeProviders/CUDA/resource.rc" cudaRelease patchVersionInResource "src/NativeProviders/OpenBLAS/resource.rc" openBlasRelease) diff --git a/build/build-framework.fsx b/build/build-framework.fsx index b57cc195..17aa2767 100644 --- a/build/build-framework.fsx +++ b/build/build-framework.fsx @@ -107,6 +107,19 @@ let patchVersionInResource path (release:Release) = >> regex_replace @"\d+,\d+,\d+,\d+" (replace "." "," release.AssemblyVersion)) path +let patchVersionInProjectFile path (release:Release) = + let semverSplit = release.PackageVersion.IndexOf('-') + let prefix = if semverSplit <= 0 then release.PackageVersion else release.PackageVersion.Substring(0, semverSplit) + let suffix = if semverSplit <= 0 then release.PackageVersion else release.PackageVersion.Substring(semverSplit+1) + ReplaceInFile + (regex_replace """\.*\""" (sprintf """%s""" release.PackageVersion) + >> regex_replace """\.*\""" (sprintf """%s""" release.PackageVersion) + >> regex_replace """\.*\""" (sprintf """%s""" release.AssemblyVersion) + >> regex_replace """\.*\""" (sprintf """%s""" release.AssemblyVersion) + >> regex_replace """\.*\""" (sprintf """%s""" prefix) + >> regex_replace """\.*\""" (sprintf """%s""" suffix) + >> regex_replace """\.*\""" (sprintf """%s""" release.ReleaseNotes)) + path // -------------------------------------------------------------------------------------- // BUILD diff --git a/src/FSharp/AssemblyInfo.fs b/src/FSharp/AssemblyInfo.fs index d7ee10ce..9469e358 100644 --- a/src/FSharp/AssemblyInfo.fs +++ b/src/FSharp/AssemblyInfo.fs @@ -44,9 +44,9 @@ open System.Runtime.InteropServices [] [] -[] -[] -[] +[] +[] +[] #if PORTABLE || NETSTANDARD #else diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 8587b215..7d878d57 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -1,4 +1,4 @@ - + net45;netstandard1.6;netstandard2.0 Library @@ -6,12 +6,12 @@ MathNet.Numerics true MathNet.Numerics.FSharp - 0.0.0 - alpha0 - 0.0.0-alpha0 - 0.0.0-alpha0 - 0.0.0.0 - 0.0.0.0 + 4.0.0 + alpha01 + 4.0.0-alpha01 + 4.0.0-alpha01 + 4.0.0.0 + 4.0.0.0 Math.NET Numerics for F# Christoph Ruegg, Marcus Cuda, Jurgen Van Gael Math.NET Project @@ -25,7 +25,7 @@ https://numerics.mathdotnet.com/License.html https://numerics.mathdotnet.com/ https://www.mathdotnet.com/images/MathNet128.png - Release Notes + Prerelease to test .Net Standard support and establish dotnet SDK build automation fsharp F# math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft false https://github.com/mathnet/mathnet-numerics diff --git a/src/FSharpUnitTests/AssemblyInfo.fs b/src/FSharpUnitTests/AssemblyInfo.fs index 724bf602..00190c1a 100644 --- a/src/FSharpUnitTests/AssemblyInfo.fs +++ b/src/FSharpUnitTests/AssemblyInfo.fs @@ -10,9 +10,9 @@ open System.Runtime.InteropServices [] [] -[] -[] -[] +[] +[] +[] #if PORTABLE || NETSTANDARD #else diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index 7f973e0f..38aeaa4d 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -1,4 +1,4 @@ - + net45;netcoreapp1.1;netcoreapp2.0 false diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index c3737bbf..7efda98c 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -1,4 +1,4 @@ - + net40;netstandard1.3;netstandard2.0 Library @@ -6,12 +6,12 @@ MathNet.Numerics true MathNet.Numerics - 0.0.0 - alpha0 - 0.0.0-alpha0 - 0.0.0-alpha0 - 0.0.0.0 - 0.0.0.0 + 4.0.0 + alpha01 + 4.0.0-alpha01 + 4.0.0-alpha01 + 4.0.0.0 + 4.0.0.0 Math.NET Numerics Christoph Ruegg, Marcus Cuda, Jurgen Van Gael Math.NET Project @@ -25,7 +25,7 @@ https://numerics.mathdotnet.com/License.html https://numerics.mathdotnet.com/ https://www.mathdotnet.com/images/MathNet128.png - Release Notes + Prerelease to test .Net Standard support and establish dotnet SDK build automation math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft false https://github.com/mathnet/mathnet-numerics diff --git a/src/TestData/TestData.csproj b/src/TestData/TestData.csproj index 63949973..7a0d3220 100644 --- a/src/TestData/TestData.csproj +++ b/src/TestData/TestData.csproj @@ -1,4 +1,4 @@ - + net40;netstandard1.1 false diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs index 8e6f3d04..40ae79ed 100644 --- a/src/UnitTests/Properties/AssemblyInfo.cs +++ b/src/UnitTests/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using MathNet.Numerics.UnitTests; [assembly: ComVisible(false)] [assembly: Guid("04157581-63f3-447b-a277-83c6e69126a4")] -[assembly: AssemblyVersion("3.20.0.0")] -[assembly: AssemblyFileVersion("3.20.0.0")] -[assembly: AssemblyInformationalVersion("3.20.0")] +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] +[assembly: AssemblyInformationalVersion("4.0.0-alpha01")] [assembly: UseLinearAlgebraProvider] diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 31d80543..cdcef758 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -1,4 +1,4 @@ - + Exe