From 48cfc8a73b5549bbddad0c19f464a6b3296cb3bb Mon Sep 17 00:00:00 2001
From: Trevor Balcom <tbalcom@users.noreply.github.com>
Date: Tue, 3 Apr 2018 11:38:45 -0400
Subject: [PATCH] Reverts IsXamarinForms changes in Playground (#2754)

* Reverts MvvmCross\Projects\Directory.build.props IsXamarinForms changes because it was causing the Xamarin.Forms library to be imported into Playground.Droid.

Adds <PackageReference/> to import Xamarin.Forms for Playground.Forms.* projects.

* Moving Xamarin Forms Package Reference into separate targets file - allows for XF version to be changed in one place
---
 Directory.build.props                                       | 4 ----
 Directory.build.targets                                     | 2 ++
 Projects/Directory.build.props                              | 5 -----
 .../Playground.Forms.Droid/Playground.Forms.Droid.csproj    | 1 +
 .../Playground.Forms.Mac/Playground.Forms.Mac.csproj        | 6 +-----
 .../Playground.Forms.UI/Playground.Forms.UI.csproj          | 1 +
 .../Playground.Forms.Uwp/Playground.Forms.Uwp.csproj        | 1 +
 .../Playground.Forms.Wpf/Playground.Forms.Wpf.csproj        | 1 +
 .../Playground.Forms.iOS/Playground.Forms.iOS.csproj        | 1 +
 XamarinForms.targets                                        | 5 +++++
 10 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 XamarinForms.targets

diff --git a/Directory.build.props b/Directory.build.props
index 1753b3704..385877195 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -35,8 +35,4 @@
   <ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> 
   </ItemGroup>
-
-  <ItemGroup Condition="'$(IsXamarinForms)' == 'true'">
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
-  </ItemGroup>
 </Project>
diff --git a/Directory.build.targets b/Directory.build.targets
index 54361fba6..0b144eb8a 100644
--- a/Directory.build.targets
+++ b/Directory.build.targets
@@ -38,4 +38,6 @@
   <ItemGroup Condition="$(TargetFramework.StartsWith('uap')) and '$(IsLibraryProject)' == 'true' ">
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
   </ItemGroup>
+
+  <Import Project="XamarinForms.targets" Condition="'$(IsXamarinForms)' == 'true'"/>
 </Project>
\ No newline at end of file
diff --git a/Projects/Directory.build.props b/Projects/Directory.build.props
index 9a907c9cf..fa8596e2d 100644
--- a/Projects/Directory.build.props
+++ b/Projects/Directory.build.props
@@ -12,10 +12,5 @@
 
     <Platform>AnyCPU</Platform>
     <DebugType>full</DebugType>
-    <IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
   </PropertyGroup>
-
-  <ItemGroup Condition="'$(IsXamarinForms)' == 'true'">
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/Playground/Playground.Forms.Droid/Playground.Forms.Droid.csproj b/Projects/Playground/Playground.Forms.Droid/Playground.Forms.Droid.csproj
index fa22aa32b..ee7daadb0 100644
--- a/Projects/Playground/Playground.Forms.Droid/Playground.Forms.Droid.csproj
+++ b/Projects/Playground/Playground.Forms.Droid/Playground.Forms.Droid.csproj
@@ -200,5 +200,6 @@
       <Name>Playground.Forms.UI</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\XamarinForms.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Projects/Playground/Playground.Forms.Mac/Playground.Forms.Mac.csproj b/Projects/Playground/Playground.Forms.Mac/Playground.Forms.Mac.csproj
index b0817f464..b1fbe7401 100644
--- a/Projects/Playground/Playground.Forms.Mac/Playground.Forms.Mac.csproj
+++ b/Projects/Playground/Playground.Forms.Mac/Playground.Forms.Mac.csproj
@@ -120,10 +120,6 @@
       <Name>Playground.Forms.UI</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms">
-      <Version>2.5.0.280555</Version>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="..\..\..\XamarinForms.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Projects/Playground/Playground.Forms.UI/Playground.Forms.UI.csproj b/Projects/Playground/Playground.Forms.UI/Playground.Forms.UI.csproj
index 58e93245c..6d2663805 100644
--- a/Projects/Playground/Playground.Forms.UI/Playground.Forms.UI.csproj
+++ b/Projects/Playground/Playground.Forms.UI/Playground.Forms.UI.csproj
@@ -13,4 +13,5 @@
     <ProjectReference Include="..\Playground.Core\Playground.Core.csproj" />
   </ItemGroup>
 
+  <Import Project="..\..\..\XamarinForms.targets" />
 </Project>
diff --git a/Projects/Playground/Playground.Forms.Uwp/Playground.Forms.Uwp.csproj b/Projects/Playground/Playground.Forms.Uwp/Playground.Forms.Uwp.csproj
index 4b7e55627..723f6acda 100644
--- a/Projects/Playground/Playground.Forms.Uwp/Playground.Forms.Uwp.csproj
+++ b/Projects/Playground/Playground.Forms.Uwp/Playground.Forms.Uwp.csproj
@@ -176,6 +176,7 @@
       <Name>Playground.Forms.UI</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\XamarinForms.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Projects/Playground/Playground.Forms.Wpf/Playground.Forms.Wpf.csproj b/Projects/Playground/Playground.Forms.Wpf/Playground.Forms.Wpf.csproj
index ddb28a6f0..bd331eef7 100644
--- a/Projects/Playground/Playground.Forms.Wpf/Playground.Forms.Wpf.csproj
+++ b/Projects/Playground/Playground.Forms.Wpf/Playground.Forms.Wpf.csproj
@@ -125,5 +125,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <Import Project="..\..\..\XamarinForms.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Projects/Playground/Playground.Forms.iOS/Playground.Forms.iOS.csproj b/Projects/Playground/Playground.Forms.iOS/Playground.Forms.iOS.csproj
index 07726f3c6..5061d7160 100644
--- a/Projects/Playground/Playground.Forms.iOS/Playground.Forms.iOS.csproj
+++ b/Projects/Playground/Playground.Forms.iOS/Playground.Forms.iOS.csproj
@@ -156,5 +156,6 @@
     <BundleResource Include="Resources\MvvmCross%402x.png" />
     <BundleResource Include="Resources\MvvmCross%403x.png" />
   </ItemGroup>
+  <Import Project="..\..\..\XamarinForms.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/XamarinForms.targets b/XamarinForms.targets
new file mode 100644
index 000000000..7f966d44a
--- /dev/null
+++ b/XamarinForms.targets
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+  </ItemGroup>
+</Project>
\ No newline at end of file