diff --git a/.gitignore b/.gitignore
index 78ca2533..03942ba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ _TeamCity*
*.sdf
*.aps
*.opensdf
+*.opendb
*.cachefile
*.swp
diff --git a/paket.lock b/paket.lock
index ec4d7660..a756992a 100644
--- a/paket.lock
+++ b/paket.lock
@@ -15,13 +15,13 @@ GROUP Build
NUGET
remote: http://www.nuget.org/api/v2
specs:
- FAKE (4.11.3)
- FSharp.Compiler.Service (1.4.0.6)
- FSharp.Formatting (2.12.0)
- FSharp.Compiler.Service (1.4.0.6)
- FSharpVSPowerTools.Core (2.1.0)
- FSharpVSPowerTools.Core (2.1.0)
- FSharp.Compiler.Service (>= 1.4.0.6)
+ FAKE (4.20.0)
+ FSharp.Compiler.Service (2.0.0.3)
+ FSharp.Formatting (2.14.0)
+ FSharp.Compiler.Service (>= 2.0.0.3 < 2.1.0)
+ FSharpVSPowerTools.Core (>= 2.3.0 < 2.4.0)
+ FSharpVSPowerTools.Core (2.3.0)
+ FSharp.Compiler.Service (>= 2.0.0.3)
NuGet.CommandLine (3.3.0)
NUnit.Runners (2.6.4)
diff --git a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
index bdffc3e6..fe606179 100644
--- a/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
+++ b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
@@ -66,7 +66,6 @@
-
true
C:\Source\ATLAS\include;..\..\Common;$(IncludePath)
diff --git a/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj b/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
index 5c811855..56baf0e6 100644
--- a/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
+++ b/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
@@ -45,7 +45,6 @@
-
<_ProjectFileVersion>10.0.30319.1
$(SolutionDir)$(Platform)\$(Configuration)\
diff --git a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj
index ab48c6c2..56675e27 100644
--- a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj
+++ b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj
@@ -77,7 +77,6 @@
-
$(ProjectDir)..\..\..\..\out\CUDA\Windows\x86\
$(Platform)\$(Configuration)\
diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
index 38a2fe79..f14c9fb1 100644
--- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
+++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
@@ -91,7 +91,6 @@
-
<_ProjectFileVersion>11.0.50727.1
diff --git a/src/UnitTests/UnitTests-CUDA.csproj b/src/UnitTests/UnitTests-CUDA.csproj
index b3e3074e..59cd8c8d 100644
--- a/src/UnitTests/UnitTests-CUDA.csproj
+++ b/src/UnitTests/UnitTests-CUDA.csproj
@@ -50,6 +50,7 @@
+
diff --git a/src/UnitTests/UnitTests-MKL.csproj b/src/UnitTests/UnitTests-MKL.csproj
index 21d2afcd..c4c27ef0 100644
--- a/src/UnitTests/UnitTests-MKL.csproj
+++ b/src/UnitTests/UnitTests-MKL.csproj
@@ -50,6 +50,7 @@
+
diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj
index 9cd10e22..05e4e553 100644
--- a/src/UnitTests/UnitTests-Net35.csproj
+++ b/src/UnitTests/UnitTests-Net35.csproj
@@ -80,6 +80,9 @@
+
+
+
@@ -98,7 +101,4 @@
True
-
-
-
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests-OpenBLAS.csproj b/src/UnitTests/UnitTests-OpenBLAS.csproj
index ec86c920..6242962a 100644
--- a/src/UnitTests/UnitTests-OpenBLAS.csproj
+++ b/src/UnitTests/UnitTests-OpenBLAS.csproj
@@ -50,6 +50,7 @@
+