Providers: change provider binary names and loading to be closer to conventions

cdrnet · cdrnet · commit 0cf753c12e14 · 2021-12-23T19:36:00.000+01:00
diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln
@@ -32,6 +32,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40
 		paket.dependencies = paket.dependencies
 		paket.lock = paket.lock
 		Directory.Build.props = Directory.Build.props
+		build\MathNet.Numerics.CUDA.Win.nuspec = build\MathNet.Numerics.CUDA.Win.nuspec
+		build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec
+		build\MathNet.Numerics.MKL.Linux-x64.nuspec = build\MathNet.Numerics.MKL.Linux-x64.nuspec
+		build\MathNet.Numerics.MKL.Linux-x86.nuspec = build\MathNet.Numerics.MKL.Linux-x86.nuspec
+		build\MathNet.Numerics.MKL.Win.nuspec = build\MathNet.Numerics.MKL.Win.nuspec
+		build\MathNet.Numerics.MKL.Win-x64.nuspec = build\MathNet.Numerics.MKL.Win-x64.nuspec
+		build\MathNet.Numerics.MKL.Win-x86.nuspec = build\MathNet.Numerics.MKL.Win-x86.nuspec
+		build\MathNet.Numerics.OpenBLAS.Win.nuspec = build\MathNet.Numerics.OpenBLAS.Win.nuspec
+		build\NativeProvider.targets = build\NativeProvider.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}"
diff --git a/build/MathNet.Numerics.CUDA.Win.nuspec b/build/MathNet.Numerics.CUDA.Win.nuspec
@@ -20,8 +20,11 @@
         <file src="..\..\out\CUDA\Windows\x64\cublas64_70.dll" target="runtimes\win-x64\native\cublas64_70.dll" />
         <file src="..\..\out\CUDA\Windows\x64\cudart64_70.dll" target="runtimes\win-x64\native\cudart64_70.dll" />
         <file src="..\..\out\CUDA\Windows\x64\cusolver64_70.dll" target="runtimes\win-x64\native\cusolver64_70.dll" />
-        <file src="..\..\out\CUDA\Windows\x64\MathNet.Numerics.CUDA.dll" target="runtimes\win-x64\native\MathNet.Numerics.CUDA.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.CUDA.Win.targets" />
+        <file src="..\..\out\CUDA\Windows\x64\libMathNetNumericsCUDA.dll" target="runtimes\win-x64\native\libMathNetNumericsCUDA.dll" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.CUDA.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.CUDA.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.CUDA.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.CUDA.Win.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Linux-x64.nuspec b/build/MathNet.Numerics.MKL.Linux-x64.nuspec
@@ -19,8 +19,11 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Linux\x64\libiomp5.so" target="runtimes\linux-x64\native\libiomp5.so" />
-        <file src="..\..\out\MKL\Linux\x64\MathNet.Numerics.MKL.dll" target="runtimes\linux-x64\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Linux-x64.targets" />
+        <file src="..\..\out\MKL\Linux\x64\libMathNetNumercisMKL.so" target="runtimes\linux-x64\native\libMathNetNumercisMKL.so" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Linux-x64.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Linux-x86.nuspec b/build/MathNet.Numerics.MKL.Linux-x86.nuspec
@@ -19,8 +19,11 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Linux\x86\libiomp5.so" target="runtimes\linux-x86\native\libiomp5.so" />
-        <file src="..\..\out\MKL\Linux\x86\MathNet.Numerics.MKL.dll" target="runtimes\linux-x86\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Linux-x86.targets" />
+        <file src="..\..\out\MKL\Linux\x86\libMathNetNumercisMKL.so" target="runtimes\linux-x86\native\libMathNetNumercisMKL.so" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Linux-x86.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Linux.nuspec b/build/MathNet.Numerics.MKL.Linux.nuspec
@@ -19,10 +19,13 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Linux\x64\libiomp5.so" target="runtimes\linux-x64\native\libiomp5.so" />
-        <file src="..\..\out\MKL\Linux\x64\MathNet.Numerics.MKL.dll" target="runtimes\linux-x64\native\MathNet.Numerics.MKL.dll" />
+        <file src="..\..\out\MKL\Linux\x64\libMathNetNumercisMKL.so" target="runtimes\linux-x64\native\libMathNetNumercisMKL.so" />
         <file src="..\..\out\MKL\Linux\x86\libiomp5.so" target="runtimes\linux-x86\native\libiomp5.so" />
-        <file src="..\..\out\MKL\Linux\x86\MathNet.Numerics.MKL.dll" target="runtimes\linux-x86\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Linux.targets" />
+        <file src="..\..\out\MKL\Linux\x86\libMathNetNumercisMKL.so" target="runtimes\linux-x86\native\libMathNetNumercisMKL.so" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Linux.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Linux.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Linux.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Linux.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win-x64.nuspec b/build/MathNet.Numerics.MKL.Win-x64.nuspec
@@ -19,8 +19,11 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Windows\x64\libiomp5md.dll" target="runtimes\win-x64\native\libiomp5md.dll" />
-        <file src="..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll" target="runtimes\win-x64\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Win-x64.targets" />
+        <file src="..\..\out\MKL\Windows\x64\libMathNetNumercisMKL.dll" target="runtimes\win-x64\native\libMathNetNumercisMKL.dll" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win-x64.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Win-x64.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win-x86.nuspec b/build/MathNet.Numerics.MKL.Win-x86.nuspec
@@ -19,8 +19,11 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Windows\x86\libiomp5md.dll" target="runtimes\win-x86\native\libiomp5md.dll" />
-        <file src="..\..\out\MKL\Windows\x86\MathNet.Numerics.MKL.dll" target="runtimes\win-x86\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Win-x86.targets" />
+        <file src="..\..\out\MKL\Windows\x86\libMathNetNumercisMKL.dll" target="runtimes\win-x86\native\libMathNetNumercisMKL.dll" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win-x86.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Win-x86.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win.nuspec b/build/MathNet.Numerics.MKL.Win.nuspec
@@ -19,10 +19,13 @@
     </metadata>
     <files>
         <file src="..\..\out\MKL\Windows\x64\libiomp5md.dll" target="runtimes\win-x64\native\libiomp5md.dll" />
-        <file src="..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll" target="runtimes\win-x64\native\MathNet.Numerics.MKL.dll" />
+        <file src="..\..\out\MKL\Windows\x64\libMathNetNumercisMKL.dll" target="runtimes\win-x64\native\libMathNetNumercisMKL.dll" />
         <file src="..\..\out\MKL\Windows\x86\libiomp5md.dll" target="runtimes\win-x86\native\libiomp5md.dll" />
-        <file src="..\..\out\MKL\Windows\x86\MathNet.Numerics.MKL.dll" target="runtimes\win-x86\native\MathNet.Numerics.MKL.dll" />
-        <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.MKL.Win.targets" />
+        <file src="..\..\out\MKL\Windows\x86\libMathNetNumercisMKL.dll" target="runtimes\win-x86\native\libMathNetNumercisMKL.dll" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.MKL.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.MKL.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.MKL.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.MKL.Win.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.OpenBLAS.Win.nuspec b/build/MathNet.Numerics.OpenBLAS.Win.nuspec
@@ -27,8 +27,12 @@
         <file src="..\..\out\OpenBLAS\Windows\x86\libgfortran-3.dll" target="runtimes\win-x86\native\libgfortran-3.dll" />
         <file src="..\..\out\OpenBLAS\Windows\x86\libopenblas.dll" target="runtimes\win-x86\native\libopenblas.dll" />
         <file src="..\..\out\OpenBLAS\Windows\x86\libquadmath-0.dll" target="runtimes\win-x86\native\libquadmath-0.dll" />
-        <file src="..\..\out\OpenBLAS\Windows\x86\MathNet.Numerics.OpenBLAS.dll" target="runtimes\win-x86\native\MathNet.Numerics.OpenBLAS.dll" />
+        <file src="..\..\out\OpenBLAS\Windows\x86\libMathNetNumericsOpenBLAS.dll" target="runtimes\win-x86\native\libMathNetNumericsOpenBLAS.dll" />
         <file src="..\..\build\NativeProvider.targets" target="build\MathNet.Numerics.OpenBLAS.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net461\MathNet.Numerics.OpenBLAS.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="build\net48\MathNet.Numerics.OpenBLAS.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net461\MathNet.Numerics.OpenBLAS.Win.targets" />
+        <file src="..\..\build\NativeProvider.targets" target="buildTransitive\net48\MathNet.Numerics.OpenBLAS.Win.targets" />
         <file src="..\..\build\icon.png" target="icon.png" />
     </files>
 </package>
diff --git a/build/NativeProvider.targets b/build/NativeProvider.targets
@@ -4,11 +4,12 @@
   **               Math.NET Native Provider Interop Files                     **
   ******************************************************************************
   -->
-  <ItemGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true' And '$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
-    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.dll" />
-    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.so" />
+  <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*.dll" />
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*.so" />
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*.dylib" />
     <None Include="@(MathNetInteropFiles)">
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>runtimes/%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/docs/MKL.md b/docs/MKL.md
@@ -75,7 +75,7 @@ Default Behavior on Windows
 
 On Windows it is usually enough to make sure the native libraries are in the
 same folder as the executable. Reference the appropriate NuGet package and set
-"Copy to Output Directory" for both MathNet.Numerics.MKL.dll and libiomp5md.dll
+"Copy to Output Directory" for both libMathNetNumercisMKL.dll and libiomp5md.dll
 to "Copy always", or place the two native DLLs manually into the same directory
 as your application's executable. There is no need to set the native provider
 path explicitly.
@@ -119,7 +119,7 @@ To build the MKL native provider for OSX:
     mkl_build.sh
     lionel:OSX Lionel$ sh mkl_build.sh
 
-Check the /x86 and /x64 folders in mathnet-numerics/out/MKL: you should now find the `libiomp5.dylib` and `MathNet.Numerics.MKL.dll` libaries.
+Check the /x86 and /x64 folders in mathnet-numerics/out/MKL: you should now find the `libiomp5.dylib` and `libMathNetNumercisMKL.dll` libaries.
 You need to add the path to the generated libraries in your `DYLD_LIBRARY_PATH` environment variable (which you can move to the folder of you choice before).
 To do that, open your /Users/Lionel/.bas_profile.sh file with a text editor and add the following statements.
 
@@ -190,7 +190,7 @@ and use `ldconfig` to tell where to look for the libraries, but for now we'll ju
 
     [lang=sh]
     sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/libiomp5.so /usr/lib/
-    sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/MathNet.Numerics.MKL.dll /usr/lib/
+    sudo cp packages/MathNet.Numerics.MKL.Linux-x64.1.3.0/content/libMathNetNumercisMKL.dll /usr/lib/
 
 Then we're all set and can just call `Control.UseNativeMKL()` if we want to use the native provider.
 Let's create the following C# file `Example.cs`:
diff --git a/src/NativeProviders/Linux/mkl_build.sh b/src/NativeProviders/Linux/mkl_build.sh
@@ -7,10 +7,10 @@ export OUT=../../../out/MKL/Linux
 mkdir -p $OUT/x64
 mkdir -p $OUT/x86
 
-g++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/MathNet.Numerics.MKL.dll -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group  $MKL/lib/intel64/libmkl_intel_lp64.a $MKL/lib/intel64/libmkl_intel_thread.a $MKL/lib/intel64/libmkl_core.a -Wl,--end-group -L$OPENMP/intel64 -liomp5 -lpthread -lm  
+g++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumercisMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp -Wl,--start-group  $MKL/lib/intel64/libmkl_intel_lp64.a $MKL/lib/intel64/libmkl_intel_thread.a $MKL/lib/intel64/libmkl_core.a -Wl,--end-group -L$OPENMP/intel64 -liomp5 -lpthread -lm  
 
 cp $OPENMP/intel64/libiomp5.so  $OUT/x64/
 
-g++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/MathNet.Numerics.MKL.dll -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  -Wl,--start-group $MKL/lib/ia32/libmkl_intel.a $MKL/lib/ia32/libmkl_intel_thread.a $MKL/lib/ia32/libmkl_core.a -Wl,--end-group -L$OPENMP/ia32 -liomp5 -lpthread -lm  
+g++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumercisMKL.so -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  -Wl,--start-group $MKL/lib/ia32/libmkl_intel.a $MKL/lib/ia32/libmkl_intel_thread.a $MKL/lib/ia32/libmkl_core.a -Wl,--end-group -L$OPENMP/ia32 -liomp5 -lpthread -lm  
 
 cp $OPENMP/ia32/libiomp5.so  $OUT/x86/
diff --git a/src/NativeProviders/MKL/resource.rc b/src/NativeProviders/MKL/resource.rc
@@ -73,7 +73,7 @@ BEGIN
             VALUE "FileVersion", "2.6.0.0"
             VALUE "InternalName", "Math.NET"
             VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2021"
-            VALUE "OriginalFilename", "MathNet.Numerics.MKL"
+            VALUE "OriginalFilename", "libMathNetNumercisMKL"
             VALUE "ProductName", "Math.NET Numerics"
             VALUE "ProductVersion", "2.6.0.0"
         END
diff --git a/src/NativeProviders/OSX/mkl_build.sh b/src/NativeProviders/OSX/mkl_build.sh
@@ -6,10 +6,10 @@ export OUT=../../../out/MKL/OSX
 mkdir -p $OUT/x64
 mkdir -p $OUT/x86
 
-clang++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/MathNet.Numerics.MKL.dll -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
+clang++ -std=c++11 -D_M_X64 -DGCC -m64 --shared -fPIC -o $OUT/x64/libMathNetNumercisMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
 
 cp $OPENMP/libiomp5.dylib  $OUT/x64/
 
-clang++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/MathNet.Numerics.MKL.dll -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
+clang++ -std=c++11 -D_M_IX86 -DGCC -m32 --shared -fPIC -o $OUT/x86/libMathNetNumercisMKL.dylib -I$MKL/include -I../Common -I../MKL ../MKL/memory.c ../MKL/capabilities.cpp ../MKL/vector_functions.c ../Common/blas.c ../Common/lapack.cpp ../MKL/fft.cpp  $MKL/lib/libmkl_intel_lp64.a $MKL/lib/libmkl_core.a $MKL/lib/libmkl_intel_thread.a -L$OPENMP -liomp5 -lpthread -lm
 
 cp $OPENMP/libiomp5.dylib  $OUT/x86/
diff --git a/src/NativeProviders/OpenBLAS/resource.rc b/src/NativeProviders/OpenBLAS/resource.rc
@@ -73,7 +73,7 @@ BEGIN
             VALUE "FileVersion", "0.2.0.0"
             VALUE "InternalName", "Math.NET"
             VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2015"
-            VALUE "OriginalFilename", "MathNet.Numerics.OpenBLAS"
+            VALUE "OriginalFilename", "libMathNetNumericsOpenBLAS"
             VALUE "ProductName", "Math.NET Numerics"
             VALUE "ProductVersion", "0.2.0.0"
         END
diff --git a/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj b/src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj
@@ -81,21 +81,21 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x86\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>MathNet.Numerics.CUDA</TargetName>
+    <TargetName>libMathNetNumericsCUDA</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>MathNet.Numerics.CUDA</TargetName>
+    <TargetName>libMathNetNumericsCUDA</TargetName>
     <OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x64\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x86\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>MathNet.Numerics.CUDA</TargetName>
+    <TargetName>libMathNetNumericsCUDA</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>MathNet.Numerics.CUDA</TargetName>
+    <TargetName>libMathNetNumericsCUDA</TargetName>
     <OutDir>$(ProjectDir)..\..\..\..\out\CUDA\Windows\x64\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
diff --git a/src/NativeProviders/Windows/OpenBLAS/OpenBLASWrapper.vcxproj b/src/NativeProviders/Windows/OpenBLAS/OpenBLASWrapper.vcxproj
diff --git a/src/Numerics/SpecialFunctions/MarcumQ.cs b/src/Numerics/SpecialFunctions/MarcumQ.cs
diff --git a/src/Providers.CUDA/SafeNativeMethods.cs b/src/Providers.CUDA/SafeNativeMethods.cs
diff --git a/src/Providers.MKL/MklProvider.cs b/src/Providers.MKL/MklProvider.cs
diff --git a/src/Providers.MKL/NativeProviderLoader.cs b/src/Providers.MKL/NativeProviderLoader.cs
diff --git a/src/Providers.MKL/SafeNativeMethods.cs b/src/Providers.MKL/SafeNativeMethods.cs
diff --git a/src/Providers.OpenBLAS/SafeNativeMethods.cs b/src/Providers.OpenBLAS/SafeNativeMethods.cs
