diff --git a/MathNet.Numerics.NativeProviders.sln b/MathNet.Numerics.NativeProviders.sln
index 91791dc5..98886230 100644
--- a/MathNet.Numerics.NativeProviders.sln
+++ b/MathNet.Numerics.NativeProviders.sln
@@ -16,36 +16,107 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MKL", "src\NativeProviders\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ATLAS", "src\NativeProviders\Windows\ATLAS\ATLASWrapper.vcxproj", "{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "src\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-MKL", "src\UnitTests\UnitTests-MKL.csproj", "{3515A344-AB5F-41C7-A14C-04A79B3FFAB1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
+ Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
+ Release-Signed|Any CPU = Release-Signed|Any CPU
+ Release-Signed|Mixed Platforms = Release-Signed|Mixed Platforms
+ Release-Signed|Win32 = Release-Signed|Win32
+ Release-Signed|x64 = Release-Signed|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Win32.ActiveCfg = Debug|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Win32.Build.0 = Debug|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|x64.ActiveCfg = Debug|x64
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|x64.Build.0 = Debug|x64
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Any CPU.ActiveCfg = Release|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Mixed Platforms.Build.0 = Release|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Win32.ActiveCfg = Release|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Win32.Build.0 = Release|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|x64.ActiveCfg = Release|x64
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|x64.Build.0 = Release|x64
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|Any CPU.ActiveCfg = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|Mixed Platforms.ActiveCfg = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|Mixed Platforms.Build.0 = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|Win32.ActiveCfg = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|Win32.Build.0 = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|x64.ActiveCfg = Release|x64
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release-Signed|x64.Build.0 = Release|x64
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Any CPU.ActiveCfg = Debug|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Win32.ActiveCfg = Debug|Win32
- {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Win32.Build.0 = Debug|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|x64.ActiveCfg = Debug|x64
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Any CPU.ActiveCfg = Release|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Win32.ActiveCfg = Release|Win32
{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|x64.ActiveCfg = Release|x64
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|Any CPU.ActiveCfg = Release|Win32
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|Mixed Platforms.ActiveCfg = Release|Win32
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|Mixed Platforms.Build.0 = Release|Win32
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|Win32.ActiveCfg = Release|Win32
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|Win32.Build.0 = Release|Win32
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|x64.ActiveCfg = Release|x64
+ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release-Signed|x64.Build.0 = Release|x64
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|Win32.Build.0 = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Debug|x64.Build.0 = Debug|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Win32.ActiveCfg = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|Win32.Build.0 = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|x64.ActiveCfg = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release|x64.Build.0 = Release|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Mixed Platforms.ActiveCfg = Release-Signed|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Mixed Platforms.Build.0 = Release-Signed|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|Win32.ActiveCfg = Release-Signed|Any CPU
+ {B7CAE5F4-A23F-4438-B5BE-41226618B695}.Release-Signed|x64.ActiveCfg = Release-Signed|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Win32.ActiveCfg = Debug|x86
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Win32.Build.0 = Debug|x86
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|x64.ActiveCfg = Debug|x64
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|x64.Build.0 = Debug|x64
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Win32.ActiveCfg = Release|x86
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Win32.Build.0 = Release|x86
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|x64.ActiveCfg = Release|x64
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|x64.Build.0 = Release|x64
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|Any CPU.Build.0 = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|Mixed Platforms.Build.0 = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|Win32.ActiveCfg = Release|Any CPU
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release-Signed|x64.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/Numerics/Properties/AssemblyInfo.cs b/src/Numerics/Properties/AssemblyInfo.cs
index be790a17..d6f0dff9 100644
--- a/src/Numerics/Properties/AssemblyInfo.cs
+++ b/src/Numerics/Properties/AssemblyInfo.cs
@@ -70,6 +70,7 @@ using System.Runtime.InteropServices;
[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed2314a577643d859571b8b9307c6ff2670525c4598fbb307e57ea65ebf5d4417284cb3da9181636480b623f4db8cc3c1947244ba069df0df86e2431621f51a488f9929519a1c5d0ae595f6e2d0e4094685f0c1229ff658360acbb9f63f1a0258e984dda00dc7ad4fd16dbb550ec1ef8a11df138402b7c1998ee224e652c839b")]
#else
[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests")]
+[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTestsMKL")]
#endif
#endif
diff --git a/src/UnitTests/Properties/Settings.Designer.cs b/src/UnitTests/Properties/Settings.Designer.cs
deleted file mode 100644
index 9df4ec48..00000000
--- a/src/UnitTests/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.34003
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace MathNet.Numerics.UnitTests.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
-
- [global::System.Configuration.ApplicationScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("Managed")]
- public string LinearAlgebraProvider {
- get {
- return ((string)(this["LinearAlgebraProvider"]));
- }
- }
- }
-}
diff --git a/src/UnitTests/Properties/Settings.settings b/src/UnitTests/Properties/Settings.settings
deleted file mode 100644
index aff037fb..00000000
--- a/src/UnitTests/Properties/Settings.settings
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- Managed
-
-
-
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests-MKL.csproj b/src/UnitTests/UnitTests-MKL.csproj
new file mode 100644
index 00000000..013da811
--- /dev/null
+++ b/src/UnitTests/UnitTests-MKL.csproj
@@ -0,0 +1,393 @@
+
+
+
+ 10.0
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}
+ Library
+ Properties
+ MathNet.Numerics.UnitTests
+ MathNet.Numerics.UnitTestsMKL
+ v4.5
+ 512
+
+
+ TRACE;NATIVEMKL
+ ..\..\out\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ true
+ pdbonly
+ prompt
+ MinimumRecommendedRules.ruleset
+ 1591
+ x86
+
+
+ TRACE;DEBUG;NATIVEMKL
+ ..\..\out\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ false
+ full
+ true
+ prompt
+ 4
+ 1591
+ x86
+
+
+ ..\..\out\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ TRACE;NATIVEMKL
+ true
+ 1591
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ true
+ ..\..\out\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ ..\..\obj\MKL\Windows\x86\
+ TRACE;DEBUG;NATIVEMKL
+ 1591
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ ..\..\out\MKL\Windows\x64\
+ ..\..\obj\MKL\Windows\x64\
+ ..\..\obj\MKL\Windows\x64\
+ TRACE;NATIVEMKL
+ true
+ 1591
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ true
+ ..\..\out\MKL\Windows\x64\
+ ..\..\obj\MKL\Windows\x64\
+ ..\..\obj\MKL\Windows\x64\
+ TRACE;DEBUG;NATIVEMKL
+ 1591
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
+ False
+ True
+
+
+
+
+
+
+
+
+ data\Codeplex-5667.csv
+ Always
+
+
+ data\Github-Cureos-1.csv
+ Always
+
+
+ data\Matlab\A.mat
+ Always
+
+
+ data\Matlab\collection-nocompress.mat
+ Always
+
+
+ data\Matlab\collection.mat
+ Always
+
+
+ data\Matlab\complex.mat
+ Always
+
+
+ data\Matlab\sparse-large.mat
+ Always
+
+
+ data\Matlab\sparse-small.mat
+ Always
+
+
+ data\Matlab\sparse_complex.mat
+ Always
+
+
+ data\Matlab\v.mat
+ Always
+
+
+ data\NIST\AtmWtAgt.dat
+ Always
+
+
+ data\NIST\Bennett5.dat
+ Always
+
+
+ data\NIST\BoxBOD.dat
+ Always
+
+
+ data\NIST\Chwirut1.dat
+ Always
+
+
+ data\NIST\Chwirut2.dat
+ Always
+
+
+ data\NIST\DanWood.dat
+ Always
+
+
+ data\NIST\Eckerle4.dat
+ Always
+
+
+ data\NIST\ENSO.dat
+ Always
+
+
+ data\NIST\Filip.dat
+ Always
+
+
+ data\NIST\Gauss1.dat
+ Always
+
+
+ data\NIST\Gauss2.dat
+ Always
+
+
+ data\NIST\Gauss3.dat
+ Always
+
+
+ data\NIST\Hahn1.dat
+ Always
+
+
+ data\NIST\Kirby2.dat
+ Always
+
+
+ data\NIST\Lanczos1.dat
+ Always
+
+
+ data\NIST\Lanczos2.dat
+ Always
+
+
+ data\NIST\Lanczos3.dat
+ Always
+
+
+ data\NIST\Lew.dat
+ Always
+
+
+ data\NIST\Longley.dat
+ Always
+
+
+ data\NIST\Lottery.dat
+ Always
+
+
+ data\NIST\Mavro.dat
+ Always
+
+
+ data\NIST\MGH09.dat
+ Always
+
+
+ data\NIST\MGH10.dat
+ Always
+
+
+ data\NIST\MGH17.dat
+ Always
+
+
+ data\NIST\Michelso.dat
+ Always
+
+
+ data\NIST\Misra1a.dat
+ Always
+
+
+ data\NIST\Misra1b.dat
+ Always
+
+
+ data\NIST\Misra1c.dat
+ Always
+
+
+ data\NIST\Misra1d.dat
+ Always
+
+
+ data\NIST\Nelson.dat
+ Always
+
+
+ data\NIST\NoInt1.dat
+ Always
+
+
+ data\NIST\NoInt2.dat
+ Always
+
+
+ data\NIST\Norris.dat
+ Always
+
+
+ data\NIST\NumAcc1.dat
+ Always
+
+
+ data\NIST\NumAcc2.dat
+ Always
+
+
+ data\NIST\NumAcc3.dat
+ Always
+
+
+ data\NIST\NumAcc4.dat
+ Always
+
+
+ data\NIST\Pontius.dat
+ Always
+
+
+ data\NIST\Rat42.dat
+ Always
+
+
+ data\NIST\Rat43.dat
+ Always
+
+
+ data\NIST\Roszman1.dat
+ Always
+
+
+ data\NIST\SiRstvt.dat
+ Always
+
+
+ data\NIST\SmLs01t.dat
+ Always
+
+
+ data\NIST\SmLs02t.dat
+ Always
+
+
+ data\NIST\SmLs03t.dat
+ Always
+
+
+ data\NIST\SmLs04t.dat
+ Always
+
+
+ data\NIST\SmLs05t.dat
+ Always
+
+
+ data\NIST\SmLs06t.dat
+ Always
+
+
+ data\NIST\SmLs07t.dat
+ Always
+
+
+ data\NIST\SmLs08t.dat
+ Always
+
+
+ data\NIST\SmLs09t.dat
+ Always
+
+
+ data\NIST\Thurber.dat
+ Always
+
+
+ data\NIST\Wampler1.dat
+ Always
+
+
+ data\NIST\Wampler2.dat
+ Always
+
+
+ data\NIST\Wampler3.dat
+ Always
+
+
+ data\NIST\Wampler4.dat
+ Always
+
+
+ data\NIST\Wampler5.dat
+ Always
+
+
+
+ data\NIST\Meixner.dat
+ Always
+
+
+
+
+
+ {b7cae5f4-a23f-4438-b5be-41226618b695}
+ Numerics
+
+
+
+
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests-Portable136.csproj b/src/UnitTests/UnitTests-Portable136.csproj
index 9f0b454e..91a4fb3c 100644
--- a/src/UnitTests/UnitTests-Portable136.csproj
+++ b/src/UnitTests/UnitTests-Portable136.csproj
@@ -59,11 +59,6 @@
-
- True
- True
- Settings.settings
-
@@ -340,10 +335,6 @@
Always
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests-Portable47.csproj b/src/UnitTests/UnitTests-Portable47.csproj
index 4e64a57f..d5c82704 100644
--- a/src/UnitTests/UnitTests-Portable47.csproj
+++ b/src/UnitTests/UnitTests-Portable47.csproj
@@ -60,11 +60,6 @@
-
- True
- True
- Settings.settings
-
@@ -341,10 +336,6 @@
Always
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index 2d9372e2..56026b9c 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -361,11 +361,6 @@
-
- True
- True
- Settings.settings
-
@@ -680,10 +675,6 @@
Always
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs
index 6d4181bb..d585aaf1 100644
--- a/src/UnitTests/UseLinearAlgebraProvider.cs
+++ b/src/UnitTests/UseLinearAlgebraProvider.cs
@@ -39,11 +39,7 @@ namespace MathNet.Numerics.UnitTests
public void BeforeTest(TestDetails testDetails)
{
#if !NET35 && NATIVEMKL
- var provider = Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant();
- if (provider.Contains("mkl"))
- {
- Control.LinearAlgebraProvider = new Providers.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
- }
+ Control.UseNativeMKL();
#endif
}