diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 976f0660..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: csharp - -env: - - HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis - -sudo: required #false -dist: bionic -dotnet: 5.0.100 -mono: - - 6.10.0 -os: - - linux - -branches: - except: - - gh-pages - -script: - - ./build.sh Test quick -global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true - - DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index 832800d4..a3ac4792 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -26,7 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Numerics.Tests", "src\Numer EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}" ProjectSection(SolutionItems) = preProject - .travis.yml = .travis.yml appveyor.yml = appveyor.yml docs\tools\build-docs.fsx = docs\tools\build-docs.fsx build\build-framework.fsx = build\build-framework.fsx diff --git a/README.md b/README.md index 82cdc38b..f72a24d1 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,12 @@ Core Package: - **MathNet.Numerics** - **MathNet.Numerics.FSharp** - optional extensions for a better F# experience. BigRational. -Alternative Provider Packages (optional): +Intel MKL Provider (optional): -- **MathNet.Numerics.MKL.Win** - Native Intel MKL Linear Algebra provider (Windows). -- **MathNet.Numerics.MKL.Win-x86** - Native Intel MKL Linear Algebra provider (Windows/32-bit only). -- **MathNet.Numerics.MKL.Win-x64** - Native Intel MKL Linear Algebra provider (Windows/64-bit only). +- **MathNet.Numerics.Providers.MKL** - Binding to Native Intel MKL provider. +- **MathNet.Numerics.MKL.Win** - Native Intel MKL provider (Windows). +- **MathNet.Numerics.MKL.Win-x86** - Native Intel MKL provider (Windows/32-bit only). +- **MathNet.Numerics.MKL.Win-x64** - Native Intel MKL provider (Windows/64-bit only). Data/IO Packages for reading and writing data (optional): @@ -50,21 +51,16 @@ Platform Support and Dependencies Supported Platforms: -- .Net Framework 4.0 or higher and Mono (Package includes builds for 4.0 and 4.6.1) -- .Net Standard 1.3 or higher (Package includes builds for 1.3 and 2.0) - -Supported Platforms for the F# extensions: - -- .Net Framework 4.5 or higher (Package includes builds for 4.5) -- .Net Standard 1.6 or higher (Package includes builds for 1.6 and 2.0) +- .NET 5.0 or higher (Package includes builds for 5.0) +- .NET Framework 4.6.1 or higher (Package includes builds for 4.6.1 and 4.8) +- .NET Standard 2.0 or higher (Package includes builds for 2.0) For full details, dependencies and platform discrepancies see [Platform Compatibility](https://numerics.mathdotnet.com/Compatibility.html). Building Math.NET Numerics -------------------------- -Windows (.Net): [](https://ci.appveyor.com/project/cdrnet/mathnet-numerics) -Linux (Mono): [](https://travis-ci.org/mathnet/mathnet-numerics) +Windows (.Net): [](https://ci.appveyor.com/project/cdrnet/mathnet-numerics) You can build Math.NET Numerics with an IDE like VisualStudio or JetBrains Rider, with MsBuild, .Net CLI tools or with FAKE (recommended). diff --git a/docs/content/Compatibility.md b/docs/content/Compatibility.md index a64099d4..0dfdadac 100644 --- a/docs/content/Compatibility.md +++ b/docs/content/Compatibility.md @@ -3,18 +3,10 @@ Platform Support Supported Platforms: -- .Net Framework 4.0 and higher, with builds for .Net 4.0 and 4.6.1. -- .Net Standard 1.3 and higher, with builds for .Net Standard 1.3 and 2.0. -- .Net Core (via .Net Standard) -- Mono (via .Net Framework) -- Windows, Linux and Mac. - -The F# extensions support a slightly reduced platform set: - -- .Net Framework 4.5 and higher, with builds for .Net 4.5. -- .Net Standard 1.6 and higher, with builds for .Net Standard 1.6 and 2.0. -- .Net Core (via .Net Standard) -- Mono (via .Net Framework) +- .NET 5.0 or higher, with builds for 5.0. +- .NET Framework 4.6.1 or higher, with builds for 4.6.1 and 4.8. +- .NET Standard 2.0 or higher, with builds for 2.0. +- Mono (via .NET Standard) - Windows, Linux and Mac. @@ -23,6 +15,8 @@ Dependencies Package Dependencies: -- .Net 4.0 and higher, .Net Standard 2.0, Mono: None -- .Net Standard 1.3: NETStandard.Library and many System.* packages +- .NET 5.0 and higher: None +- .NET Framework 4.6.1: [System.ValueTuple](https://www.nuget.org/packages/System.ValueTuple) +- .NET Framework 4.8 and higher: None +- .Net Standard 2.0 and higher: None - F#: additionally [FSharp.Core](https://www.nuget.org/packages/FSharp.Core) diff --git a/docs/content/index.md b/docs/content/index.md index b4a228ce..d4473a8a 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -8,11 +8,10 @@ regression, optimization problems and more. Math.NET Numerics is part of the [Math.NET initiative](https://www.mathdotnet.com/) and is the result of merging dnAnalytics with Math.NET Iridium, replacing both. -Available for free under the [MIT/X11 License](License.html). -It targets Microsoft .Net 4.0 and higher, including Mono, and .Net Standard 1.3 -and higher (with builds for .Net Standard 2.0). In addition to a purely -managed implementation it also supports native hardware optimization. -See [Platform Support](Compatibility.html) for full details. +Available for free under the [MIT License](License.html). +It targets Microsoft .NET 5.0, .NET 4.6.1 and higher, and .NET Standard 2.0 +and higher. In addition to a purely managed implementation it also supports +native hardware optimization. See [Platform Support](Compatibility.html) for full details. NuGet Packages -------------- diff --git a/docs/tools/templates/template.cshtml b/docs/tools/templates/template.cshtml index ece072f6..c1109d76 100644 --- a/docs/tools/templates/template.cshtml +++ b/docs/tools/templates/template.cshtml @@ -63,7 +63,7 @@