diff --git a/csharp/Mac/CustomBuildAction.targets b/csharp/Mac/CustomBuildAction.targets
index 2ac58ff0..db3cbddf 100644
--- a/csharp/Mac/CustomBuildAction.targets
+++ b/csharp/Mac/CustomBuildAction.targets
@@ -1,15 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
     <PropertyGroup>
-        <CompileDependsOn>Buck;CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
+        <CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
     </PropertyGroup>
-
-    <Target Name="Buck">
-        <Exec WorkingDirectory="$(OutDir)" Command="buck build //csharp:yoganet#default,shared" />
-    </Target>
-
-    <!-- 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="NativeLibrary" Outputs="$(ProjectDir)libyoga.dylib">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)buck-build.sh //csharp:yoganet#default,shared" />
+        <Copy SourceFiles="$(ProjectDir)..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)libyoga.dylib" SkipUnchangedFiles="true" />
     </Target>
 </Project>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/AppDelegate.cs b/csharp/Mac/Facebook.Yoga.Mac.Sample/AppDelegate.cs
similarity index 94%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/AppDelegate.cs
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/AppDelegate.cs
index f6a46196..fa4bbf95 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/AppDelegate.cs
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/AppDelegate.cs
@@ -9,7 +9,7 @@
 using AppKit;
 using Foundation;
 
-namespace Facebook.Yoga.Mac.Test
+namespace Facebook.Yoga.Mac.Sample
 {
     [Register("AppDelegate")]
     public class AppDelegate : NSApplicationDelegate
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/Entitlements.plist b/csharp/Mac/Facebook.Yoga.Mac.Sample/Entitlements.plist
similarity index 100%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/Entitlements.plist
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/Entitlements.plist
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj b/csharp/Mac/Facebook.Yoga.Mac.Sample/Facebook.Yoga.Mac.Sample.csproj
similarity index 94%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/Facebook.Yoga.Mac.Sample.csproj
index 70535e37..4337f095 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/Facebook.Yoga.Mac.Sample.csproj
@@ -6,8 +6,8 @@
     <ProjectGuid>{64E0AB97-A904-4607-A535-EEA5A966C09E}</ProjectGuid>
     <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Facebook.Yoga.Mac.Test</RootNamespace>
-    <AssemblyName>Facebook.Yoga.Mac.Test</AssemblyName>
+    <RootNamespace>Facebook.Yoga.Mac.Sample</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac.Sample</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/Info.plist b/csharp/Mac/Facebook.Yoga.Mac.Sample/Info.plist
similarity index 89%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/Info.plist
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/Info.plist
index 7e955671..3c1e9003 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/Info.plist
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleName</key>
-	<string>Facebook.Yoga.Mac.Test</string>
+	<string>Facebook.Yoga.Mac.Sample</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.companyname.facebook-yoga-mac-test</string>
+	<string>com.facebook.facebook-yoga-mac-sample</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/Main.cs b/csharp/Mac/Facebook.Yoga.Mac.Sample/Main.cs
similarity index 91%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/Main.cs
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/Main.cs
index 97adb4db..17e74ec2 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/Main.cs
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/Main.cs
@@ -8,7 +8,7 @@
 
 using AppKit;
 
-namespace Facebook.Yoga.Mac.Test
+namespace Facebook.Yoga.Mac.Sample
 {
     static class MainClass
     {
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/Main.storyboard b/csharp/Mac/Facebook.Yoga.Mac.Sample/Main.storyboard
similarity index 98%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/Main.storyboard
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/Main.storyboard
index 1d8f728d..6b7fa93d 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/Main.storyboard
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/Main.storyboard
@@ -10,11 +10,11 @@
 				<application id="hnw-xV-0zn" sceneMemberID="viewController">
 					<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
 						<items>
-							<menuItem title="Facebook.Yoga.Mac.Test" id="1Xt-HY-uBw">
+							<menuItem title="Facebook.Yoga.Mac.Sample" id="1Xt-HY-uBw">
 								<modifierMask key="keyEquivalentModifierMask" />
-								<menu key="submenu" title="Facebook.Yoga.Mac.Test" systemMenu="apple" id="uQy-DD-JDr">
+								<menu key="submenu" title="Facebook.Yoga.Mac.Sample" systemMenu="apple" id="uQy-DD-JDr">
 									<items>
-										<menuItem title="About Facebook.Yoga.Mac.Test" id="5kV-Vb-QxS">
+										<menuItem title="About Facebook.Yoga.Mac.Sample" id="5kV-Vb-QxS">
 											<modifierMask key="keyEquivalentModifierMask" />
 											<connections>
 												<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem" />
@@ -28,7 +28,7 @@
 											<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5" />
 										</menuItem>
 										<menuItem isSeparatorItem="YES" id="4je-JR-u6R" />
-										<menuItem title="Hide Facebook.Yoga.Mac.Test" keyEquivalent="h" id="Olw-nP-bQN">
+										<menuItem title="Hide Facebook.Yoga.Mac.Sample" keyEquivalent="h" id="Olw-nP-bQN">
 											<connections>
 												<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68" />
 											</connections>
@@ -46,7 +46,7 @@
 											</connections>
 										</menuItem>
 										<menuItem isSeparatorItem="YES" id="kCx-OE-vgT" />
-										<menuItem title="Quit Facebook.Yoga.Mac.Test" keyEquivalent="q" id="4sb-4s-VLi">
+										<menuItem title="Quit Facebook.Yoga.Mac.Sample" keyEquivalent="q" id="4sb-4s-VLi">
 											<connections>
 												<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF" />
 											</connections>
@@ -627,7 +627,7 @@
 								<modifierMask key="keyEquivalentModifierMask" />
 								<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
 									<items>
-										<menuItem title="Facebook.Yoga.Mac.Test Help" keyEquivalent="?" id="FKE-Sm-Kum">
+										<menuItem title="Facebook.Yoga.Mac.Sample Help" keyEquivalent="?" id="FKE-Sm-Kum">
 											<connections>
 												<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no" />
 											</connections>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.cs b/csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.cs
similarity index 99%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.cs
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.cs
index e802aa4e..4fe8d75b 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.cs
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.cs
@@ -13,7 +13,7 @@ using AppKit;
 using Foundation;
 using CoreGraphics;
 
-namespace Facebook.Yoga.Mac.Test
+namespace Facebook.Yoga.Mac.Sample
 {
     public static class NSViewYogaExtensions
     {
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.designer.cs b/csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.designer.cs
similarity index 91%
rename from csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.designer.cs
rename to csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.designer.cs
index 1cf1e327..1f97731d 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.designer.cs
+++ b/csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.designer.cs
@@ -6,7 +6,7 @@
 //
 using Foundation;
 
-namespace Facebook.Yoga.Mac.Test
+namespace Facebook.Yoga.Mac.Sample
 {
 	[Register("ViewController")]
 	partial class ViewController
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Tests/Entitlements.plist b/csharp/Mac/Facebook.Yoga.Mac.Tests/Entitlements.plist
new file mode 100644
index 00000000..9ae59937
--- /dev/null
+++ b/csharp/Mac/Facebook.Yoga.Mac.Tests/Entitlements.plist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Tests/Facebook.Yoga.Mac.Tests.csproj b/csharp/Mac/Facebook.Yoga.Mac.Tests/Facebook.Yoga.Mac.Tests.csproj
new file mode 100644
index 00000000..0c67b1cb
--- /dev/null
+++ b/csharp/Mac/Facebook.Yoga.Mac.Tests/Facebook.Yoga.Mac.Tests.csproj
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}</ProjectGuid>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Facebook.Yoga.Mac.Tests</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac.Tests</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CodeSigningKey>Mac Developer</CodeSigningKey>
+    <CreatePackage>false</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <Profiling>true</Profiling>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <LinkMode>None</LinkMode>
+    <XamMacArch>x86_64</XamMacArch>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CreatePackage>true</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>true</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <LinkMode>SdkOnly</LinkMode>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <XamMacArch></XamMacArch>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Mac.csproj">
+      <Project>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</Project>
+      <Name>Facebook.Yoga.Mac</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" Condition="Exists('..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Tests/Info.plist b/csharp/Mac/Facebook.Yoga.Mac.Tests/Info.plist
new file mode 100644
index 00000000..2671eb56
--- /dev/null
+++ b/csharp/Mac/Facebook.Yoga.Mac.Tests/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>Facebook.Yoga.Mac.Tests</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.facebook.facebook-yoga-mac-tests</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${AuthorCopyright}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
+</dict>
+</plist>
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Tests/Main.cs b/csharp/Mac/Facebook.Yoga.Mac.Tests/Main.cs
new file mode 100644
index 00000000..d3c588bc
--- /dev/null
+++ b/csharp/Mac/Facebook.Yoga.Mac.Tests/Main.cs
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+using System;
+using System.Reflection;
+
+namespace Facebook.Yoga.Mac.Tests
+{
+    static class MainClass
+    {
+        static void Main(string[] args)
+        {
+        }
+    }
+}
diff --git a/csharp/Mac/Facebook.Yoga.Mac.Tests/packages.config b/csharp/Mac/Facebook.Yoga.Mac.Tests/packages.config
new file mode 100644
index 00000000..a6115df1
--- /dev/null
+++ b/csharp/Mac/Facebook.Yoga.Mac.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="xamarinmac20" />
+</packages>
\ No newline at end of file
diff --git a/csharp/Mac/Facebook.Yoga.Mac.sln b/csharp/Mac/Facebook.Yoga.Mac.sln
index c99766c6..b44f1bbf 100644
--- a/csharp/Mac/Facebook.Yoga.Mac.sln
+++ b/csharp/Mac/Facebook.Yoga.Mac.sln
@@ -1,25 +1,39 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Test", "Facebook.Yoga.Mac.Test\Facebook.Yoga.Mac.Test.csproj", "{64E0AB97-A904-4607-A535-EEA5A966C09E}"
-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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Sample", "Facebook.Yoga.Mac.Sample\Facebook.Yoga.Mac.Sample.csproj", "{64E0AB97-A904-4607-A535-EEA5A966C09E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9352A9B6-F93B-45DD-8BCE-4696A62B3789}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Tests", "Facebook.Yoga.Mac.Tests\Facebook.Yoga.Mac.Tests.csproj", "{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {9352A9B6-F93B-45DD-8BCE-4696A62B3789}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {9352A9B6-F93B-45DD-8BCE-4696A62B3789}
 	EndGlobalSection
 EndGlobal
diff --git a/csharp/Mac/buck-build.sh b/csharp/Mac/buck-build.sh
new file mode 100755
index 00000000..de1a32a2
--- /dev/null
+++ b/csharp/Mac/buck-build.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if buck --version >/dev/null 2>&1; then true; else
+  echo "SKIP: Need to install buck https://buckbuild.com/setup/getting_started.html"
+  exit 0
+fi
+buck build $1
diff --git a/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets b/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
index 06e8be25..04a1b830 100644
--- a/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
+++ b/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<CompileDependsOn>Buck;CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
-	</PropertyGroup>
-	<Target Name="Buck">
-		<Exec WorkingDirectory="$(OutDir)" Command="buck build //csharp:yoganet-ios" />
-	</Target>
-	<!-- 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-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
-		<Copy SourceFiles="..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
-	</Target>
+        <CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
+    </PropertyGroup>
+    <Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.a">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet-ios" />
+        <Copy SourceFiles="$(ProjectDir)..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)libyoga.a" SkipUnchangedFiles="true" />
+    </Target>
 </Project>