diff --git a/csharp/Facebook.Yoga/YogaLogger.cs b/csharp/Facebook.Yoga/YogaLogger.cs
index 607f1c45..e5d79b79 100644
--- a/csharp/Facebook.Yoga/YogaLogger.cs
+++ b/csharp/Facebook.Yoga/YogaLogger.cs
@@ -14,23 +14,18 @@ namespace Facebook.Yoga
 {
     internal static class YogaLogger
     {
-#if !MONOMAC
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate void Func(YogaLogLevel level, string message);
-#endif
 
         private static bool _initialized;
-#if !MONOMAC
         private static Func _managedLogger = null;
 
         public static Func Logger = null;
-#endif
 
         public static void Initialize()
         {
             if (!_initialized)
             {
-#if !MONOMAC
                 _managedLogger = (level, message) => {
                     if (Logger != null)
                     {
@@ -43,7 +38,6 @@ namespace Facebook.Yoga
                     }
                 };
                 Native.YGInteropSetLogger(_managedLogger);
-#endif
                 _initialized = true;
             }
         }
diff --git a/csharp/Facebook.Yoga/mac/.gitignore b/csharp/Facebook.Yoga/mac/.gitignore
index a5b96ed6..1cf1debb 100644
--- a/csharp/Facebook.Yoga/mac/.gitignore
+++ b/csharp/Facebook.Yoga/mac/.gitignore
@@ -1,2 +1,2 @@
-libyoga.a
+libyoga.dylib
 *.userprefs
diff --git a/csharp/Facebook.Yoga/mac/CustomBuildAction.targets b/csharp/Facebook.Yoga/mac/CustomBuildAction.targets
index 442590ed..8f116ebd 100644
--- a/csharp/Facebook.Yoga/mac/CustomBuildAction.targets
+++ b/csharp/Facebook.Yoga/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\yoga#default,static\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
-	    <Copy SourceFiles="..\..\..\buck-out\gen\yoga#default,static\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
+	<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/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png
deleted file mode 100644
index d0b5a809..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png
deleted file mode 100644
index f4c8d290..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png
deleted file mode 100644
index ebb5a0fe..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png
deleted file mode 100644
index 0986d31b..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png
deleted file mode 100644
index f4c8d290..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png
deleted file mode 100644
index a142c83f..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png
deleted file mode 100644
index 0986d31b..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png
deleted file mode 100644
index 412d6ca9..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png
deleted file mode 100644
index a142c83f..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png
deleted file mode 100644
index e99022ae..00000000
Binary files a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/Contents.json b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 6b285452..00000000
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "images": [
-    {
-      "filename": "AppIcon-16.png",
-      "size": "16x16",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-16@2x.png",
-      "size": "16x16",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-32.png",
-      "size": "32x32",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-32@2x.png",
-      "size": "32x32",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-128.png",
-      "size": "128x128",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-128@2x.png",
-      "size": "128x128",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-256.png",
-      "size": "256x256",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-256@2x.png",
-      "size": "256x256",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-512.png",
-      "size": "512x512",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "filename": "AppIcon-512@2x.png",
-      "size": "512x512",
-      "scale": "2x",
-      "idiom": "mac"
-    }
-  ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
\ No newline at end of file
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/Contents.json b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/Contents.json
deleted file mode 100644
index 4caf392f..00000000
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj
index 4e25ba68..70535e37 100644
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj
+++ b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj
@@ -56,20 +56,6 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
-  <ItemGroup>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
-    <ImageAsset Include="Assets.xcassets\Contents.json" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
@@ -95,4 +81,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Info.plist b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Info.plist
index 48cc59ce..7e955671 100644
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Info.plist
+++ b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/Info.plist
@@ -26,8 +26,5 @@
 	<string>NSApplication</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/AppIcon.appiconset</string>
-	
 </dict>
 </plist>
diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.csproj b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.csproj
index cfef31eb..14e10168 100644
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.csproj
+++ b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.csproj
@@ -104,18 +104,18 @@
       <Link>MeasureFunction.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <NativeReference Include="libyoga.a">
-      <Kind>Static</Kind>
-      <SmartLink>False</SmartLink>
-    </NativeReference>
-  </ItemGroup>
   <ItemGroup>
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CustomBuildAction.targets" />
   </ItemGroup>
+  <ItemGroup>
+    <NativeReference Include="libyoga.dylib">
+      <Kind>Dynamic</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
   <Import Project="CustomBuildAction.targets" />  
 </Project>