From e98be5ede2de81371bbf9d8e22204ebf245d1fe1 Mon Sep 17 00:00:00 2001
From: Kuan Bartel <kjbartel@users.noreply.github.com>
Date: Wed, 13 May 2015 11:16:10 +0900
Subject: [PATCH] Simplified targets files to instead use 'Content' elements
 rather than 'Copy' and 'Delete' tasks. This is important as the copy and
 delete tasks won't work for other projects referencing a project which uses
 one of the MathNet nuget packages. Installer projects such as WiX or VS Setup
 projects similarly won't find the required library files unless they are
 'Content'.

---
 build/MathNet.Numerics.CUDA.Win.targets     | 65 +++------------------
 build/MathNet.Numerics.MKL.Win.targets      | 65 +++------------------
 build/MathNet.Numerics.OpenBLAS.Win.targets | 65 +++------------------
 3 files changed, 27 insertions(+), 168 deletions(-)

diff --git a/build/MathNet.Numerics.CUDA.Win.targets b/build/MathNet.Numerics.CUDA.Win.targets
index 74be39a2..175782ac 100644
--- a/build/MathNet.Numerics.CUDA.Win.targets
+++ b/build/MathNet.Numerics.CUDA.Win.targets
@@ -8,67 +8,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
   ******************************************************************************
-  **                    MathNet Interop Library Build Items                   **
+  **                    MathNet Interop Library Files                         **
   ******************************************************************************
   -->
 
-  <ItemGroup>
-    <MathNetInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
-                                   HasTrailingSlash('$(MSBuildThisFileDirectory)')"
-                        Include="$(MSBuildThisFileDirectory)**\*.dll" />
-  </ItemGroup>
-
-  <!--
-  ******************************************************************************
-  **                   MathNet Interop Library Build Targets                  **
-  ******************************************************************************
-  -->
-
-  <Target Name="CopyMathNetInteropFiles"
-          Condition="'$(CopyMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')"
-          Inputs="@(MathNetInteropFiles)"
-          Outputs="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')">
+  <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
+                         HasTrailingSlash('$(MSBuildThisFileDirectory)')">
     <!--
         NOTE: Copy "MathNet.Numerics.CUDA.dll" and all related files, for every
               architecture that we support, to the build output directory.
     -->
-    <Copy SourceFiles="@(MathNetInteropFiles)"
-          DestinationFiles="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  -->
-
-  <Target Name="CleanMathNetInteropFiles"
-          Condition="'$(CleanMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')">
-    <!--
-        NOTE: Delete "MathNet.Numerics.CUDA.dll" and all related files, for every
-              architecture that we support, from the build output directory.
-    -->
-    <Delete Files="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  **                 MathNet Interop Library Build Properties                 **
-  ******************************************************************************
-  -->
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      $(BuildDependsOn);
-      CopyMathNetInteropFiles;
-    </BuildDependsOn>
-    <CleanDependsOn>
-      $(CleanDependsOn);
-      CleanMathNetInteropFiles;
-    </CleanDependsOn>
-  </PropertyGroup>
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <Content Include="@(MathNetInteropFiles)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/build/MathNet.Numerics.MKL.Win.targets b/build/MathNet.Numerics.MKL.Win.targets
index 870de2b4..b341d614 100644
--- a/build/MathNet.Numerics.MKL.Win.targets
+++ b/build/MathNet.Numerics.MKL.Win.targets
@@ -8,67 +8,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
   ******************************************************************************
-  **                    MathNet Interop Library Build Items                   **
+  **                    MathNet Interop Library Files                         **
   ******************************************************************************
   -->
 
-  <ItemGroup>
-    <MathNetInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
-                                   HasTrailingSlash('$(MSBuildThisFileDirectory)')"
-                        Include="$(MSBuildThisFileDirectory)**\*.dll" />
-  </ItemGroup>
-
-  <!--
-  ******************************************************************************
-  **                   MathNet Interop Library Build Targets                  **
-  ******************************************************************************
-  -->
-
-  <Target Name="CopyMathNetInteropFiles"
-          Condition="'$(CopyMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')"
-          Inputs="@(MathNetInteropFiles)"
-          Outputs="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')">
+  <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
+                         HasTrailingSlash('$(MSBuildThisFileDirectory)')">
     <!--
         NOTE: Copy "MathNet.Numerics.MKL.dll" and all related files, for every
               architecture that we support, to the build output directory.
     -->
-    <Copy SourceFiles="@(MathNetInteropFiles)"
-          DestinationFiles="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  -->
-
-  <Target Name="CleanMathNetInteropFiles"
-          Condition="'$(CleanMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')">
-    <!--
-        NOTE: Delete "MathNet.Numerics.MKL.dll" and all related files, for every
-              architecture that we support, from the build output directory.
-    -->
-    <Delete Files="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  **                 MathNet Interop Library Build Properties                 **
-  ******************************************************************************
-  -->
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      $(BuildDependsOn);
-      CopyMathNetInteropFiles;
-    </BuildDependsOn>
-    <CleanDependsOn>
-      $(CleanDependsOn);
-      CleanMathNetInteropFiles;
-    </CleanDependsOn>
-  </PropertyGroup>
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <Content Include="@(MathNetInteropFiles)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/build/MathNet.Numerics.OpenBLAS.Win.targets b/build/MathNet.Numerics.OpenBLAS.Win.targets
index dcfd4c64..2b6d4fc3 100644
--- a/build/MathNet.Numerics.OpenBLAS.Win.targets
+++ b/build/MathNet.Numerics.OpenBLAS.Win.targets
@@ -8,67 +8,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
   ******************************************************************************
-  **                    MathNet Interop Library Build Items                   **
+  **                    MathNet Interop Library Files                         **
   ******************************************************************************
   -->
 
-  <ItemGroup>
-    <MathNetInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
-                                   HasTrailingSlash('$(MSBuildThisFileDirectory)')"
-                        Include="$(MSBuildThisFileDirectory)**\*.dll" />
-  </ItemGroup>
-
-  <!--
-  ******************************************************************************
-  **                   MathNet Interop Library Build Targets                  **
-  ******************************************************************************
-  -->
-
-  <Target Name="CopyMathNetInteropFiles"
-          Condition="'$(CopyMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')"
-          Inputs="@(MathNetInteropFiles)"
-          Outputs="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')">
+  <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
+                         HasTrailingSlash('$(MSBuildThisFileDirectory)')">
     <!--
         NOTE: Copy "MathNet.Numerics.OpenBLAS.dll" and all related files, for every
               architecture that we support, to the build output directory.
     -->
-    <Copy SourceFiles="@(MathNetInteropFiles)"
-          DestinationFiles="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  -->
-
-  <Target Name="CleanMathNetInteropFiles"
-          Condition="'$(CleanMathNetInteropFiles)' != 'false' And
-                     '$(OutputPath)' != '' And
-                     HasTrailingSlash('$(OutputPath)') And
-                     Exists('$(OutputPath)')">
-    <!--
-        NOTE: Delete "MathNet.Numerics.OpenBLAS.dll" and all related files, for every
-              architecture that we support, from the build output directory.
-    -->
-    <Delete Files="@(MathNetInteropFiles -> '$(OutputPath)%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <!--
-  ******************************************************************************
-  **                 MathNet Interop Library Build Properties                 **
-  ******************************************************************************
-  -->
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      $(BuildDependsOn);
-      CopyMathNetInteropFiles;
-    </BuildDependsOn>
-    <CleanDependsOn>
-      $(CleanDependsOn);
-      CleanMathNetInteropFiles;
-    </CleanDependsOn>
-  </PropertyGroup>
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <Content Include="@(MathNetInteropFiles)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>