From eef01a9471f613b34d888d69e6f97d676bace455 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 15 May 2018 18:00:52 -0500
Subject: [PATCH] Support packages.config

Copy our native assemblies using MSBuild when a consumer is using NuGet packages.config, since NuGet doesn't do this automatically.

Also, add an error when a consumer isn't targeting x64 to tell them ML.NET only supports x64.

Fix #93
---
 pkg/Microsoft.ML/Microsoft.ML.nupkgproj     |  3 +++
 pkg/Microsoft.ML/build/Microsoft.ML.props   | 17 ++++++++++++++++
 pkg/Microsoft.ML/build/Microsoft.ML.targets | 22 +++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 pkg/Microsoft.ML/build/Microsoft.ML.props
 create mode 100644 pkg/Microsoft.ML/build/Microsoft.ML.targets

diff --git a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
index e0ccd6f03c..b0cedd6ad4 100644
--- a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
+++ b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
@@ -14,4 +14,7 @@
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="build\**\*" Pack="true" PackagePath="build" />
+  </ItemGroup>
 </Project>
diff --git a/pkg/Microsoft.ML/build/Microsoft.ML.props b/pkg/Microsoft.ML/build/Microsoft.ML.props
new file mode 100644
index 0000000000..3970c4d664
--- /dev/null
+++ b/pkg/Microsoft.ML/build/Microsoft.ML.props
@@ -0,0 +1,17 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  NuGet packages.config doesn't support native assemblies automatically,
+  so copy the native assemblies to the output directory.
+  -->
+  <ItemGroup Condition="Exists('packages.config') OR
+                        Exists('$(MSBuildProjectName).packages.config') OR
+                        Exists('packages.$(MSBuildProjectName).config')">
+    <Content Include="$(MSBuildThisFileDirectory)\..\runtimes\win-x64\native\*.dll"
+             Condition="'$(PlatformTarget)' == 'x64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML/build/Microsoft.ML.targets b/pkg/Microsoft.ML/build/Microsoft.ML.targets
new file mode 100644
index 0000000000..b889bdd1ec
--- /dev/null
+++ b/pkg/Microsoft.ML/build/Microsoft.ML.targets
@@ -0,0 +1,22 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <EnableMLUnsupportedPlatformTargetCheck Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == ''">true</EnableMLUnsupportedPlatformTargetCheck>
+  </PropertyGroup>
+
+  <Target Name="_CheckForUnsupportedPlatformTarget"
+          Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == 'true'"
+          AfterTargets="_CheckForInvalidConfigurationAndPlatform">
+
+    <!--
+    Special case .NET Core portable applications.  When building a portable .NET Core app,
+    the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
+    what processor architecture will be used.
+    -->
+    <Error Condition="'$(PlatformTarget)' != 'x64' AND
+                      ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
+                      !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
+           Text="Microsoft.ML currently supports 'x64' processor architectures. Please ensure your application is targeting 'x64'." />
+  </Target>
+  
+</Project>
\ No newline at end of file