From 369002c7301c63e2e77ea553901e529b3d3bebb5 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 7 Nov 2017 16:16:08 +0000
Subject: [PATCH] [Xamarin.Android.Project.Tools] Fix the Xamarin.ProjectTools
 so it compiles in VSForMac

Context https://bugzilla.xamarin.com/show_bug.cgi?id=58994

There is a bug in VSForMac which does not like Conditionals on things
like `Content` or `ProjectReference`. This commit moves those itms
into `projitems` files which then allows us to use the `Import`
with the required Conditional. This works around the issue.
---
 .../Xamarin.ProjectTools.Darwin.projitems     | 15 +++++++++++
 .../Xamarin.ProjectTools.Linux.projitems      |  8 ++++++
 .../Xamarin.ProjectTools.Windows.projitems    | 10 ++++++++
 .../Xamarin.ProjectTools.csproj               | 25 +++----------------
 4 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Linux.projitems
 create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems
new file mode 100644
index 00000000000..a2d66bcb395
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Darwin.projitems
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Content Include="$(XAInstallPrefix)xbuild\Xamarin\Android\libzip.3.0.dylib">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\build-tools\libzip\libzip.mdproj">
+      <Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
+      <Name>libzip</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Linux.projitems b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Linux.projitems
new file mode 100644
index 00000000000..06c7c4ed626
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Linux.projitems
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Content Include="$(XAInstallPrefix)xbuild\Xamarin\Android\libzip.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems
new file mode 100644
index 00000000000..d5f0072c4b3
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.Windows.projitems
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\build-tools\libzip-windows\libzip-windows.mdproj">
+      <Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
+      <Name>libzip-windows</Name>
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
index 0aa46a15113..096e4edad8c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
@@ -135,16 +135,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <Content
-        Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))"
-        Include="$(XAInstallPrefix)xbuild\Xamarin\Android\libzip.3.0.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content
-        Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:')) And '$(_LinuxBuildLibZip)' == 'True' "
-        Include="$(XAInstallPrefix)xbuild\Xamarin\Android\libzip.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content
         Include="..\..\..\..\.nuget\NuGet.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -155,22 +145,13 @@
       <Project>{E248B2CA-303B-4645-ADDC-9D4459D550FD}</Project>
       <Name>libZipSharp</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\build-tools\libzip\libzip.mdproj"
-        Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
-      <Project>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</Project>
-      <Name>libzip</Name>
-      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\build-tools\libzip-windows\libzip-windows.mdproj"
-        Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))">
-      <Project>{0DE278D6-000F-4001-BB98-187C0AF58A61}</Project>
-      <Name>libzip-windows</Name>
-      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj">
       <Project>{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}</Project>
       <Name>Xamarin.Android.Tools.AndroidSdk</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)\Xamarin.ProjectTools.Darwin.projitems" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))" />
+  <Import Project="$(MSBuildThisFileDirectory)\Xamarin.ProjectTools.Linux.projitems" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:')) And '$(_LinuxBuildLibZip)' == 'True' " />
+  <Import Project="$(MSBuildThisFileDirectory)\Xamarin.ProjectTools.Windows.projitems" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>