From 6d6194a96f4e74c65072e2ffa52fe0dd997f3f50 Mon Sep 17 00:00:00 2001
From: Chris Hamons <chris.hamons@xamarin.com>
Date: Fri, 6 Jan 2017 13:30:30 -0600
Subject: [PATCH] Change dylib location and use new shared project

---
 csharp/Mac/CustomBuildAction.targets |  4 +-
 csharp/Mac/Facebook.Yoga.Mac.csproj  | 72 +---------------------------
 csharp/Mac/Facebook.Yoga.Mac.sln     |  2 +
 3 files changed, 5 insertions(+), 73 deletions(-)

diff --git a/csharp/Mac/CustomBuildAction.targets b/csharp/Mac/CustomBuildAction.targets
index 8f116ebd..53f9c849 100644
--- a/csharp/Mac/CustomBuildAction.targets
+++ b/csharp/Mac/CustomBuildAction.targets
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<!-- The # and , in this path does not play nice with the binding project logic, so make a copy -->
-	<Target Name="CopyInNativeLib" Inputs="..\..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" Outputs="$(ProjectDir)libyoga.dylib">
-	    <Copy SourceFiles="..\..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)/libyoga.dylib" />
+	<Target Name="CopyInNativeLib" Inputs="..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" Outputs="$(ProjectDir)libyoga.dylib">
+	    <Copy SourceFiles="..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)/libyoga.dylib" />
 	</Target>
 </Project>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.csproj b/csharp/Mac/Facebook.Yoga.Mac.csproj
index 14e10168..63dcfe16 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.csproj
+++ b/csharp/Mac/Facebook.Yoga.Mac.csproj
@@ -33,77 +33,6 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\YogaWrap.cs">
-      <Link>YogaWrap.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaSize.cs">
-      <Link>YogaSize.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaPrintOptions.cs">
-      <Link>YogaPrintOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaPositionType.cs">
-      <Link>YogaPositionType.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaOverflow.cs">
-      <Link>YogaOverflow.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaNode.cs">
-      <Link>YogaNode.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaNode.Create.cs">
-      <Link>YogaNode.Create.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaMeasureMode.cs">
-      <Link>YogaMeasureMode.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaMeasureFunc.cs">
-      <Link>YogaMeasureFunc.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaLogLevel.cs">
-      <Link>YogaLogLevel.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaLogger.cs">
-      <Link>YogaLogger.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaJustify.cs">
-      <Link>YogaJustify.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaFlexDirection.cs">
-      <Link>YogaFlexDirection.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaExperimentalFeature.cs">
-      <Link>YogaExperimentalFeature.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaEdge.cs">
-      <Link>YogaEdge.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaDirection.cs">
-      <Link>YogaDirection.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaDimension.cs">
-      <Link>YogaDimension.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaConstants.cs">
-      <Link>YogaConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\YogaAlign.cs">
-      <Link>YogaAlign.cs</Link>
-    </Compile>
-    <Compile Include="..\Spacing.cs">
-      <Link>Spacing.cs</Link>
-    </Compile>
-    <Compile Include="..\Native.cs">
-      <Link>Native.cs</Link>
-    </Compile>
-    <Compile Include="..\MeasureOutput.cs">
-      <Link>MeasureOutput.cs</Link>
-    </Compile>
-    <Compile Include="..\MeasureFunction.cs">
-      <Link>MeasureFunction.cs</Link>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
   </ItemGroup>
@@ -116,6 +45,7 @@
       <SmartLink>False</SmartLink>
     </NativeReference>
   </ItemGroup>
+  <Import Project="..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" Condition="Exists('..\Facebook.Yoga\Facebook.Yoga.Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
   <Import Project="CustomBuildAction.targets" />  
 </Project>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.sln b/csharp/Mac/Facebook.Yoga.Mac.sln
index 70254fb3..c99766c6 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.sln
+++ b/csharp/Mac/Facebook.Yoga.Mac.sln
@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Test", "F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac", "Facebook.Yoga.Mac.csproj", "{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU