diff --git a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj b/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj
index e2bbc0bb..897bfbc5 100644
--- a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj
+++ b/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj
@@ -69,19 +69,19 @@
<_ProjectFileVersion>11.0.50727.1
- $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\..\lib\Windows\$(Platform)\
$(Platform)\$(Configuration)\
- $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\..\lib\Windows\$(Platform)\
$(Platform)\$(Configuration)\
- $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\..\lib\Windows\$(Platform)\
$(Platform)\$(Configuration)\
- $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)..\..\..\lib\Windows\$(Platform)\
$(Platform)\$(Configuration)\
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex/MklLinearAlgebraProviderTests.cs b/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex/MklLinearAlgebraProviderTests.cs
deleted file mode 100644
index 1ccbeda8..00000000
--- a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex/MklLinearAlgebraProviderTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Math.NET Numerics, part of the Math.NET Project
-// http://numerics.mathdotnet.com
-// http://github.com/mathnet/mathnet-numerics
-// http://mathnetnumerics.codeplex.com
-//
-// Copyright (c) 2009-2010 Math.NET
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex;
-
-namespace MathNet.Numerics.MklWrapperTests.LinearAlgebra.Complex
-{
- using NUnit.Framework;
-
- ///
- /// Unit test container for the MKL linear algebra provider.
- ///
- [TestFixture]
- public class MklLinearAlgebraProviderTests : LinearAlgebraProviderTests
- {
- ///
- /// Initializes a new instance of the class.
- ///
- public MklLinearAlgebraProviderTests()
- {
- Control.LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
- }
- }
-}
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex32/MklLinearAlgebraProviderTests.cs b/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex32/MklLinearAlgebraProviderTests.cs
deleted file mode 100644
index e3d724a0..00000000
--- a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Complex32/MklLinearAlgebraProviderTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Math.NET Numerics, part of the Math.NET Project
-// http://numerics.mathdotnet.com
-// http://github.com/mathnet/mathnet-numerics
-// http://mathnetnumerics.codeplex.com
-//
-// Copyright (c) 2009-2010 Math.NET
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex32;
-
-namespace MathNet.Numerics.MklWrapperTests.LinearAlgebra.Complex32
-{
- using NUnit.Framework;
-
- ///
- /// Unit test container for the MKL linear algebra provider.
- ///
- [TestFixture]
- public class MklLinearAlgebraProviderTests : LinearAlgebraProviderTests
- {
- ///
- /// Initializes a new instance of the class.
- ///
- public MklLinearAlgebraProviderTests()
- {
- Control.LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
- }
- }
-}
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Double/MklLinearAlgebraProviderTests.cs b/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Double/MklLinearAlgebraProviderTests.cs
deleted file mode 100644
index 38c85328..00000000
--- a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Double/MklLinearAlgebraProviderTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Math.NET Numerics, part of the Math.NET Project
-// http://numerics.mathdotnet.com
-// http://github.com/mathnet/mathnet-numerics
-// http://mathnetnumerics.codeplex.com
-//
-// Copyright (c) 2009-2010 Math.NET
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Double;
-
-namespace MathNet.Numerics.MklWrapperTests.LinearAlgebra.Double
-{
- using NUnit.Framework;
-
- ///
- /// Unit test container for the MKL linear algebra provider.
- ///
- [TestFixture]
- public class MklLinearAlgebraProviderTests : LinearAlgebraProviderTests
- {
- ///
- /// Initializes a new instance of the class.
- ///
- public MklLinearAlgebraProviderTests()
- {
- Control.LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
- }
- }
-}
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Single/MklLinearAlgebraProviderTests.cs b/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Single/MklLinearAlgebraProviderTests.cs
deleted file mode 100644
index 753d2744..00000000
--- a/src/NativeWrappers/Windows/MKLWrapperTests/LinearAlgebra/Single/MklLinearAlgebraProviderTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Math.NET Numerics, part of the Math.NET Project
-// http://numerics.mathdotnet.com
-// http://github.com/mathnet/mathnet-numerics
-// http://mathnetnumerics.codeplex.com
-//
-// Copyright (c) 2009-2010 Math.NET
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Single;
-
-namespace MathNet.Numerics.MklWrapperTests.LinearAlgebra.Single
-{
- using NUnit.Framework;
-
- ///
- /// Unit test container for the MKL linear algebra provider.
- ///
- [TestFixture]
- public class MklLinearAlgebraProviderTests : LinearAlgebraProviderTests
- {
- ///
- /// Initializes a new instance of the class.
- ///
- public MklLinearAlgebraProviderTests()
- {
- Control.LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
- }
- }
-}
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj b/src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj
index e8fe842c..4ed8ed5b 100644
--- a/src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj
+++ b/src/NativeWrappers/Windows/MKLWrapperTests/MKLWrapperTests.csproj
@@ -55,10 +55,6 @@
AllRules.ruleset
-
- False
- ..\..\..\..\out\debug\Net40\MathNet.Numerics.dll
-
False
..\..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll
@@ -93,11 +89,423 @@
LinearAlgebra\Single\LinearAlgebraProviderTests.cs
-
-
-
-
-
+
+ LinearAlgebraTests\Complex32\DenseMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex32\DenseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex32\DenseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Complex32\DenseVectorTests.cs
+
+
+ LinearAlgebraTests\Complex32\DiagonalMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\CholeskyTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\EvdTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\GramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\LUTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\QRTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\SvdTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserCholeskyTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserEvdTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserGramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserLUTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserQRTests.cs
+
+
+ LinearAlgebraTests\Complex32\Factorization\UserSvdTests.cs
+
+
+ LinearAlgebraTests\Complex32\MatrixLoader.cs
+
+
+ LinearAlgebraTests\Complex32\MatrixStructureTheory.cs
+
+
+ LinearAlgebraTests\Complex32\MatrixTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Complex32\MatrixTests.cs
+
+
+ LinearAlgebraTests\Complex32\SparseMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex32\SparseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex32\SparseVectorTest.cs
+
+
+ LinearAlgebraTests\Complex32\SparseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Complex32\UserDefinedMatrix.cs
+
+
+ LinearAlgebraTests\Complex32\UserDefinedMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex32\UserDefinedVector.cs
+
+
+ LinearAlgebraTests\Complex32\UserDefinedVectorTests.cs
+
+
+ LinearAlgebraTests\Complex32\VectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex32\VectorTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Complex32\VectorTests.cs
+
+
+ LinearAlgebraTests\Complex32\VectorTests.Norm.cs
+
+
+ LinearAlgebraTests\Complex\DenseMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex\DenseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex\DenseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Complex\DenseVectorTests.cs
+
+
+ LinearAlgebraTests\Complex\DiagonalMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\CholeskyTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\EvdTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\GramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\LUTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\QRTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\SvdTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserCholeskyTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserEvdTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserGramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserLUTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserQRTests.cs
+
+
+ LinearAlgebraTests\Complex\Factorization\UserSvdTests.cs
+
+
+ LinearAlgebraTests\Complex\MatrixLoader.cs
+
+
+ LinearAlgebraTests\Complex\MatrixStructureTheory.cs
+
+
+ LinearAlgebraTests\Complex\MatrixTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Complex\MatrixTests.cs
+
+
+ LinearAlgebraTests\Complex\SparseMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex\SparseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex\SparseVectorTest.cs
+
+
+ LinearAlgebraTests\Complex\SparseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Complex\UserDefinedMatrix.cs
+
+
+ LinearAlgebraTests\Complex\UserDefinedMatrixTests.cs
+
+
+ LinearAlgebraTests\Complex\UserDefinedVector.cs
+
+
+ LinearAlgebraTests\Complex\UserDefinedVectorTests.cs
+
+
+ LinearAlgebraTests\Complex\VectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Complex\VectorTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Complex\VectorTests.cs
+
+
+ LinearAlgebraTests\Complex\VectorTests.Norm.cs
+
+
+ LinearAlgebraTests\Double\DenseMatrixTests.cs
+
+
+ LinearAlgebraTests\Double\DenseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Double\DenseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Double\DenseVectorTests.cs
+
+
+ LinearAlgebraTests\Double\DiagonalMatrixTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\CholeskyTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\EvdTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\GramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\LUTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\QRTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\SvdTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserCholeskyTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserEvdTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserGramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserLUTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserQRTests.cs
+
+
+ LinearAlgebraTests\Double\Factorization\UserSvdTests.cs
+
+
+ LinearAlgebraTests\Double\MatrixLoader.cs
+
+
+ LinearAlgebraTests\Double\MatrixStructureTheory.cs
+
+
+ LinearAlgebraTests\Double\MatrixTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Double\MatrixTests.cs
+
+
+ LinearAlgebraTests\Double\SparseMatrixTests.cs
+
+
+ LinearAlgebraTests\Double\SparseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Double\SparseVectorTest.cs
+
+
+ LinearAlgebraTests\Double\SparseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Double\UserDefinedMatrix.cs
+
+
+ LinearAlgebraTests\Double\UserDefinedMatrixTests.cs
+
+
+ LinearAlgebraTests\Double\UserDefinedVector.cs
+
+
+ LinearAlgebraTests\Double\UserDefinedVectorTests.cs
+
+
+ LinearAlgebraTests\Double\VectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Double\VectorTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Double\VectorTests.cs
+
+
+ LinearAlgebraTests\Double\VectorTests.Norm.cs
+
+
+ LinearAlgebraTests\MatrixStructureTheory.Access.cs
+
+
+ LinearAlgebraTests\MatrixStructureTheory.cs
+
+
+ LinearAlgebraTests\MatrixStructureTheory.Reform.cs
+
+
+ LinearAlgebraTests\Single\DenseMatrixTests.cs
+
+
+ LinearAlgebraTests\Single\DenseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Single\DenseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Single\DenseVectorTests.cs
+
+
+ LinearAlgebraTests\Single\DiagonalMatrixTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\CholeskyTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\EvdTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\GramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\LUTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\QRTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\SvdTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserCholeskyTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserEvdTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserGramSchmidtTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserLUTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserQRTests.cs
+
+
+ LinearAlgebraTests\Single\Factorization\UserSvdTests.cs
+
+
+ LinearAlgebraTests\Single\MatrixLoader.cs
+
+
+ LinearAlgebraTests\Single\MatrixStructureTheory.cs
+
+
+ LinearAlgebraTests\Single\MatrixTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Single\MatrixTests.cs
+
+
+ LinearAlgebraTests\Single\SparseMatrixTests.cs
+
+
+ LinearAlgebraTests\Single\SparseVectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Single\SparseVectorTest.cs
+
+
+ LinearAlgebraTests\Single\SparseVectorTest.TextHandling.cs
+
+
+ LinearAlgebraTests\Single\UserDefinedMatrix.cs
+
+
+ LinearAlgebraTests\Single\UserDefinedMatrixTests.cs
+
+
+ LinearAlgebraTests\Single\UserDefinedVector.cs
+
+
+ LinearAlgebraTests\Single\UserDefinedVectorTests.cs
+
+
+ LinearAlgebraTests\Single\VectorArithmeticTheory.cs
+
+
+ LinearAlgebraTests\Single\VectorTests.Arithmetic.cs
+
+
+ LinearAlgebraTests\Single\VectorTests.cs
+
+
+ LinearAlgebraTests\Single\VectorTests.Norm.cs
+
+
+ LinearAlgebraTests\VectorArithmeticTheory.cs
+
+
+ Properties\AssemblyInfo.cs
+
+
+ Properties\Settings.Designer.cs
+
+
+ UseLinearAlgebraProvider.cs
+
@@ -117,11 +525,27 @@
-
+
+ Properties\Settings.settings
+
+
+
+
+
+ {eb1a5d32-f264-4bce-beb7-0b97085075be}
+ Numerics.IO
+
+
+ {b7cae5f4-a23f-4438-b5be-41226618b695}
+ Numerics
+
+
+
+
libiomp5md.dll
Always
-
+
MathNET.Numerics.MKL.dll
Always
diff --git a/src/NativeWrappers/Windows/MKLWrapperTests/Properties/AssemblyInfo.cs b/src/NativeWrappers/Windows/MKLWrapperTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4dac153e..00000000
--- a/src/NativeWrappers/Windows/MKLWrapperTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MKLWrapperTests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("MKLWrapperTests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("079338ef-4536-4095-b9cd-ada44d75923f")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NativeWrappers/Windows/NativeWrappers.sln b/src/NativeWrappers/Windows/NativeWrappers.sln
index 7d2b73a9..89e5d4ce 100644
--- a/src/NativeWrappers/Windows/NativeWrappers.sln
+++ b/src/NativeWrappers/Windows/NativeWrappers.sln
@@ -13,6 +13,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MKLWrapper", "MKL\MKLWrappe
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MKLWrapperTests", "MKLWrapperTests\MKLWrapperTests.csproj", "{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics", "..\..\Numerics\Numerics.csproj", "{B7CAE5F4-A23F-4438-B5BE-41226618B695}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Numerics.IO", "..\..\Numerics.IO\Numerics.IO.csproj", "{EB1A5D32-F264-4BCE-BEB7-0B97085075BE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -23,22 +27,33 @@ Global
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|x64
- {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.ActiveCfg = Release|Win32
- {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.Build.0 = Release|Win32
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Debug|Mixed Platforms.Build.0 = Release|x64
{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|x64
- {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|Mixed Platforms.ActiveCfg = Release|x64
+ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|Mixed Platforms.Build.0 = Release|x64
{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|Win32
{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}.Release|x64.Build.0 = Release|Win32
+ {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
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -51,6 +66,48 @@ Global
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release|Win32.ActiveCfg = Release|Any CPU
{D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release|x64.ActiveCfg = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|Any CPU.ActiveCfg = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|Any CPU.Build.0 = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|Mixed Platforms.Build.0 = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|Win32.ActiveCfg = Release|Any CPU
+ {D0AD591B-0CE6-4A6D-8DEA-01777EE09BC3}.Release-Signed|x64.ActiveCfg = Release|Any CPU
+ {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|x64.ActiveCfg = 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|x64.ActiveCfg = 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
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|Win32.ActiveCfg = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release|x64.ActiveCfg = Release|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|Any CPU.ActiveCfg = Release-Signed|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|Any CPU.Build.0 = Release-Signed|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|Mixed Platforms.ActiveCfg = Release-Signed|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|Mixed Platforms.Build.0 = Release-Signed|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|Win32.ActiveCfg = Release-Signed|Any CPU
+ {EB1A5D32-F264-4BCE-BEB7-0B97085075BE}.Release-Signed|x64.ActiveCfg = Release-Signed|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE