From da897d76e7db9c9f3818a009ee4574b6a692ab56 Mon Sep 17 00:00:00 2001
From: Ori Levari <ori.levari@microsoft.com>
Date: Mon, 2 Dec 2019 16:10:38 -0800
Subject: [PATCH] add dml binaries to DirectML package and be more explicit
 about condition variables (#2520)

---
 .../Microsoft.ML.OnnxRuntime.csproj           | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
index 45009e6c8e..345395e029 100644
--- a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
+++ b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
@@ -88,14 +88,34 @@
           Visible="false"
     />
     <None Include="$(NativeBuildOutputDir)\windows.ai.machinelearning.dll"
-          Condition="Exists('$(NativeBuildOutputDir)\windows.ai.machinelearning.dll')"
+          Condition="Exists('$(NativeBuildOutputDir)\windows.ai.machinelearning.dll')
+                     And ('$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime.DirectML'
+                     Or '$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime')"
           PackagePath="\runtimes\win-$(TargetArchitecture)\native"
           Pack="true"
           CopyToOutputDirectory="Always"
           Visible="false"
     />
     <None Include="$(NativeBuildOutputDir)\windows.ai.machinelearning.pdb"
-          Condition="Exists('$(NativeBuildOutputDir)\windows.ai.machinelearning.pdb')"
+          Condition="Exists('$(NativeBuildOutputDir)\windows.ai.machinelearning.pdb')
+                     And ('$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime.DirectML'
+                     Or '$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime')"
+          PackagePath="\runtimes\win-$(TargetArchitecture)\native"
+          Pack="true"
+          CopyToOutputDirectory="Always"
+          Visible="false"
+    />
+    <None Include="$(NativeBuildOutputDir)\DirectML.dll"
+          Condition="Exists('$(NativeBuildOutputDir)\DirectML.dll')
+                     And '$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime.DirectML'"
+          PackagePath="\runtimes\win-$(TargetArchitecture)\native"
+          Pack="true"
+          CopyToOutputDirectory="Always"
+          Visible="false"
+    />
+    <None Include="$(NativeBuildOutputDir)\DirectML.pdb"
+          Condition="Exists('$(NativeBuildOutputDir)\DirectML.pdb')
+                     And '$(OrtPackageId)' == 'Microsoft.ML.OnnxRuntime.DirectML'"
           PackagePath="\runtimes\win-$(TargetArchitecture)\native"
           Pack="true"
           CopyToOutputDirectory="Always"