diff --git a/docs/content/Build.md b/docs/content/Build.md index e8b03816..d4b78164 100644 --- a/docs/content/Build.md +++ b/docs/content/Build.md @@ -27,8 +27,8 @@ Instead of a compatible IDE you can also build the solutions directly with the .NET Core SDK, with MsBuild or on Mono with XBuild. You may need to run `restore.cmd` or `restore.sh` before, once after every git checkout in order to restore the dependencies. - restore.cmd (or restore.sh) # restore dependencies (once) - dotnet build MathNet.Numerics.sln # with .NET Core SDK + restore.cmd (or restore.sh) # restore dependencies (once) + dotnet build MathNet.Numerics.sln # with .NET Core SDK msbuild MathNet.Numerics.sln # with MsBuild xbuild MathNet.Numerics.sln # with Mono @@ -146,7 +146,7 @@ The build expects that either Intel Parallel Studio 2020 (with the Intel Compile or Intel Math Kernel Library 2020 is installed. If you run into an error with `mkl_link_tool.exe` you may need to patch a targets file, see [MKL 2020.1, VS2019 linking bug ](https://software.intel.com/en-us/forums/intel-math-kernel-library/topic/851578). -The build is targeting `Windows 10 SDK (10.0.17763.0)` and the `v141` platform toolset, +The build is targeting `Windows 10 SDK (10.0.17763.0)` and the `v142` platform toolset, both of which can be installed as individual components in the Visual Studio Installer, together with the `Desktop development with C++` workload. diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index e54c9c63..a4f0d643 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -44,6 +44,7 @@ Build: no longer code-sign the assemblies with a code-signing certificate, since + - \ No newline at end of file + diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcproj deleted file mode 100644 index 7b46f402..00000000 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcproj +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj index 6009eafa..12fbbca2 100644 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj @@ -25,7 +25,7 @@ MKL 10.0.17763.0 DynamicLibrary - v141 + v142 MathNet.Numerics.MKL @@ -210,4 +210,4 @@ - + \ No newline at end of file diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters index bf583e27..7e91fc28 100644 --- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters @@ -56,4 +56,9 @@ Header Files + + + Source Files\Resource Files + + \ No newline at end of file