add dml binaries to DirectML package and be more explicit about condition variables (#2520)

This commit is contained in:
Ori Levari 2019-12-02 16:10:38 -08:00 committed by GitHub
parent 092d8f2866
commit da897d76e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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"