Improved the objective-c and swift api

Summary:
Compared to what was planned, I added the `overflow` value which seemed missing. I had to modify the implementation a bit for all values which are backed by a `YGValue`, but we should probably enable the pixel dimensions in Objective-C and Swift somehow later.
Closes https://github.com/facebook/yoga/pull/322

Reviewed By: cosmin1123

Differential Revision: D4391434

Pulled By: emilsjolander

fbshipit-source-id: e33f6f7b2bbaad29553100b7a5bb424496372110

.gitignore

@@ -9,6 +9,12 @@
 
 # Visual studio code
 .vscode
+*.pdb
+*.tlog
+*.obj
+*.pch
+*.log
+*.orig
 
 # Xcode
 ## Build generated

.hgignore

@@ -9,6 +9,12 @@
 
 # Visual studio code
 .vscode
+*.pdb
+*.tlog
+*.obj
+*.pch
+*.log
+*.orig
 
 # Xcode
 ## Build generated

.travis.yml

@@ -17,14 +17,26 @@ before_install:
   - brew cask install java
   - brew outdated xctool || brew upgrade xctool
   - brew install mono
+
   - export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
   - export PATH=$JAVA_HOME/bin:$PATH
 
+install:
+  - cd javascript
+  - npm install
+  - cd $TRAVIS_BUILD_DIR
+
 script:
   - buck test //:yoga
   - buck test //java:java
   - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
   - sh csharp/tests/Facebook.Yoga/test_macos.sh
+
+  - cd javascript
+  - npm run test:all
+  - npm run bench
+  - cd $TRAVIS_BUILD_DIR
+
   - buck run //benchmark:benchmark
   - git checkout HEAD^
   - buck run //benchmark:benchmark

YogaKit/Tests/YogaKitTests.m

@@ -23,7 +23,7 @@
   XCTAssertEqual(0, YGNodeGetInstanceCount());
 
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  [view yg_setFlexBasis:1];
+  view.yoga.flexBasis = 1;
   XCTAssertEqual(1, YGNodeGetInstanceCount());
   view = nil;
 
@@ -35,11 +35,11 @@
   XCTAssertEqual(0, YGNodeGetInstanceCount());
 
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  [view yg_setFlexBasis:1];
+  view.yoga.flexBasis = 1;
 
   for (int i=0; i<10; i++) {
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview yg_setFlexBasis:1];
+    subview.yoga.flexBasis = 1;
     [view addSubview:subview];
   }
   XCTAssertEqual(11, YGNodeGetInstanceCount());
@@ -53,65 +53,88 @@
 - (void)testUsesYoga
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  XCTAssertFalse([view yg_usesYoga]);
+  XCTAssertFalse(view.yoga.isEnabled);
 
-  [view yg_setUsesYoga:YES];
-  XCTAssertTrue([view yg_usesYoga]);
+  view.yoga.isEnabled = YES;
+  XCTAssertTrue(view.yoga.isEnabled);
 
-  [view yg_setUsesYoga:NO];
-  XCTAssertFalse([view yg_usesYoga]);
+  view.yoga.isEnabled = NO;
+  XCTAssertFalse(view.yoga.isEnabled);
 }
 
 - (void)testSizeThatFitsAsserts
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
-    XCTAssertThrows([view yg_intrinsicSize]);
+    XCTAssertThrows(view.yoga.intrinsicSize);
   });
 }
 
 - (void)testSizeThatFitsSmoke
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
-  [container yg_setAlignItems:YGAlignFlexStart];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
+  container.yoga.alignItems = YGAlignFlexStart;
 
   UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
   longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
   longTextLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   longTextLabel.numberOfLines = 1;
-  [longTextLabel yg_setUsesYoga:YES];
-  [longTextLabel yg_setFlexShrink:1];
+  longTextLabel.yoga.isEnabled = YES;
+  longTextLabel.yoga.flexShrink = 1;
   [container addSubview:longTextLabel];
 
   UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
-  [textBadgeView yg_setUsesYoga:YES];
-  [textBadgeView yg_setMargin:3.0 forEdge:YGEdgeLeft];
-  [textBadgeView yg_setWidth:10];
-  [textBadgeView yg_setHeight:10];
+  textBadgeView.yoga.isEnabled = YES;
+  textBadgeView.yoga.marginLeft = 3.0;
+  textBadgeView.yoga.width = 10;
+  textBadgeView.yoga.height = 10;
   [container addSubview:textBadgeView];
 
-  const CGSize containerSize = [container yg_intrinsicSize];
+  const CGSize containerSize = container.yoga.intrinsicSize;
   XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(514,21), containerSize), @"Size is actually %@", NSStringFromCGSize(containerSize));
 }
 
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
+  container.yoga.alignItems = YGAlignFlexStart;
+
+  UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
+  label.text = @"This is a short text.";
+  label.numberOfLines = 1;
+  label.yoga.isEnabled = YES;
+  [container addSubview:label];
+
+  [container.yoga applyLayout];
+  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(146,21), label.bounds.size), @"Size is actually %@", NSStringFromCGSize(label.bounds.size));
+
+  label.text = @"This is a slightly longer text.";
+  [label.yoga markDirty];
+
+  [container.yoga applyLayout];
+  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(213,21), label.bounds.size), @"Size is actually %@", NSStringFromCGSize(label.bounds.size));
+}
+
 - (void)testFrameAndOriginPlacement
 {
   const CGSize containerSize = CGSizeMake(320, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   for (int i = 0; i < 3; i++) {
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview yg_setUsesYoga:YES];
-    [subview yg_setFlexGrow:1];
+    subview.yoga.isEnabled = YES;
+    subview.yoga.flexGrow = 1;
 
     [container addSubview:subview];
   }
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
   XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:0].frame, [container.subviews objectAtIndex:1].frame));
   XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:1].frame, [container.subviews objectAtIndex:2].frame));
@@ -130,33 +153,33 @@
   const CGSize containerSize = CGSizeMake(300, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(0, 0, 100, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)), @"It's actually %@", NSStringFromCGRect(subview2.frame));
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(200, 0, 100, 50)));
 
   [container exchangeSubviewAtIndex:2 withSubviewAtIndex:0];
-  [subview2 yg_setIncludeInLayout:NO];
-  [container yg_applyLayout];
+  subview2.yoga.isIncludedInLayout = NO;
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(0, 0, 150, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(150, 0, 150, 50)));
@@ -170,32 +193,32 @@
   const CGSize containerSize = CGSizeMake(300, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
   for (UIView *view in container.subviews) {
     XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
   }
 
-  [subview3 yg_setIncludeInLayout:NO];
-  [container yg_applyLayout];
+  subview3.yoga.isIncludedInLayout = NO;
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
   XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
@@ -207,62 +230,62 @@
 - (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setIncludeInLayout:NO];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.isIncludedInLayout = NO;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setIncludeInLayout:NO];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.isIncludedInLayout = NO;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setIncludeInLayout:YES];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
-  XCTAssertEqual(1, [container yg_numberOfChildren]);
+  [container.yoga applyLayout];
+  XCTAssertEqual(1, container.yoga.numberOfChildren);
 
-  [subview2 yg_setIncludeInLayout:YES];
-  [container yg_applyLayout];
-  XCTAssertEqual(2, [container yg_numberOfChildren]);
+  subview2.yoga.isIncludedInLayout = YES;
+  [container.yoga applyLayout];
+  XCTAssertEqual(2, container.yoga.numberOfChildren);
 }
 
 - (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
-  [subview3 yg_setIncludeInLayout:NO];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
+  subview3.yoga.isIncludedInLayout = NO;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
   XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
   XCTAssertTrue(CGSizeEqualToSize(CGSizeZero, subview3.bounds.size), @"Actual size %@", NSStringFromCGSize(subview3.bounds.size));
 
-  [subview3 yg_setIncludeInLayout:YES];
-  [container yg_applyLayout];
+  subview3.yoga.isIncludedInLayout = YES;
+  [container.yoga applyLayout];
   for (UIView *view in container.subviews) {
     XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
   }
@@ -271,60 +294,60 @@
 - (void)testyg_isLeafFlag
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  XCTAssertTrue(view.yg_isLeaf);
+  XCTAssertTrue(view.yoga.isLeaf);
 
   for (int i=0; i<10; i++) {
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
     [view addSubview:subview];
   }
-  XCTAssertTrue(view.yg_isLeaf);
+  XCTAssertTrue(view.yoga.isLeaf);
 
-  [view yg_setUsesYoga:YES];
-  [view yg_setWidth:50.0];
-  XCTAssertTrue(view.yg_isLeaf);
+  view.yoga.isEnabled = YES;
+  view.yoga.width = 50.0;
+  XCTAssertTrue(view.yoga.isLeaf);
 
   UIView *const subview = view.subviews[0];
-  [subview yg_setUsesYoga:YES];
-  [subview yg_setWidth:50.0];
-  XCTAssertFalse(view.yg_isLeaf);
+  subview.yoga.isEnabled = YES;
+  subview.yoga.width = 50.0;
+  XCTAssertFalse(view.yoga.isLeaf);
 }
 
 - (void)testThatWeCorrectlyAttachNestedViews
 {
     UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    [container yg_setUsesYoga:YES];
-    [container yg_setFlexDirection:YGFlexDirectionColumn];
+    container.yoga.isEnabled = YES;
+    container.yoga.flexDirection = YGFlexDirectionColumn;
 
     UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview1 yg_setUsesYoga:YES];
-    [subview1 yg_setWidth:100];
-    [subview1 yg_setFlexGrow:1];
-    [subview1 yg_setFlexDirection:YGFlexDirectionColumn];
+    subview1.yoga.isEnabled = YES;
+    subview1.yoga.width = 100;
+    subview1.yoga.flexGrow = 1;
+    subview1.yoga.flexDirection = YGFlexDirectionColumn;
     [container addSubview:subview1];
 
     UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview2 yg_setUsesYoga:YES];
-    [subview2 yg_setWidth:150];
-    [subview2 yg_setFlexGrow:1];
-    [subview2 yg_setFlexDirection:YGFlexDirectionColumn];
+    subview2.yoga.isEnabled = YES;
+    subview2.yoga.width = 150;
+    subview2.yoga.flexGrow = 1;
+    subview2.yoga.flexDirection = YGFlexDirectionColumn;
     [container addSubview:subview2];
 
     for (UIView *view in @[subview1, subview2]) {
         UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-        [someView yg_setUsesYoga:YES];
-        [someView yg_setFlexGrow:1];
+        someView.yoga.isEnabled = YES;
+        someView.yoga.flexGrow = 1;
         [view addSubview:someView];
     }
-    [container yg_applyLayout];
+    [container.yoga applyLayout];
 
     // Add the same amount of new views, reapply layout.
     for (UIView *view in @[subview1, subview2]) {
         UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-        [someView yg_setUsesYoga:YES];
-        [someView yg_setFlexGrow:1];
+        someView.yoga.isEnabled = YES;
+        someView.yoga.flexGrow = 1;
         [view addSubview:someView];
     }
-    [container yg_applyLayout];
+    [container.yoga applyLayout];
 
     XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 25), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
     for (UIView *subview in subview1.subviews) {
@@ -343,4 +366,22 @@
     }
 }
 
+- (void)testThatANonLeafNodeCanBecomeALeafNode
+{
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+    container.yoga.isEnabled = YES;
+
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview1.yoga.isEnabled = YES;
+    [container addSubview:subview1];
+
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview2.yoga.isEnabled = YES;
+    [subview1 addSubview:subview2];
+
+    [container.yoga applyLayout];
+    [subview2 removeFromSuperview];
+    [container.yoga applyLayout];
+}
+
 @end

YogaKit/UIView+Yoga.h

@@ -8,70 +8,10 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <yoga/Yoga.h>
+#import "YGLayout.h"
 
 @interface UIView (Yoga)
 
-/**
-  The property that decides if we should include this view when calculating layout. Defaults to YES.
- */
-@property (nonatomic, readwrite, assign, setter=yg_setIncludeInLayout:) BOOL yg_includeInLayout;
-
-/**
- The property that decides during layout/sizing whether or not yg_* properties should be applied. Defaults to NO.
- */
-@property (nonatomic, readwrite, assign, setter=yg_setUsesYoga:) BOOL yg_usesYoga;
-
-- (void)yg_setDirection:(YGDirection)direction;
-- (void)yg_setFlexDirection:(YGFlexDirection)flexDirection;
-- (void)yg_setJustifyContent:(YGJustify)justifyContent;
-- (void)yg_setAlignContent:(YGAlign)alignContent;
-- (void)yg_setAlignItems:(YGAlign)alignItems;
-- (void)yg_setAlignSelf:(YGAlign)alignSelf;
-- (void)yg_setPositionType:(YGPositionType)positionType;
-- (void)yg_setFlexWrap:(YGWrap)flexWrap;
-
-- (void)yg_setFlexGrow:(CGFloat)flexGrow;
-- (void)yg_setFlexShrink:(CGFloat)flexShrink;
-- (void)yg_setFlexBasis:(CGFloat)flexBasis;
-
-- (void)yg_setPosition:(CGFloat)position forEdge:(YGEdge)edge;
-- (void)yg_setMargin:(CGFloat)margin forEdge:(YGEdge)edge;
-- (void)yg_setPadding:(CGFloat)padding forEdge:(YGEdge)edge;
-
-- (void)yg_setWidth:(CGFloat)width;
-- (void)yg_setHeight:(CGFloat)height;
-- (void)yg_setMinWidth:(CGFloat)minWidth;
-- (void)yg_setMinHeight:(CGFloat)minHeight;
-- (void)yg_setMaxWidth:(CGFloat)maxWidth;
-- (void)yg_setMaxHeight:(CGFloat)maxHeight;
-
-// Yoga specific properties, not compatible with flexbox specification
-- (void)yg_setAspectRatio:(CGFloat)aspectRatio;
-
-/**
- Get the resolved direction of this node. This won't be YGDirectionInherit
- */
-- (YGDirection)yg_resolvedDirection;
-
-/**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results
- */
-- (void)yg_applyLayout;
-
-/**
- Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
- */
-- (CGSize)yg_intrinsicSize;
-
-/**
- Returns the number of children that are using Flexbox.
- */
-- (NSUInteger)yg_numberOfChildren;
-
-/**
- Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout.
- */
-- (BOOL)yg_isLeaf;
+@property (nonatomic, readonly, strong) YGLayout *yoga;
 
 @end

YogaKit/UIView+Yoga.m

@@ -8,390 +8,23 @@
  */
 
 #import "UIView+Yoga.h"
-
+#import "YGLayout+Private.h"
 #import <objc/runtime.h>
 
-@interface YGNodeBridge : NSObject
-@property (nonatomic, assign, readonly) YGNodeRef cnode;
-@end
+static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
 
-@implementation YGNodeBridge
+@implementation UIView (YogaKit)
 
-+ (void)initialize
+- (YGLayout *)yoga
 {
-  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
-}
-
-- (instancetype)init
-{
-  if ([super init]) {
-    _cnode = YGNodeNew();
+  YGLayout *yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
+  if (!yoga) {
+    yoga = [[YGLayout alloc] initWithView:self];
+    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
   }
 
-  return self;
+  return yoga;
 }
 
-- (void)dealloc
-{
-  YGNodeFree(_cnode);
-}
-@end
-
-@implementation UIView (Yoga)
-
-- (BOOL)yg_usesYoga
-{
-  NSNumber *usesYoga = objc_getAssociatedObject(self, @selector(yg_usesYoga));
-  return [usesYoga boolValue];
-}
-
-- (BOOL)yg_includeInLayout
-{
-  NSNumber *includeInLayout = objc_getAssociatedObject(self, @selector(yg_includeInLayout));
-  return (includeInLayout != nil) ? [includeInLayout boolValue] : YES;
-}
-
-- (NSUInteger)yg_numberOfChildren
-{
-  return YGNodeGetChildCount([self ygNode]);
-}
-
-- (BOOL)yg_isLeaf
-{
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
-  if ([self yg_usesYoga]) {
-      for (UIView *subview in self.subviews) {
-          if ([subview yg_usesYoga] && [subview yg_includeInLayout]) {
-              return NO;
-          }
-      }
-  }
-
-  return YES;
-}
-
-#pragma mark - Setters
-
-- (void)yg_setIncludeInLayout:(BOOL)includeInLayout
-{
-  objc_setAssociatedObject(
-    self,
-    @selector(yg_includeInLayout),
-    @(includeInLayout),
-    OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)yg_setUsesYoga:(BOOL)enabled
-{
-  objc_setAssociatedObject(
-    self,
-    @selector(yg_usesYoga),
-    @(enabled),
-    OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)yg_setDirection:(YGDirection)direction
-{
-  YGNodeStyleSetDirection([self ygNode], direction);
-}
-
-- (void)yg_setFlexDirection:(YGFlexDirection)flexDirection
-{
-  YGNodeStyleSetFlexDirection([self ygNode], flexDirection);
-}
-
-- (void)yg_setJustifyContent:(YGJustify)justifyContent
-{
-  YGNodeStyleSetJustifyContent([self ygNode], justifyContent);
-}
-
-- (void)yg_setAlignContent:(YGAlign)alignContent
-{
-  YGNodeStyleSetAlignContent([self ygNode], alignContent);
-}
-
-- (void)yg_setAlignItems:(YGAlign)alignItems
-{
-  YGNodeStyleSetAlignItems([self ygNode], alignItems);
-}
-
-- (void)yg_setAlignSelf:(YGAlign)alignSelf
-{
-  YGNodeStyleSetAlignSelf([self ygNode], alignSelf);
-}
-
-- (void)yg_setPositionType:(YGPositionType)positionType
-{
-  YGNodeStyleSetPositionType([self ygNode], positionType);
-}
-
-- (void)yg_setFlexWrap:(YGWrap)flexWrap
-{
-  YGNodeStyleSetFlexWrap([self ygNode], flexWrap);
-}
-
-- (void)yg_setFlexGrow:(CGFloat)flexGrow
-{
-  YGNodeStyleSetFlexGrow([self ygNode], flexGrow);
-}
-
-- (void)yg_setFlexShrink:(CGFloat)flexShrink
-{
-  YGNodeStyleSetFlexShrink([self ygNode], flexShrink);
-}
-
-- (void)yg_setFlexBasis:(CGFloat)flexBasis
-{
-  YGNodeStyleSetFlexBasis([self ygNode], flexBasis);
-}
-
-- (void)yg_setPosition:(CGFloat)position forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetPosition([self ygNode], edge, position);
-}
-
-- (void)yg_setMargin:(CGFloat)margin forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetMargin([self ygNode], edge, margin);
-}
-
-- (void)yg_setPadding:(CGFloat)padding forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetPadding([self ygNode], edge, padding);
-}
-
-- (void)yg_setWidth:(CGFloat)width
-{
-  YGNodeStyleSetWidth([self ygNode], width);
-}
-
-- (void)yg_setHeight:(CGFloat)height
-{
-  YGNodeStyleSetHeight([self ygNode], height);
-}
-
-- (void)yg_setMinWidth:(CGFloat)minWidth
-{
-  YGNodeStyleSetMinWidth([self ygNode], minWidth);
-}
-
-- (void)yg_setMinHeight:(CGFloat)minHeight
-{
-  YGNodeStyleSetMinHeight([self ygNode], minHeight);
-}
-
-- (void)yg_setMaxWidth:(CGFloat)maxWidth
-{
-  YGNodeStyleSetMaxWidth([self ygNode], maxWidth);
-}
-
-- (void)yg_setMaxHeight:(CGFloat)maxHeight
-{
-  YGNodeStyleSetMaxHeight([self ygNode], maxHeight);
-}
-
-- (void)yg_setAspectRatio:(CGFloat)aspectRatio
-{
-  YGNodeStyleSetAspectRatio([self ygNode], aspectRatio);
-}
-
-#pragma mark - Layout and Sizing
-
-- (YGDirection)yg_resolvedDirection
-{
-  return YGNodeLayoutGetDirection([self ygNode]);
-}
-
-- (void)yg_applyLayout
-{
-  [self calculateLayoutWithSize:self.bounds.size];
-  YGApplyLayoutToViewHierarchy(self);
-}
-
-- (CGSize)yg_intrinsicSize
-{
-  const CGSize constrainedSize = {
-      .width = YGUndefined,
-      .height = YGUndefined,
-  };
-  return [self calculateLayoutWithSize:constrainedSize];
-}
-
-#pragma mark - Private
-
-- (YGNodeRef)ygNode
-{
-  YGNodeBridge *node = objc_getAssociatedObject(self, @selector(ygNode));
-  if (!node) {
-    node = [YGNodeBridge new];
-    YGNodeSetContext(node.cnode, (__bridge void *) self);
-    objc_setAssociatedObject(self, @selector(ygNode), node, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-  }
-
-  return node.cnode;
-}
-
-- (CGSize)calculateLayoutWithSize:(CGSize)size
-{
-  NSAssert([NSThread isMainThread], @"YG Layout calculation must be done on main.");
-  NSAssert([self yg_usesYoga], @"YG Layout is not enabled for this view.");
-
-  YGAttachNodesFromViewHierachy(self);
-
-  const YGNodeRef node = [self ygNode];
-  YGNodeCalculateLayout(
-    node,
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
-
-  return (CGSize) {
-    .width = YGNodeLayoutGetWidth(node),
-    .height = YGNodeLayoutGetHeight(node),
-  };
-}
-
-static YGSize YGMeasureView(
-  YGNodeRef node,
-  float width,
-  YGMeasureMode widthMode,
-  float height,
-  YGMeasureMode heightMode)
-{
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
-
-  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
-  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
-    .width = constrainedWidth,
-    .height = constrainedHeight,
-  }];
-
-  return (YGSize) {
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
-  };
-}
-
-static CGFloat YGSanitizeMeasurement(
-  CGFloat constrainedSize,
-  CGFloat measuredSize,
-  YGMeasureMode measureMode)
-{
-  CGFloat result;
-  if (measureMode == YGMeasureModeExactly) {
-    result = constrainedSize;
-  } else if (measureMode == YGMeasureModeAtMost) {
-    result = MIN(constrainedSize, measuredSize);
-  } else {
-    result = measuredSize;
-  }
-
-  return result;
-}
-
-static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
-{
-  if (YGNodeGetChildCount(node) != subviews.count) {
-    return NO;
-  }
-
-  for (int i=0; i<subviews.count; i++) {
-    if (YGNodeGetChild(node, i) != subviews[i].ygNode) {
-      return NO;
-    }
-  }
-
-  return YES;
-}
-
-static void YGAttachNodesFromViewHierachy(UIView *const view)
-{
-  const YGNodeRef node = [view ygNode];
-
-  // Only leaf nodes should have a measure function
-  if (view.yg_isLeaf) {
-    YGNodeSetMeasureFunc(node, YGMeasureView);
-    YGRemoveAllChildren(node);
-  } else {
-    YGNodeSetMeasureFunc(node, NULL);
-
-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
-    for (UIView *subview in view.subviews) {
-      if ([subview yg_includeInLayout]) {
-        [subviewsToInclude addObject:subview];
-      }
-    }
-
-    if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
-        YGRemoveAllChildren(node);
-        for (int i=0; i<subviewsToInclude.count; i++) {
-            YGNodeInsertChild(node, [subviewsToInclude[i] ygNode], i);
-        }
-    }
-
-    for (UIView *const subview in subviewsToInclude) {
-        YGAttachNodesFromViewHierachy(subview);
-    }
-  }
-}
-
-static void YGRemoveAllChildren(const YGNodeRef node)
-{
-  if (node == NULL) {
-      return;
-  }
-
-  while (YGNodeGetChildCount(node) > 0) {
-    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
-  }
-}
-
-static CGFloat YGRoundPixelValue(CGFloat value)
-{
-  static CGFloat scale;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^(){
-    scale = [UIScreen mainScreen].scale;
-  });
-
-  return round(value * scale) / scale;
-}
-
-static void YGApplyLayoutToViewHierarchy(UIView *view)
-{
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
-  if (![view yg_includeInLayout]) {
-     return;
-  }
-
-  YGNodeRef node = [view ygNode];
-  const CGPoint topLeft = {
-    YGNodeLayoutGetLeft(node),
-    YGNodeLayoutGetTop(node),
-  };
-
-  const CGPoint bottomRight = {
-    topLeft.x + YGNodeLayoutGetWidth(node),
-    topLeft.y + YGNodeLayoutGetHeight(node),
-  };
-
-  view.frame = (CGRect) {
-    .origin = {
-      .x = YGRoundPixelValue(topLeft.x),
-      .y = YGRoundPixelValue(topLeft.y),
-    },
-    .size = {
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
-    },
-  };
-
-  if (!view.yg_isLeaf) {
-    for (NSUInteger i=0; i<view.subviews.count; i++) {
-      YGApplyLayoutToViewHierarchy(view.subviews[i]);
-    }
-  }
-}
 
 @end

YogaKit/YGLayout+Private.h

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "YGLayout.h"
+
+@interface YGLayout (Private)
+
+- (instancetype)initWithView:(UIView *)view;
+
+@end

YogaKit/YGLayout.h

@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <UIKit/UIKit.h>
+#import <yoga/YGEnums.h>
+
+@interface YGLayout : NSObject
+
+/**
+  The property that decides if we should include this view when calculating layout. Defaults to YES.
+ */
+@property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
+
+/**
+ The property that decides during layout/sizing whether or not styling properties should be applied. Defaults to NO.
+ */
+@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
+
+@property (nonatomic, readwrite, assign) YGDirection direction;
+@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property (nonatomic, readwrite, assign) YGJustify justifyContent;
+@property (nonatomic, readwrite, assign) YGAlign alignContent;
+@property (nonatomic, readwrite, assign) YGAlign alignItems;
+@property (nonatomic, readwrite, assign) YGAlign alignSelf;
+@property (nonatomic, readwrite, assign) YGPositionType position;
+@property (nonatomic, readwrite, assign) YGWrap flexWrap;
+@property (nonatomic, readwrite, assign) YGOverflow overflow;
+
+@property (nonatomic, readwrite, assign) CGFloat flexGrow;
+@property (nonatomic, readwrite, assign) CGFloat flexShrink;
+@property (nonatomic, readwrite, assign) CGFloat flexBasis;
+
+@property (nonatomic, readwrite, assign) CGFloat left;
+@property (nonatomic, readwrite, assign) CGFloat top;
+@property (nonatomic, readwrite, assign) CGFloat right;
+@property (nonatomic, readwrite, assign) CGFloat bottom;
+@property (nonatomic, readwrite, assign) CGFloat start;
+@property (nonatomic, readwrite, assign) CGFloat end;
+
+@property (nonatomic, readwrite, assign) CGFloat marginLeft;
+@property (nonatomic, readwrite, assign) CGFloat marginTop;
+@property (nonatomic, readwrite, assign) CGFloat marginRight;
+@property (nonatomic, readwrite, assign) CGFloat marginBottom;
+@property (nonatomic, readwrite, assign) CGFloat marginStart;
+@property (nonatomic, readwrite, assign) CGFloat marginEnd;
+@property (nonatomic, readwrite, assign) CGFloat marginHorizontal;
+@property (nonatomic, readwrite, assign) CGFloat marginVertical;
+@property (nonatomic, readwrite, assign) CGFloat margin;
+
+@property (nonatomic, readwrite, assign) CGFloat paddingLeft;
+@property (nonatomic, readwrite, assign) CGFloat paddingTop;
+@property (nonatomic, readwrite, assign) CGFloat paddingRight;
+@property (nonatomic, readwrite, assign) CGFloat paddingBottom;
+@property (nonatomic, readwrite, assign) CGFloat paddingStart;
+@property (nonatomic, readwrite, assign) CGFloat paddingEnd;
+@property (nonatomic, readwrite, assign) CGFloat paddingHorizontal;
+@property (nonatomic, readwrite, assign) CGFloat paddingVertical;
+@property (nonatomic, readwrite, assign) CGFloat padding;
+
+@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderWidth;
+
+@property (nonatomic, readwrite, assign) CGFloat width;
+@property (nonatomic, readwrite, assign) CGFloat height;
+@property (nonatomic, readwrite, assign) CGFloat minWidth;
+@property (nonatomic, readwrite, assign) CGFloat minHeight;
+@property (nonatomic, readwrite, assign) CGFloat maxWidth;
+@property (nonatomic, readwrite, assign) CGFloat maxHeight;
+
+// Yoga specific properties, not compatible with flexbox specification
+@property (nonatomic, readwrite, assign) CGFloat aspectRatio;
+
+/**
+ Get the resolved direction of this node. This won't be YGDirectionInherit
+ */
+ @property (nonatomic, readonly, assign) YGDirection resolvedDirection;
+
+/**
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results
+ */
+- (void)applyLayout NS_SWIFT_NAME(applyLayout());
+
+/**
+ Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ */
+ @property (nonatomic, readonly, assign) CGSize intrinsicSize;
+
+/**
+ Returns the number of children that are using Flexbox.
+ */
+ @property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
+
+/**
+ Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout.
+ */
+ @property (nonatomic, readonly, assign) BOOL isLeaf;
+
+/**
+ Mark that a view's layout needs to be recalculated. Only works for leaf views.
+ */
+- (void)markDirty;
+
+@end

YogaKit/YGLayout.m

@@ -0,0 +1,380 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "YGLayout+Private.h"
+#import "UIView+Yoga.h"
+#import <yoga/Yoga.h>
+
+#define YG_STYLE_PROPERTY_IMPL(type, lowercased_name, capitalized_name) \
+- (type)lowercased_name                                                 \
+{                                                                       \
+  return YGNodeStyleGet##capitalized_name(self.node);                   \
+}                                                                       \
+                                                                        \
+- (void)set##capitalized_name:(type)lowercased_name                     \
+{                                                                       \
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name);         \
+}
+
+#define YG_STYLE_EDGE_PROPERTY_IMPL(lowercased_name, capitalized_name, property, edge) \
+- (CGFloat)lowercased_name {                                                           \
+  return YGNodeStyleGet##property(self.node, edge);                                    \
+}                                                                                      \
+                                                                                       \
+- (void)set##capitalized_name:(CGFloat)lowercased_name {                               \
+  YGNodeStyleSet##property(self.node, edge, lowercased_name);                          \
+}
+
+#define YG_STYLE_VALUE_PROPERTY_IMPL(lowercased_name, capitalized_name) \
+- (CGFloat)lowercased_name                                              \
+{                                                                       \
+  YGValue value = YGNodeStyleGet##capitalized_name(self.node);          \
+  if (value.unit == YGUnitPixel) {                                      \
+    return value.value;                                                 \
+  } else {                                                              \
+    return YGUndefined;                                                 \
+  }                                                                     \
+}                                                                       \
+                                                                        \
+- (void)set##capitalized_name:(CGFloat)lowercased_name                  \
+{                                                                       \
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name);         \
+}
+
+#define YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, edge, edge_suffix) \
+- (CGFloat)lowercased_name##edge_suffix                                                        \
+{                                                                                              \
+  YGValue value = YGNodeStyleGet##capitalized_name(self.node, edge);                           \
+  if (value.unit == YGUnitPixel) {                                                             \
+    return value.value;                                                                        \
+  } else {                                                                                     \
+    return YGUndefined;                                                                        \
+  }                                                                                            \
+}                                                                                              \
+                                                                                               \
+- (void)set##capitalized_name##edge_suffix:(CGFloat)lowercased_name                            \
+{                                                                                              \
+  YGNodeStyleSet##capitalized_name(self.node, edge, lowercased_name);                          \
+}
+
+#define YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name)                   \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeLeft, Left)             \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeTop, Top)               \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeRight, Right)           \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeBottom, Bottom)         \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeStart, Start)           \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeEnd, End)               \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeHorizontal, Horizontal) \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeVertical, Vertical)     \
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeAll, )
+
+@interface YGLayout ()
+
+@property (nonatomic, weak, readonly) UIView *view;
+@property (nonatomic, assign, readonly) YGNodeRef node;
+
+@end
+
+@implementation YGLayout
+
+@synthesize isEnabled=_isEnabled;
+@synthesize isIncludedInLayout=_isIncludedInLayout;
+
++ (void)initialize
+{
+  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
+}
+
+- (instancetype)initWithView:(UIView*)view
+{
+  if (self = [super init]) {
+    _view = view;
+    _node = YGNodeNew();
+    YGNodeSetContext(_node, (__bridge void *) view);
+    _isEnabled = NO;
+    _isIncludedInLayout = YES;
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  YGNodeFree(self.node);
+}
+
+- (void)markDirty
+{
+  if (self.isLeaf) {
+    YGNodeMarkDirty(self.node);
+  }
+}
+
+- (NSUInteger)numberOfChildren
+{
+  return YGNodeGetChildCount(self.node);
+}
+
+- (BOOL)isLeaf
+{
+  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+  if (self.isEnabled) {
+    for (UIView *subview in self.view.subviews) {
+      YGLayout *const yoga = subview.yoga;
+      if (yoga.isEnabled && yoga.isIncludedInLayout) {
+        return NO;
+      }
+    }
+  }
+
+  return YES;
+}
+
+#pragma mark - Style
+
+- (YGPositionType)position
+{
+  return YGNodeStyleGetPositionType(self.node);
+}
+
+- (void)setPosition:(YGPositionType)position
+{
+  YGNodeStyleSetPositionType(self.node, position);
+}
+
+YG_STYLE_PROPERTY_IMPL(YGDirection, direction, Direction)
+YG_STYLE_PROPERTY_IMPL(YGFlexDirection, flexDirection, FlexDirection)
+YG_STYLE_PROPERTY_IMPL(YGJustify, justifyContent, JustifyContent)
+YG_STYLE_PROPERTY_IMPL(YGAlign, alignContent, AlignContent)
+YG_STYLE_PROPERTY_IMPL(YGAlign, alignItems, AlignItems)
+YG_STYLE_PROPERTY_IMPL(YGAlign, alignSelf, AlignSelf)
+YG_STYLE_PROPERTY_IMPL(YGWrap, flexWrap, FlexWrap)
+YG_STYLE_PROPERTY_IMPL(YGOverflow, overflow, Overflow)
+
+YG_STYLE_PROPERTY_IMPL(CGFloat, flexGrow, FlexGrow)
+YG_STYLE_PROPERTY_IMPL(CGFloat, flexShrink, FlexShrink)
+YG_STYLE_VALUE_PROPERTY_IMPL(flexBasis, FlexBasis)
+
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeLeft, Left)
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeTop, Top)
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeRight, Right)
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeBottom, Bottom)
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeStart, Start)
+YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeEnd, End)
+YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(margin, Margin)
+YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(padding, Padding)
+
+YG_STYLE_EDGE_PROPERTY_IMPL(borderLeftWidth, BorderLeftWidth, Border, YGEdgeLeft)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderTopWidth, BorderTopWidth, Border, YGEdgeTop)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderRightWidth, BorderRightWidth, Border, YGEdgeRight)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderBottomWidth, BorderBottomWidth, Border, YGEdgeBottom)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
+YG_STYLE_EDGE_PROPERTY_IMPL(borderWidth, BorderWidth, Border, YGEdgeAll)
+
+YG_STYLE_VALUE_PROPERTY_IMPL(width, Width)
+YG_STYLE_VALUE_PROPERTY_IMPL(height, Height)
+YG_STYLE_VALUE_PROPERTY_IMPL(minWidth, MinWidth)
+YG_STYLE_VALUE_PROPERTY_IMPL(minHeight, MinHeight)
+YG_STYLE_VALUE_PROPERTY_IMPL(maxWidth, MaxWidth)
+YG_STYLE_VALUE_PROPERTY_IMPL(maxHeight, MaxHeight)
+YG_STYLE_PROPERTY_IMPL(CGFloat, aspectRatio, AspectRatio)
+
+#pragma mark - Layout and Sizing
+
+- (YGDirection)resolvedDirection
+{
+  return YGNodeLayoutGetDirection(self.node);
+}
+
+- (void)applyLayout
+{
+  [self calculateLayoutWithSize:self.view.bounds.size];
+  YGApplyLayoutToViewHierarchy(self.view);
+}
+
+- (CGSize)intrinsicSize
+{
+  const CGSize constrainedSize = {
+    .width = YGUndefined,
+    .height = YGUndefined,
+  };
+  return [self calculateLayoutWithSize:constrainedSize];
+}
+
+#pragma mark - Private
+
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+{
+  NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
+  NSAssert(self.isEnabled, @"Yoga is not enabled for this view.");
+
+  YGAttachNodesFromViewHierachy(self.view);
+
+  const YGNodeRef node = self.node;
+  YGNodeCalculateLayout(
+    node,
+    size.width,
+    size.height,
+    YGNodeStyleGetDirection(node));
+
+  return (CGSize) {
+    .width = YGNodeLayoutGetWidth(node),
+    .height = YGNodeLayoutGetHeight(node),
+  };
+}
+
+static YGSize YGMeasureView(
+  YGNodeRef node,
+  float width,
+  YGMeasureMode widthMode,
+  float height,
+  YGMeasureMode heightMode)
+{
+  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+
+  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
+  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
+    .width = constrainedWidth,
+    .height = constrainedHeight,
+  }];
+
+  return (YGSize) {
+    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
+    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+  };
+}
+
+static CGFloat YGSanitizeMeasurement(
+  CGFloat constrainedSize,
+  CGFloat measuredSize,
+  YGMeasureMode measureMode)
+{
+  CGFloat result;
+  if (measureMode == YGMeasureModeExactly) {
+    result = constrainedSize;
+  } else if (measureMode == YGMeasureModeAtMost) {
+    result = MIN(constrainedSize, measuredSize);
+  } else {
+    result = measuredSize;
+  }
+
+  return result;
+}
+
+static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
+{
+  if (YGNodeGetChildCount(node) != subviews.count) {
+    return NO;
+  }
+
+  for (int i=0; i<subviews.count; i++) {
+    if (YGNodeGetChild(node, i) != subviews[i].yoga.node) {
+      return NO;
+    }
+  }
+
+  return YES;
+}
+
+static void YGAttachNodesFromViewHierachy(UIView *const view)
+{
+  YGLayout *const yoga = view.yoga;
+  const YGNodeRef node = yoga.node;
+
+  // Only leaf nodes should have a measure function
+  if (yoga.isLeaf) {
+    YGRemoveAllChildren(node);
+    YGNodeSetMeasureFunc(node, YGMeasureView);
+  } else {
+    YGNodeSetMeasureFunc(node, NULL);
+
+    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView *subview in view.subviews) {
+      if (subview.yoga.isIncludedInLayout) {
+        [subviewsToInclude addObject:subview];
+      }
+    }
+
+    if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
+      YGRemoveAllChildren(node);
+      for (int i=0; i<subviewsToInclude.count; i++) {
+        YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i);
+      }
+    }
+
+    for (UIView *const subview in subviewsToInclude) {
+      YGAttachNodesFromViewHierachy(subview);
+    }
+  }
+}
+
+static void YGRemoveAllChildren(const YGNodeRef node)
+{
+  if (node == NULL) {
+    return;
+  }
+
+  while (YGNodeGetChildCount(node) > 0) {
+    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
+  }
+}
+
+static CGFloat YGRoundPixelValue(CGFloat value)
+{
+  static CGFloat scale;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^(){
+    scale = [UIScreen mainScreen].scale;
+  });
+
+  return round(value * scale) / scale;
+}
+
+static void YGApplyLayoutToViewHierarchy(UIView *view)
+{
+  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+
+  const YGLayout *yoga = view.yoga;
+
+  if (!yoga.isIncludedInLayout) {
+     return;
+  }
+
+  YGNodeRef node = yoga.node;
+  const CGPoint topLeft = {
+    YGNodeLayoutGetLeft(node),
+    YGNodeLayoutGetTop(node),
+  };
+
+  const CGPoint bottomRight = {
+    topLeft.x + YGNodeLayoutGetWidth(node),
+    topLeft.y + YGNodeLayoutGetHeight(node),
+  };
+
+  view.frame = (CGRect) {
+    .origin = {
+      .x = YGRoundPixelValue(topLeft.x),
+      .y = YGRoundPixelValue(topLeft.y),
+    },
+    .size = {
+      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
+      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
+    },
+  };
+
+  if (!yoga.isLeaf) {
+    for (NSUInteger i=0; i<view.subviews.count; i++) {
+      YGApplyLayoutToViewHierarchy(view.subviews[i]);
+    }
+  }
+}
+
+@end

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -20,6 +20,9 @@
 		13687D821DF87CF200E7C260 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 13687D621DF8778F00E7C260 /* Yoga.c */; };
 		13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D841DF87D1E00E7C260 /* UIKit.framework */; };
 		13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D861DF87D2400E7C260 /* Foundation.framework */; };
+		638A94431E1EF5D000A726AD /* YGLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 638A94411E1EF5D000A726AD /* YGLayout.m */; };
+		638A94451E1EF8A900A726AD /* YGValue.h in yoga */ = {isa = PBXBuildFile; fileRef = 638A94441E1EF89C00A726AD /* YGValue.h */; };
+		638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A94471E1F06D100A726AD /* SwiftViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -29,6 +32,7 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
+				638A94451E1EF8A900A726AD /* YGValue.h in yoga */,
 				13687D781DF878C600E7C260 /* YGEnums.h in yoga */,
 				13687D791DF878C600E7C260 /* YGMacros.h in yoga */,
 				13687D7A1DF878C600E7C260 /* Yoga.h in yoga */,
@@ -68,6 +72,12 @@
 		13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+Yoga.m"; sourceTree = "<group>"; };
 		13687D841DF87D1E00E7C260 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		13687D861DF87D2400E7C260 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		638A94401E1EF5D000A726AD /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGLayout.h; sourceTree = "<group>"; };
+		638A94411E1EF5D000A726AD /* YGLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YGLayout.m; sourceTree = "<group>"; };
+		638A94421E1EF5D000A726AD /* YGLayout+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "YGLayout+Private.h"; sourceTree = "<group>"; };
+		638A94441E1EF89C00A726AD /* YGValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGValue.h; sourceTree = "<group>"; };
+		638A94461E1F06D100A726AD /* YogaKitSample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YogaKitSample-Bridging-Header.h"; sourceTree = "<group>"; };
+		638A94471E1F06D100A726AD /* SwiftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -109,6 +119,8 @@
 				13687D4A1DF8748400E7C260 /* AppDelegate.m */,
 				13687D4C1DF8748400E7C260 /* ViewController.h */,
 				13687D4D1DF8748400E7C260 /* ViewController.m */,
+				638A94471E1F06D100A726AD /* SwiftViewController.swift */,
+				638A94461E1F06D100A726AD /* YogaKitSample-Bridging-Header.h */,
 				13687D521DF8748400E7C260 /* Assets.xcassets */,
 				13687D571DF8748400E7C260 /* Info.plist */,
 				13687D461DF8748400E7C260 /* Supporting Files */,
@@ -127,6 +139,7 @@
 		13687D5D1DF8778F00E7C260 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				638A94441E1EF89C00A726AD /* YGValue.h */,
 				13687D5E1DF8778F00E7C260 /* YGEnums.h */,
 				13687D5F1DF8778F00E7C260 /* YGMacros.h */,
 				13687D601DF8778F00E7C260 /* YGNodeList.c */,
@@ -143,6 +156,9 @@
 			children = (
 				13687D691DF8778F00E7C260 /* UIView+Yoga.h */,
 				13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */,
+				638A94401E1EF5D000A726AD /* YGLayout.h */,
+				638A94421E1EF5D000A726AD /* YGLayout+Private.h */,
+				638A94411E1EF5D000A726AD /* YGLayout.m */,
 			);
 			name = YogaKit;
 			path = ..;
@@ -185,11 +201,12 @@
 		13687D3B1DF8748300E7C260 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = facebook;
 				TargetAttributes = {
 					13687D421DF8748300E7C260 = {
 						CreatedOnToolsVersion = 8.1;
+						LastSwiftMigration = 0820;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -228,12 +245,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */,
 				13687D801DF87CEC00E7C260 /* UIView+Yoga.m in Sources */,
 				13687D4E1DF8748400E7C260 /* ViewController.m in Sources */,
 				13687D4B1DF8748400E7C260 /* AppDelegate.m in Sources */,
 				13687D821DF87CF200E7C260 /* Yoga.c in Sources */,
 				13687D811DF87CF200E7C260 /* YGNodeList.c in Sources */,
 				13687D481DF8748400E7C260 /* main.m in Sources */,
+				638A94431E1EF5D000A726AD /* YGLayout.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -258,6 +277,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -305,6 +325,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -332,10 +353,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = YogaKitSample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "YogaKitSample/YogaKitSample-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -343,10 +368,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = YogaKitSample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "YogaKitSample/YogaKitSample-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -369,6 +397,7 @@
 				13687D5C1DF8748400E7C260 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+import UIKit
+
+class SwiftViewController: UIViewController {
+  override func viewDidLoad() {
+    let root = self.view!
+    root.backgroundColor = .red
+    root.yoga.isEnabled = true
+    root.yoga.width = self.view.bounds.size.width
+    root.yoga.height = self.view.bounds.size.height
+    root.yoga.alignItems = .center
+    root.yoga.justifyContent = .center
+
+    let child1 = UIView()
+    child1.backgroundColor = .blue
+    child1.yoga.isEnabled = true
+    child1.yoga.width = 100
+    child1.yoga.height = 10
+
+    let child2 = UIView()
+    child2.backgroundColor = .green
+    child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+
+    let child3 = UIView()
+    child3.backgroundColor = .yellow
+    child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+
+    child2.addSubview(child3)
+    root.addSubview(child1)
+    root.addSubview(child2)
+    root.yoga.applyLayout()
+  }
+}

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -20,17 +20,17 @@
 {
     UIView *root = self.view;
     root.backgroundColor = [UIColor redColor];
-    [root yg_setUsesYoga:YES];
-    [root yg_setWidth:self.view.bounds.size.width];
-    [root yg_setHeight:self.view.bounds.size.height];
-    [root yg_setAlignItems:YGAlignCenter];
-    [root yg_setJustifyContent:YGJustifyCenter];
+    root.yoga.isEnabled = YES;
+    root.yoga.width = self.view.bounds.size.width;
+    root.yoga.height = self.view.bounds.size.height;
+    root.yoga.alignItems = YGAlignCenter;
+    root.yoga.justifyContent = YGJustifyCenter;
 
     UIView *child1 = [UIView new];
     child1.backgroundColor = [UIColor blueColor];
-    [child1 yg_setUsesYoga:YES];
-    [child1 yg_setWidth:100];
-    [child1 yg_setHeight:100];
+    child1.yoga.isEnabled = YES;
+    child1.yoga.width = 100;
+    child1.yoga.height = 100;
 
     UIView *child2 = [UIView new];
     child2.backgroundColor = [UIColor greenColor];
@@ -53,7 +53,7 @@
     [child2 addSubview:child3];
     [root addSubview:child1];
     [root addSubview:child2];
-    [root yg_applyLayout];
+    [root.yoga applyLayout];
 }
 
 

YogaKit/YogaKitSample/YogaKitSample/YogaKitSample-Bridging-Header.h

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+
+#import "UIView+Yoga.h"
+#import <yoga/Yoga.h>

csharp/Facebook.Yoga.sln

@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.xproj", "{75BB7605-E54B-4EDE-8F5A-FF1F24464236}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x64.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x86.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x64.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x64.Build.0 = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x86.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

csharp/Facebook.Yoga/BaselineFunction.cs

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public delegate float BaselineFunction(YogaNode node, float width, float height);
+}

csharp/Facebook.Yoga/Border.cs

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    [System.Obsolete]
+    public class Border
+    {
+        public float? Top;
+        public float? Bottom;
+        public float? Left;
+        public float? Right;
+
+        public Border(
+            float? top = null,
+            float? bottom = null,
+            float? left = null,
+            float? right = null)
+        {
+            Top = top;
+            Bottom = bottom;
+            Left = left;
+            Right = right;
+        }
+    }
+}

csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>91c42d32-291d-4b72-90b4-551663d60b8b</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Facebook.Yoga.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)BaselineFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Border.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureOutput.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Native.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Spacing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaAlign.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaBaselineFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaConstants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDimension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaEdge.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaExperimentalFeature.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaFlexDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaJustify.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogLevel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureMode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Create.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Spacing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaOverflow.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPositionType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPrintOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaSize.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaUnit.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaValue.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaValueExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaWrap.cs" />
+  </ItemGroup>
+</Project>

csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>91c42d32-291d-4b72-90b4-551663d60b8b</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Facebook.Yoga.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

csharp/Facebook.Yoga/Facebook.Yoga.xproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>75bb7605-e54b-4ede-8f5a-ff1f24464236</ProjectGuid>
-    <RootNamespace>Facebook.Yoga</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/Facebook.Yoga/Native.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *
@@ -42,75 +42,76 @@ namespace Facebook.Yoga
             }
         }
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGInteropSetLogger(
             [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YGNodeHandle YGNodeNew();
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeFree(IntPtr node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeReset(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern int YGNodeGetInstanceCount();
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGSetExperimentalFeatureEnabled(
             YogaExperimentalFeature feature,
             bool enabled);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern bool YGIsExperimentalFeatureEnabled(
             YogaExperimentalFeature feature);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeInsertChild(YGNodeHandle node, YGNodeHandle child, uint index);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeRemoveChild(YGNodeHandle node, YGNodeHandle child);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeCalculateLayout(YGNodeHandle node,
                             float availableWidth,
                             float availableHeight,
                             YogaDirection parentDirection);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeMarkDirty(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool YGNodeIsDirty(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodePrint(YGNodeHandle node, YogaPrintOptions options);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool YGValueIsUndefined(float value);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeCopyStyle(YGNodeHandle dstNode, YGNodeHandle srcNode);
 
         #region YG_NODE_PROPERTY
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetMeasureFunc(
             YGNodeHandle node,
             [MarshalAs(UnmanagedType.FunctionPtr)] YogaMeasureFunc measureFunc);
 
-        [DllImport(DllName)]
-        [return: MarshalAs(UnmanagedType.FunctionPtr)]
-        public static extern YogaMeasureFunc YGNodeGetMeasureFunc(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeSetBaselineFunc(
+            YGNodeHandle node,
+            [MarshalAs(UnmanagedType.FunctionPtr)] YogaBaselineFunc baselineFunc);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetHasNewLayout(YGNodeHandle node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool YGNodeGetHasNewLayout(YGNodeHandle node);
 
@@ -118,174 +119,207 @@ namespace Facebook.Yoga
 
         #region YG_NODE_STYLE_PROPERTY
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetDirection(YGNodeHandle node, YogaDirection direction);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaDirection YGNodeStyleGetDirection(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlexDirection(YGNodeHandle node, YogaFlexDirection flexDirection);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetJustifyContent(YGNodeHandle node, YogaJustify justifyContent);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaJustify YGNodeStyleGetJustifyContent(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAlignContent(YGNodeHandle node, YogaAlign alignContent);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaAlign YGNodeStyleGetAlignContent(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAlignItems(YGNodeHandle node, YogaAlign alignItems);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaAlign YGNodeStyleGetAlignItems(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAlignSelf(YGNodeHandle node, YogaAlign alignSelf);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaAlign YGNodeStyleGetAlignSelf(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPositionType(YGNodeHandle node, YogaPositionType positionType);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaPositionType YGNodeStyleGetPositionType(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlexWrap(YGNodeHandle node, YogaWrap flexWrap);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaWrap YGNodeStyleGetFlexWrap(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetOverflow(YGNodeHandle node, YogaOverflow flexWrap);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaOverflow YGNodeStyleGetOverflow(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlex(YGNodeHandle node, float flex);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlexGrow(YGNodeHandle node, float flexGrow);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetFlexGrow(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlexShrink(YGNodeHandle node, float flexShrink);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetFlexShrink(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlexBasis(YGNodeHandle node, float flexBasis);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexBasis(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexBasisPercent(YGNodeHandle node, float flexBasis);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetFlexBasis(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetWidth(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetWidthPercent(YGNodeHandle node, float width);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetWidth(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetHeight(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetHeightPercent(YGNodeHandle node, float height);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetHeight(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinWidth(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinWidthPercent(YGNodeHandle node, float minWidth);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMinWidth(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinHeight(YGNodeHandle node, float minHeight);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinHeight(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinHeightPercent(YGNodeHandle node, float minHeight);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMinHeight(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxWidth(YGNodeHandle node, float maxWidth);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxWidth(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxWidthPercent(YGNodeHandle node, float maxWidth);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMaxWidth(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxHeight(YGNodeHandle node, float maxHeight);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxHeight(YGNodeHandle node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxHeightPercent(YGNodeHandle node, float maxHeight);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMaxHeight(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAspectRatio(YGNodeHandle node, float aspectRatio);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetAspectRatio(YGNodeHandle node);
 
         #endregion
 
         #region YG_NODE_STYLE_EDGE_PROPERTY
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPosition(YGNodeHandle node, YogaEdge edge, float position);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPositionPercent(YGNodeHandle node, YogaEdge edge, float position);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMargin(YGNodeHandle node, YogaEdge edge, float margin);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMarginPercent(YGNodeHandle node, YogaEdge edge, float margin);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPadding(YGNodeHandle node, YogaEdge edge, float padding);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPaddingPercent(YGNodeHandle node, YogaEdge edge, float padding);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetBorder(YGNodeHandle node, YogaEdge edge, float border);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetBorder(YGNodeHandle node, YogaEdge edge);
 
         #endregion
 
         #region YG_NODE_LAYOUT_PROPERTY
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetLeft(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetTop(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetRight(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetBottom(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetWidth(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetHeight(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetPadding(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaDirection YGNodeLayoutGetDirection(YGNodeHandle node);
 
         #endregion

csharp/Facebook.Yoga/Spacing.cs

@@ -9,18 +9,19 @@
 
 namespace Facebook.Yoga
 {
+    [System.Obsolete]
     public class Spacing
     {
-        public float? Top;
-        public float? Bottom;
-        public float? Left;
-        public float? Right;
+        public YogaValue? Top;
+        public YogaValue? Bottom;
+        public YogaValue? Left;
+        public YogaValue? Right;
 
         public Spacing(
-            float? top = null,
-            float? bottom = null,
-            float? left = null,
-            float? right = null)
+            YogaValue? top = null,
+            YogaValue? bottom = null,
+            YogaValue? left = null,
+            YogaValue? right = null)
         {
             Top = top;
             Bottom = bottom;

csharp/Facebook.Yoga/YogaAlign.cs

@@ -16,5 +16,6 @@ namespace Facebook.Yoga
         Center,
         FlexEnd,
         Stretch,
+        Baseline,
     }
 }

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate float YogaBaselineFunc(IntPtr node, float width, float height);
+}

csharp/Facebook.Yoga/YogaConstants.cs

@@ -17,5 +17,10 @@ namespace Facebook.Yoga
         {
             return float.IsNaN(value);
         }
+
+        public static bool IsUndefined(YogaValue value)
+        {
+            return value.Unit == YogaUnit.Undefined;
+        }
     }
 }

csharp/Facebook.Yoga/YogaNode.Create.cs

@@ -13,6 +13,7 @@ namespace Facebook.Yoga
 {
     public partial class YogaNode
     {
+        [Obsolete("use Object Initializer")]
         public static YogaNode Create(
             YogaDirection? styleDirection = null,
             YogaFlexDirection? flexDirection = null,
@@ -26,17 +27,17 @@ namespace Facebook.Yoga
             float? flex = null,
             float? flexGrow = null,
             float? flexShrink = null,
-            float? flexBasis = null,
+            YogaValue? flexBasis = null,
             Spacing position = null,
             Spacing margin = null,
             Spacing padding = null,
-            Spacing border = null,
-            float? width = null,
-            float? height = null,
-            float? maxWidth = null,
-            float? maxHeight = null,
-            float? minWidth = null,
-            float? minHeight = null)
+            Border border = null,
+            YogaValue? width = null,
+            YogaValue? height = null,
+            YogaValue? maxWidth = null,
+            YogaValue? maxHeight = null,
+            YogaValue? minWidth = null,
+            YogaValue? minHeight = null)
         {
             YogaNode node = new YogaNode();
 
@@ -109,22 +110,22 @@ namespace Facebook.Yoga
             {
                 if (position.Top.HasValue)
                 {
-                    node.SetPosition(YogaEdge.Top, position.Top.Value);
+                    node.Top = position.Top.Value;
                 }
 
                 if (position.Bottom.HasValue)
                 {
-                    node.SetPosition(YogaEdge.Bottom, position.Bottom.Value);
+                    node.Bottom = position.Bottom.Value;
                 }
 
                 if (position.Left.HasValue)
                 {
-                    node.SetPosition(YogaEdge.Left, position.Left.Value);
+                    node.Left = position.Left.Value;
                 }
 
                 if (position.Right.HasValue)
                 {
-                    node.SetPosition(YogaEdge.Right, position.Right.Value);
+                    node.Right = position.Right.Value;
                 }
             }
 
@@ -132,22 +133,22 @@ namespace Facebook.Yoga
             {
                 if (margin.Top.HasValue)
                 {
-                    node.SetMargin(YogaEdge.Top, margin.Top.Value);
+                    node.MarginTop = margin.Top.Value;
                 }
 
                 if (margin.Bottom.HasValue)
                 {
-                    node.SetMargin(YogaEdge.Bottom, margin.Bottom.Value);
+                    node.MarginBottom = margin.Bottom.Value;
                 }
 
                 if (margin.Left.HasValue)
                 {
-                    node.SetMargin(YogaEdge.Left, margin.Left.Value);
+                    node.MarginLeft = margin.Left.Value;
                 }
 
                 if (margin.Right.HasValue)
                 {
-                    node.SetMargin(YogaEdge.Right, margin.Right.Value);
+                    node.MarginRight = margin.Right.Value;
                 }
             }
 
@@ -155,22 +156,22 @@ namespace Facebook.Yoga
             {
                 if (padding.Top.HasValue)
                 {
-                    node.SetPadding(YogaEdge.Top, padding.Top.Value);
+                    node.PaddingTop = padding.Top.Value;
                 }
 
                 if (padding.Bottom.HasValue)
                 {
-                    node.SetPadding(YogaEdge.Bottom, padding.Bottom.Value);
+                    node.PaddingBottom = padding.Bottom.Value;
                 }
 
                 if (padding.Left.HasValue)
                 {
-                    node.SetPadding(YogaEdge.Left, padding.Left.Value);
+                    node.PaddingLeft = padding.Left.Value;
                 }
 
                 if (padding.Right.HasValue)
                 {
-                    node.SetPadding(YogaEdge.Right, padding.Right.Value);
+                    node.PaddingRight = padding.Right.Value;
                 }
             }
 
@@ -178,22 +179,22 @@ namespace Facebook.Yoga
             {
                 if (border.Top.HasValue)
                 {
-                    node.SetBorder(YogaEdge.Top, border.Top.Value);
+                    node.BorderTopWidth = border.Top.Value;
                 }
 
                 if (border.Bottom.HasValue)
                 {
-                    node.SetBorder(YogaEdge.Bottom, border.Bottom.Value);
+                    node.BorderBottomWidth = border.Bottom.Value;
                 }
 
                 if (border.Left.HasValue)
                 {
-                    node.SetBorder(YogaEdge.Left, border.Left.Value);
+                    node.BorderLeftWidth = border.Left.Value;
                 }
 
                 if (border.Right.HasValue)
                 {
-                    node.SetBorder(YogaEdge.Right, border.Right.Value);
+                    node.BorderRightWidth = border.Right.Value;
                 }
             }
 

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -0,0 +1,503 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+
+namespace Facebook.Yoga
+{
+    public partial class YogaNode
+    {
+        public YogaValue Left
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue Top
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue Right
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue Bottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue Start
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue End
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.End, value);
+            }
+        }
+
+        private void SetStylePosition(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPositionPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPosition(_ygNode, edge, value.Value);
+            }
+        }
+
+        public YogaValue MarginLeft
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue MarginTop
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue MarginRight
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue MarginBottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue MarginStart
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue MarginEnd
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.End, value);
+            }
+        }
+
+        public YogaValue MarginHorizontal
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Horizontal, value);
+            }
+        }
+
+        public YogaValue MarginVertical
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Vertical, value);
+            }
+        }
+
+        public YogaValue Margin
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.All, value);
+            }
+        }
+
+        private void SetStyleMargin(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
+            }
+        }
+
+        public YogaValue PaddingLeft
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue PaddingTop
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue PaddingRight
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue PaddingBottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue PaddingStart
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue PaddingEnd
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.End, value);
+            }
+        }
+
+        public YogaValue PaddingHorizontal
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Horizontal, value);
+            }
+        }
+
+        public YogaValue PaddingVertical
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Vertical, value);
+            }
+        }
+
+        public YogaValue Padding
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.All, value);
+            }
+        }
+
+        private void SetStylePadding(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPaddingPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPadding(_ygNode, edge, value.Value);
+            }
+        }
+
+        public float BorderLeftWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Left, value);
+            }
+        }
+
+        public float BorderTopWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Top, value);
+            }
+        }
+
+        public float BorderRightWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Right, value);
+            }
+        }
+
+        public float BorderBottomWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Bottom, value);
+            }
+        }
+
+        public float BorderStartWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Start, value);
+            }
+        }
+
+        public float BorderEndWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.End, value);
+            }
+        }
+
+        public float BorderWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.All, value);
+            }
+        }
+
+        public float LayoutPaddingLeft
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Left);
+            }
+        }
+
+        public float LayoutPaddingTop
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Top);
+            }
+        }
+
+        public float LayoutPaddingRight
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Right);
+            }
+        }
+
+        public float LayoutPaddingBottom
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Bottom);
+            }
+        }
+
+        public float LayoutPaddingStart
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Start);
+            }
+        }
+
+        public float LayoutPaddingEnd
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.End);
+            }
+        }
+    }
+}

csharp/Facebook.Yoga/YogaNode.cs

@@ -10,7 +10,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Facebook.Yoga
@@ -22,6 +21,8 @@ namespace Facebook.Yoga
         private List<YogaNode> _children;
         private MeasureFunction _measureFunction;
         private YogaMeasureFunc _ygMeasureFunc;
+        private BaselineFunction _baselineFunction;
+        private YogaBaselineFunc _ygBaselineFunc;
         private object _data;
 
         public YogaNode()
@@ -38,6 +39,7 @@ namespace Facebook.Yoga
         public void Reset()
         {
             _measureFunction = null;
+            _baselineFunction = null;
             _data = null;
 
             Native.YGNodeReset(_ygNode);
@@ -85,6 +87,14 @@ namespace Facebook.Yoga
             }
         }
 
+        public bool IsBaselineDefined
+        {
+            get
+            {
+                return _baselineFunction != null;
+            }
+        }
+
         public void CopyStyle(YogaNode srcNode)
         {
             Native.YGNodeCopyStyle(_ygNode, srcNode._ygNode);
@@ -228,7 +238,7 @@ namespace Facebook.Yoga
             }
         }
 
-        public float FlexBasis
+        public YogaValue FlexBasis
         {
             get
             {
@@ -237,51 +247,93 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetFlexBasis(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetFlexBasisPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetFlexBasis(_ygNode, value.Value);
+                }
             }
         }
 
-        public float GetMargin(YogaEdge edge)
+        [Obsolete("use Margin properties")]
+        public YogaValue GetMargin(YogaEdge edge)
         {
             return Native.YGNodeStyleGetMargin(_ygNode, edge);
         }
 
-        public void SetMargin(YogaEdge edge, float value)
+        [Obsolete("use Margin properties")]
+        public void SetMargin(YogaEdge edge, YogaValue value)
         {
-            Native.YGNodeStyleSetMargin(_ygNode, edge, value);
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
+            }
         }
 
-        public float GetPadding(YogaEdge edge)
+        [Obsolete("use Padding properties")]
+        public YogaValue GetPadding(YogaEdge edge)
         {
             return Native.YGNodeStyleGetPadding(_ygNode, edge);
         }
 
-        public void SetPadding(YogaEdge edge, float padding)
+        [Obsolete("use Padding properties")]
+        public void SetPadding(YogaEdge edge, YogaValue value)
         {
-            Native.YGNodeStyleSetPadding(_ygNode, edge, padding);
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPaddingPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPadding(_ygNode, edge, value.Value);
+            }
         }
 
+        [Obsolete("use BorderWidth properties")]
         public float GetBorder(YogaEdge edge)
         {
             return Native.YGNodeStyleGetBorder(_ygNode, edge);
         }
 
+        [Obsolete("use BorderWidth properties")]
         public void SetBorder(YogaEdge edge, float border)
         {
             Native.YGNodeStyleSetBorder(_ygNode, edge, border);
         }
 
-        public float GetPosition(YogaEdge edge)
+        [Obsolete("use Position properties")]
+        public YogaValue GetPosition(YogaEdge edge)
         {
             return Native.YGNodeStyleGetPosition(_ygNode, edge);
         }
 
-        public void SetPosition(YogaEdge edge, float position)
+        [Obsolete("use Position properties")]
+        public void SetPosition(YogaEdge edge, YogaValue value)
         {
-            Native.YGNodeStyleSetPosition(_ygNode, edge, position);
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPositionPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPosition(_ygNode, edge, value.Value);
+            }
         }
 
-        public float Width
+        [Obsolete("use LayoutPadding properties")]
+        public float GetLayoutPadding(YogaEdge edge)
+        {
+            return Native.YGNodeLayoutGetPadding(_ygNode, edge);
+        }
+
+        public YogaValue Width
         {
             get
             {
@@ -290,11 +342,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float Height
+        public YogaValue Height
         {
             get
             {
@@ -303,11 +362,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetHeight(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MaxWidth
+        public YogaValue MaxWidth
         {
             get
             {
@@ -316,11 +382,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMaxWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMaxWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMaxWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MaxHeight
+        public YogaValue MaxHeight
         {
             get
             {
@@ -329,11 +402,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMaxHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMaxHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMaxHeight(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MinWidth
+        public YogaValue MinWidth
         {
             get
             {
@@ -342,11 +422,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMinWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMinWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMinWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MinHeight
+        public YogaValue MinHeight
         {
             get
             {
@@ -355,7 +442,14 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMinHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMinHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMinHeight(_ygNode, value.Value);
+                }
             }
         }
 
@@ -511,6 +605,13 @@ namespace Facebook.Yoga
             Native.YGNodeSetMeasureFunc(_ygNode, _ygMeasureFunc);
         }
 
+        public void SetBaselineFunction(BaselineFunction baselineFunction)
+        {
+            _baselineFunction = baselineFunction;
+            _ygBaselineFunc = baselineFunction != null ? BaselineInternal : (YogaBaselineFunc)null;
+            Native.YGNodeSetBaselineFunc(_ygNode, _ygBaselineFunc);
+        }
+
         public void CalculateLayout()
         {
             Native.YGNodeCalculateLayout(
@@ -535,6 +636,16 @@ namespace Facebook.Yoga
             return _measureFunction(this, width, widthMode, height, heightMode);
         }
 
+        private float BaselineInternal(IntPtr node, float width, float height)
+        {
+            if (_baselineFunction == null)
+            {
+                throw new InvalidOperationException("Baseline function is not defined.");
+            }
+
+            return _baselineFunction(this, width, height);
+        }
+
         public string Print(YogaPrintOptions options =
             YogaPrintOptions.Layout|YogaPrintOptions.Style|YogaPrintOptions.Children)
         {

csharp/Facebook.Yoga/YogaUnit.cs

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public enum YogaUnit
+    {
+        Undefined,
+        Pixel,
+        Percent,
+    }
+}

csharp/Facebook.Yoga/YogaValue.cs

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct YogaValue
+    {
+        private float value;
+        private YogaUnit unit;
+
+        public YogaUnit Unit
+        {
+            get
+            {
+                return unit;
+            }
+        }
+
+        public float Value
+        {
+            get
+            {
+                return value;
+            }
+        }
+
+        public static YogaValue Pixel(float value)
+        {
+            return new YogaValue
+            {
+                value = value,
+                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Pixel
+            };
+        }
+
+        public bool Equals(YogaValue other)
+        {
+            return Unit == other.Unit && (Value.Equals(other.Value) || Unit == YogaUnit.Undefined);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            return obj is YogaValue && Equals((YogaValue) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Value.GetHashCode() * 397) ^ (int) Unit;
+            }
+        }
+
+        public static YogaValue Undefined()
+        {
+            return new YogaValue
+            {
+                value = YogaConstants.Undefined,
+                unit = YogaUnit.Undefined
+            };
+        }
+
+        public static YogaValue Percent(float value)
+        {
+            return new YogaValue
+            {
+                value = value,
+                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Percent
+            };
+        }
+
+        public static implicit operator YogaValue(float pixelValue)
+        {
+            return Pixel(pixelValue);
+        }
+    }
+}

csharp/Facebook.Yoga/YogaValueExtensions.cs

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public static class YogaValueExtensions
+    {
+        public static YogaValue Percent(this float value)
+        {
+            return YogaValue.Percent(value);
+        }
+
+        public static YogaValue Px(this float value)
+        {
+            return YogaValue.Pixel(value);
+        }
+
+        public static YogaValue Percent(this int value)
+        {
+            return YogaValue.Percent(value);
+        }
+
+        public static YogaValue Px(this int value)
+        {
+            return YogaValue.Pixel(value);
+        }
+    }
+}

csharp/Mac/.gitignore

@@ -0,0 +1,2 @@
+libyoga.dylib
+*.userprefs

csharp/Mac/ApiDefinition.cs

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+
+using AppKit;
+using Foundation;
+using ObjCRuntime;
+using CoreGraphics;
+
+namespace Facebook.Yoga.Mac
+{
+    // Xamarin.Mac binding projects allow you to include native libraries inside C# DLLs for easy consumption
+    // later. However, the binding project build files currently assume you are binding some objective-c API
+    // and that you need an ApiDefinition.cs for that. yoga is all C APIs, so just include this "blank" file so
+    // the dylib gets packaged
+}

csharp/Mac/CustomBuildAction.targets

@@ -0,0 +1,11 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <CompileDependsOn>CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
+    </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>
+</Project>

csharp/Mac/Facebook.Yoga.Mac.Test/AppDelegate.cs

@@ -0,0 +1,30 @@
+/**
+ * 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 AppKit;
+using Foundation;
+
+namespace Facebook.Yoga.Mac.Test
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : NSApplicationDelegate
+    {
+        public AppDelegate()
+        {
+        }
+
+        public override void DidFinishLaunching(NSNotification notification)
+        {
+        }
+
+        public override void WillTerminate(NSNotification notification)
+        {
+            // Insert code here to tear down your application
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Test/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>

csharp/Mac/Facebook.Yoga.Mac.Test/Facebook.Yoga.Mac.Test.csproj

@@ -0,0 +1,84 @@
+<?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>{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>
+    <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="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="ViewController.cs" />
+    <Compile Include="ViewController.designer.cs">
+      <DependentUpon>ViewController.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <InterfaceDefinition Include="Main.storyboard" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Mac.csproj">
+      <Project>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</Project>
+      <Name>Facebook.Yoga.Mac</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>

csharp/Mac/Facebook.Yoga.Mac.Test/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.Test</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.companyname.facebook-yoga-mac-test</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>

csharp/Mac/Facebook.Yoga.Mac.Test/Main.cs

@@ -0,0 +1,21 @@
+/**
+ * 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 AppKit;
+
+namespace Facebook.Yoga.Mac.Test
+{
+    static class MainClass
+    {
+        static void Main(string[] args)
+        {
+            NSApplication.Init();
+            NSApplication.Main(args);
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Test/Main.storyboard

@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="6198" systemVersion="14A297b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+	<dependencies>
+		<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6198" />
+	</dependencies>
+	<scenes>
+		<!--Application-->
+		<scene sceneID="JPo-4y-FX3">
+			<objects>
+				<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">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Facebook.Yoga.Mac.Test" systemMenu="apple" id="uQy-DD-JDr">
+									<items>
+										<menuItem title="About Facebook.Yoga.Mac.Test" id="5kV-Vb-QxS">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="VOq-y0-SEH" />
+										<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW" />
+										<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ" />
+										<menuItem title="Services" id="NMo-om-nkz">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<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">
+											<connections>
+												<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68" />
+											</connections>
+										</menuItem>
+										<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT" />
+											</connections>
+										</menuItem>
+										<menuItem title="Show All" id="Kd2-mp-pUS">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="kCx-OE-vgT" />
+										<menuItem title="Quit Facebook.Yoga.Mac.Test" keyEquivalent="q" id="4sb-4s-VLi">
+											<connections>
+												<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="File" id="dMs-cI-mzQ">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="File" id="bib-Uj-vzu">
+									<items>
+										<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
+											<connections>
+												<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54" />
+											</connections>
+										</menuItem>
+										<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
+											<connections>
+												<action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ" />
+											</connections>
+										</menuItem>
+										<menuItem title="Open Recent" id="tXI-mr-wws">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
+												<items>
+													<menuItem title="Clear Menu" id="vNY-rz-j42">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="m54-Is-iLE" />
+										<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
+											<connections>
+												<action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q" />
+											</connections>
+										</menuItem>
+										<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
+											<connections>
+												<action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY" />
+											</connections>
+										</menuItem>
+										<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
+											<connections>
+												<action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C" />
+											</connections>
+										</menuItem>
+										<menuItem title="Revert to Saved" id="KaW-ft-85H">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="aJh-i4-bef" />
+										<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
+											<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES" />
+											<connections>
+												<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5" />
+											</connections>
+										</menuItem>
+										<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
+											<connections>
+												<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Edit" id="5QF-Oa-p0T">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Edit" id="W48-6f-4Dl">
+									<items>
+										<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
+											<connections>
+												<action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V" />
+											</connections>
+										</menuItem>
+										<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
+											<connections>
+												<action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="WRV-NI-Exz" />
+										<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
+											<connections>
+												<action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s" />
+											</connections>
+										</menuItem>
+										<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
+											<connections>
+												<action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy" />
+											</connections>
+										</menuItem>
+										<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
+											<connections>
+												<action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg" />
+											</connections>
+										</menuItem>
+										<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ" />
+											</connections>
+										</menuItem>
+										<menuItem title="Delete" id="pa3-QI-u2k">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM" />
+											</connections>
+										</menuItem>
+										<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
+											<connections>
+												<action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="uyl-h8-XO2" />
+										<menuItem title="Find" id="4EN-yA-p0u">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Find" id="1b7-l0-nxx">
+												<items>
+													<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay" />
+														</connections>
+													</menuItem>
+													<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D" />
+														</connections>
+													</menuItem>
+													<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
+														<connections>
+															<action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
+												<items>
+													<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
+														<connections>
+															<action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3" />
+														</connections>
+													</menuItem>
+													<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
+														<connections>
+															<action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="bNw-od-mp5" />
+													<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB" />
+														</connections>
+													</menuItem>
+													<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w" />
+														</connections>
+													</menuItem>
+													<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Substitutions" id="9ic-FL-obx">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
+												<items>
+													<menuItem title="Show Substitutions" id="z6F-FW-3nz">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="gPx-C9-uUO" />
+													<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Quotes" id="hQb-2v-fYv">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Dashes" id="rgM-f4-ycn">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Links" id="cwL-P1-jid">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov" />
+														</connections>
+													</menuItem>
+													<menuItem title="Data Detectors" id="tRr-pd-1PS">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl" />
+														</connections>
+													</menuItem>
+													<menuItem title="Text Replacement" id="HFQ-gK-NFA">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Transformations" id="2oI-Rn-ZJC">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
+												<items>
+													<menuItem title="Make Upper Case" id="vmV-6d-7jI">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu" />
+														</connections>
+													</menuItem>
+													<menuItem title="Make Lower Case" id="d9M-CD-aMd">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil" />
+														</connections>
+													</menuItem>
+													<menuItem title="Capitalize" id="UEZ-Bs-lqG">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Speech" id="xrE-MZ-jX0">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
+												<items>
+													<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl" />
+														</connections>
+													</menuItem>
+													<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Format" id="jxT-CU-nIS">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Format" id="GEO-Iw-cKr">
+									<items>
+										<menuItem title="Font" id="Gi5-1S-RQB">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
+												<items>
+													<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq" />
+													<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27" />
+													<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq" />
+													<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
+														<connections>
+															<action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="5gT-KC-WSO" />
+													<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL" />
+													<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST" />
+													<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B" />
+													<menuItem title="Kern" id="jBQ-r6-VK2">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
+															<items>
+																<menuItem title="Use Default" id="GUa-eO-cwY">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use None" id="cDB-IK-hbR">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Tighten" id="46P-cB-AYj">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Loosen" id="ogc-rX-tC1">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem title="Ligatures" id="o6e-r0-MWq">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
+															<items>
+																<menuItem title="Use Default" id="agt-UL-0e3">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use None" id="J7y-lM-qPV">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use All" id="xQD-1f-W4t">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem title="Baseline" id="OaQ-X3-Vso">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Baseline" id="ijk-EB-dga">
+															<items>
+																<menuItem title="Use Default" id="3Om-Ey-2VK">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Superscript" id="Rqc-34-cIF">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Subscript" id="I0S-gh-46l">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Raise" id="2h7-ER-AoG">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Lower" id="1tx-W0-xDw">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="Ndw-q3-faq" />
+													<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
+														<connections>
+															<action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ" />
+													<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q" />
+														</connections>
+													</menuItem>
+													<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Text" id="Fal-I4-PZk">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Text" id="d9c-me-L2H">
+												<items>
+													<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
+														<connections>
+															<action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa" />
+														</connections>
+													</menuItem>
+													<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
+														<connections>
+															<action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS" />
+														</connections>
+													</menuItem>
+													<menuItem title="Justify" id="J5U-5w-g23">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND" />
+														</connections>
+													</menuItem>
+													<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
+														<connections>
+															<action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="4s2-GY-VfK" />
+													<menuItem title="Writing Direction" id="H1b-Si-o9J">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
+															<items>
+																<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																</menuItem>
+																<menuItem id="YGs-j5-SAR">
+																	<string key="title">	Default</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP" />
+																	</connections>
+																</menuItem>
+																<menuItem id="Lbh-J2-qVU">
+																	<string key="title">	Left to Right</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf" />
+																	</connections>
+																</menuItem>
+																<menuItem id="jFq-tB-4Kx">
+																	<string key="title">	Right to Left</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ" />
+																	</connections>
+																</menuItem>
+																<menuItem isSeparatorItem="YES" id="swp-gr-a21" />
+																<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																</menuItem>
+																<menuItem id="Nop-cj-93Q">
+																	<string key="title">	Default</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp" />
+																	</connections>
+																</menuItem>
+																<menuItem id="BgM-ve-c93">
+																	<string key="title">	Left to Right</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94" />
+																	</connections>
+																</menuItem>
+																<menuItem id="RB4-Sm-HuC">
+																	<string key="title">	Right to Left</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="fKy-g9-1gm" />
+													<menuItem title="Show Ruler" id="vLm-3I-IUL">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY" />
+														</connections>
+													</menuItem>
+													<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
+														<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" />
+														<connections>
+															<action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2" />
+														</connections>
+													</menuItem>
+													<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
+														<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" />
+														<connections>
+															<action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="View" id="H8h-7b-M4v">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="View" id="HyV-fh-RgO">
+									<items>
+										<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C" />
+											</connections>
+										</menuItem>
+										<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Window" id="aUF-d1-5bR">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
+									<items>
+										<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
+											<connections>
+												<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe" />
+											</connections>
+										</menuItem>
+										<menuItem title="Zoom" id="R4o-n2-Eq4">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="eu3-7i-yIM" />
+										<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Help" id="wpr-3q-Mcd">
+								<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">
+											<connections>
+												<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+						</items>
+					</menu>
+					<connections>
+						<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m" />
+					</connections>
+				</application>
+				<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="" />
+				<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="0.0" />
+		</scene>
+		<!--Window Controller - Window-->
+		<scene sceneID="R2V-B0-nI4">
+			<objects>
+				<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
+					<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+						<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" />
+						<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES" />
+						<rect key="contentRect" x="196" y="240" width="480" height="270" />
+						<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027" />
+					</window>
+					<connections>
+						<segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM" />
+					</connections>
+				</windowController>
+				<customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="250" />
+		</scene>
+		<!--View Controller-->
+		<scene sceneID="hIz-AP-VOD">
+			<objects>
+				<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+					<view key="view" id="m2S-Jp-Qdl">
+						<rect key="frame" x="0.0" y="0.0" width="480" height="270" />
+						<autoresizingMask key="autoresizingMask" />
+					</view>
+				</viewController>
+				<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="655" />
+		</scene>
+	</scenes>
+</document>

csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.cs

@@ -0,0 +1,137 @@
+/**
+ * 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.
+ */
+
+//#define DEBUG_LAYOUT
+using System;
+
+using AppKit;
+using Foundation;
+using CoreGraphics;
+
+namespace Facebook.Yoga.Mac.Test
+{
+    public static class NSViewYogaExtensions
+    {
+        public static void ApplyYogaLayout (this NSView view, YogaNode n, bool root = true)
+        {
+#if DEBUG_LAYOUT
+            Console.WriteLine ($"ApplyYogaLayout {view.ToolTip}, {n.LayoutX}, {n.LayoutY}, {n.LayoutWidth}, {n.LayoutHeight}");
+#endif
+
+            // A bit of gross special casing
+            // This really should mostly go away if/when the UIView+Yoga.m magic gets ported to AppKit
+            if (root)
+                view.Frame = new CGRect (n.LayoutX, n.LayoutY, n.LayoutWidth, n.LayoutHeight);
+#if DEBUG_LAYOUT
+            Console.WriteLine ($"Setting {view.ToolTip} frame to {view.Frame}");
+#endif
+
+            // This assumes your YogaNode and NSView children were inserted in same order
+            for (int i = 0; i < n.Count; ++i) {
+                YogaNode childNode = n[i];
+                // Cocoa coord space is from bottom left not top left
+                view.Subviews[i].Frame = new CGRect (childNode.LayoutX, n.LayoutHeight - childNode.LayoutY - childNode.LayoutHeight, childNode.LayoutWidth, childNode.LayoutHeight);
+#if DEBUG_LAYOUT
+                Console.WriteLine ($"Setting {view.Subviews[i].ToolTip} frame to {view.Subviews[i].Frame}");
+#endif
+                if (childNode.Count > 0){
+#if DEBUG_LAYOUT
+                    Console.WriteLine ($"Calling ApplyYogaLayout recursively on {view.Subviews[i].ToolTip}");
+#endif
+                    ApplyYogaLayout (view.Subviews[i], childNode, false);
+                }
+            }
+        }
+    }
+    
+    public partial class ViewController : NSViewController
+    {
+        public ViewController(IntPtr handle) : base(handle)
+        {
+        }
+
+        public override void ViewDidLoad()
+        {
+            base.ViewDidLoad ();
+
+            NSImage image = NSImage.ImageNamed (NSImageName.TrashFull);
+
+            NSView root = CreateViewHierarchy (image);
+            var rootNode = CalculateLayout (View.Frame, image.Size);
+
+            root.ApplyYogaLayout (rootNode);
+
+            View.AddSubview (root);
+        }
+
+        static NSView CreateViewHierarchy (NSImage image)
+        {
+            var root = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Root"
+            };
+            root.Layer.BackgroundColor = NSColor.Red.CGColor;
+
+            NSView child1 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 1"
+            };
+            child1.Layer.BackgroundColor = NSColor.Blue.CGColor;
+
+            NSView child2 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 2"
+            };
+            child2.Layer.BackgroundColor = NSColor.Green.CGColor;
+
+            NSView child3 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 3"
+            };
+            child3.Layer.BackgroundColor = NSColor.Yellow.CGColor;
+
+            root.AddSubview (child1);
+            root.AddSubview (child2);
+            child2.AddSubview (child3);
+
+            return root;
+        }
+
+        static YogaNode CalculateLayout (CGRect rootFrame, CGSize imageSize)
+        {
+            var rootNode = new YogaNode () {
+                Width = (float)rootFrame.Width,
+                Height = (float)rootFrame.Height,
+                AlignItems = YogaAlign.Center,
+                JustifyContent = YogaJustify.Center
+            };
+
+            var child1Node = new YogaNode () {
+                Width = 100,
+                Height = 100
+            };
+
+            var child2Node = new YogaNode () {
+                Width = 200,
+                Height = 100
+            };
+
+            var child3Node = new YogaNode () {
+                Width = 100,
+                Height = 100
+            };
+
+            rootNode.Insert (0, child1Node);
+            rootNode.Insert (1, child2Node);
+            child2Node.Insert (0, child3Node);
+            rootNode.CalculateLayout ();
+
+            return rootNode;
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Test/ViewController.designer.cs

@@ -0,0 +1,18 @@
+// WARNING
+//
+// This file has been generated automatically by Xamarin Studio to store outlets and
+// actions made in the UI designer. If it is removed, they will be lost.
+// Manual changes to this file may not be handled correctly.
+//
+using Foundation;
+
+namespace Facebook.Yoga.Mac.Test
+{
+	[Register("ViewController")]
+	partial class ViewController
+	{
+		void ReleaseDesignerOutlets()
+		{
+		}
+	}
+}

csharp/Mac/Facebook.Yoga.Mac.csproj

@@ -0,0 +1,51 @@
+<?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>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</ProjectGuid>
+    <ProjectTypeGuids>{810C163F-4746-4721-8B8E-88A3673A62EA};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Facebook.Yoga.Mac</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac</AssemblyName>
+    <MacResourcePrefix>Resources</MacResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>__UNIFIED__;DEBUG;MONOMAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>__UNIFIED__;MONOMAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+  </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="..\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>

csharp/Mac/Facebook.Yoga.Mac.sln

@@ -0,0 +1,25 @@
+
+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
+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
+	EndGlobalSection
+EndGlobal

csharp/Unity/win.bat

@@ -1,2 +1,2 @@
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" ..\Yoga\Yoga.vcxproj /p:configuration=Release /property:Platform=x64
-xcopy "..\Yoga\x64\Release\yoga.dll" %~dp0 /s /d /y
+xcopy "..\Yoga\bin\x64\Release\yoga.dll" %~dp0 /s /d /y

csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <NativeRootPath>$(SolutionDir)..\Yoga\bin\</NativeRootPath>
+    <NativeX86Path>$(NativeRootPath)x86\</NativeX86Path>
+    <NativeX64Path>$(NativeRootPath)x64\</NativeX64Path>
+    <NativeARMPath>$(NativeRootPath)ARM\</NativeARMPath>
+    <NativeDLLMoniker>Yoga</NativeDLLMoniker>
+    <CurrentPlatform Condition="$(PROCESSOR_ARCHITECTURE) =='AMD64' or $(PROCESSOR_ARCHITECTURE) == 'IA64' or $(PROCESSOR_ARCHITEW6432) == 'AMD64'">AMD64</CurrentPlatform>
+    <CurrentPlatform Condition="$(PROCESSOR_ARCHITECTURE) =='ARM'">ARM</CurrentPlatform>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="$(Platform) == 'AnyCPU'">
+      <Choose>
+        <When Condition="$(Prefer32Bit) == 'true'">
+          <ItemGroup Condition="$(CurrentPlatform) == 'x86' Or $(CurrentPlatform) == 'AMD64'">
+            <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).dll">
+              <Link>$(NativeDLLMoniker).dll</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+            <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+              <Link>$(NativeDLLMoniker).pdb</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+          </ItemGroup>
+          <ItemGroup Condition="$(CurrentPlatform) == 'ARM'">
+            <Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).dll">
+              <Link>$(NativeDLLMoniker).dll</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+            <Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).pdb">
+              <Link>$(NativeDLLMoniker).pdb</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+          </ItemGroup>
+        </When>
+        <Otherwise>
+          <ItemGroup Condition="$(CurrentPlatform) == 'x86'">
+            <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).dll">
+              <Link>$(NativeDLLMoniker).dll</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+            <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+              <Link>$(NativeDLLMoniker).pdb</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+          </ItemGroup>
+          <ItemGroup Condition="$(CurrentPlatform) == 'AMD64'">
+            <Content Include="$(NativeX64Path)$(Configuration)\$(NativeDLLMoniker).dll">
+              <Link>$(NativeDLLMoniker).dll</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+            <Content Include="$(NativeX64Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+              <Link>$(NativeDLLMoniker).pdb</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>            
+          </ItemGroup>
+          <ItemGroup Condition="$(CurrentPlatform) == 'ARM'">
+            <Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).dll">
+              <Link>$(NativeDLLMoniker).dll</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+            <Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).pdb">
+              <Link>$(NativeDLLMoniker).pdb</Link>
+              <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+              <Visible>False</Visible>
+            </Content>
+          </ItemGroup>
+        </Otherwise>
+      </Choose>
+    </When>
+    <Otherwise>
+      <ItemGroup Condition="$(PlatformTarget) == 'x86'">
+        <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).dll">
+          <Link>$(NativeDLLMoniker).dll</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+        <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+          <Link>$(NativeDLLMoniker).pdb</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+      </ItemGroup>
+      <ItemGroup Condition="$(PlatformTarget) == 'x64'">
+        <Content Include="$(NativeX64Path)$(Configuration)\$(NativeDLLMoniker).dll">
+          <Link>$(NativeDLLMoniker).dll</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+        <Content Include="$(NativeX64Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+          <Link>$(NativeDLLMoniker).pdb</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+      </ItemGroup>
+      <ItemGroup Condition="$(PlatformTarget) == 'ARM'">
+        <!--<Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).dll">
+          <Link>$(NativeDLLMoniker).dll</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+        <Content Include="$(NativeARMPath)$(Configuration)\$(NativeDLLMoniker).pdb">
+          <Link>$(NativeDLLMoniker).pdb</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>-->
+        <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).dll">
+          <Link>$(NativeDLLMoniker).dll</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+        <Content Include="$(NativeX86Path)$(Configuration)\$(NativeDLLMoniker).pdb">
+          <Link>$(NativeDLLMoniker).pdb</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+        </Content>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+</Project>

csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Facebook.Yoga</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Desktop.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga\Facebook.Yoga.csproj">
+      <Project>{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}</Project>
+      <Name>Facebook.Yoga</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets" Condition="Exists('$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets')" Label="ImportNativeInteropTargets" />
+  <Target Name="EnsureNativeInteropImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references a native interop target that is missing. The missing build target is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets'))" />
+  </Target>
+</Project>

csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Facebook.Yoga.Desktop.Tests")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Facebook, Inc.")]
+[assembly: AssemblyProduct("Facebook.Yoga")]
+[assembly: AssemblyCopyright("Copyright (c) 2014-present, Facebook, Inc.")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("ac23f444-5545-4196-8b9f-5c1f6b3e7fb3")]
+
+[assembly: NeutralResourcesLanguage("en")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+

csharp/Windows/Facebook.Yoga.Desktop.Tests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net451" />
+</packages>

csharp/Windows/Facebook.Yoga.Desktop.sln

@@ -0,0 +1,102 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+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", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
+	EndProjectSection
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.Build.0 = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.ActiveCfg = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.Build.0 = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.ActiveCfg = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45}
+	EndGlobalSection
+EndGlobal

csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{0C76D2FE-6767-44FE-B03D-21B2076BAA73}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Facebook.Yoga.Universal.Tests</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Universal.Tests</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PackageCertificateKeyFile>Facebook.Yoga.Universal.Tests_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <ItemGroup>
+    <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
+    <None Include="project.json" />
+    <SDKReference Include="MSTestFramework.Universal, Version=$(UnitTestPlatformVersion)" />
+    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTestApp.xaml.cs">
+      <DependentUpon>UnitTestApp.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="YogaNodeTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="UnitTestApp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="Facebook.Yoga.Universal.Tests_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\UnitTestApp.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga\Facebook.Yoga.csproj">
+      <Project>{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}</Project>
+      <Name>Facebook.Yoga</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets" Condition="Exists('$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets')" Label="ImportNativeInteropTargets" />
+  <Target Name="EnsureNativeInteropImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references a native interop target that is missing. The missing build target is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets'))" />
+  </Target>
+</Project>

csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="6797a00b-cf19-41b1-bd06-467391a2a6e3"
+            Publisher="CN=anforste"
+            Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="6797a00b-cf19-41b1-bd06-467391a2a6e3" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>Facebook.Yoga.Universal.Tests</DisplayName>
+    <PublisherDisplayName>anforste</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="vstest.executionengine.universal.App" 
+        Executable="$targetnametoken$.exe"
+        EntryPoint="Facebook.Yoga.Universal.Tests.App">
+      <uap:VisualElements
+        DisplayName="Facebook.Yoga.Universal.Tests"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="Facebook.Yoga.Universal.Tests"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities> 
+</Package>

csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,30 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Facebook.Yoga.Universal.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("BlueJeans")]
+[assembly: AssemblyProduct("Facebook.Yoga.Universal.Tests")]
+[assembly: AssemblyCopyright("Copyright © BlueJeans 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyMetadata("TargetPlatform","UAP")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]

csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml

@@ -0,0 +1,29 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>

csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml

@@ -0,0 +1,8 @@
+<Application
+    x:Class="Facebook.Yoga.Universal.Tests.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Facebook.Yoga.Universal.Tests"
+    RequestedTheme="Light">
+
+</Application>

csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Facebook.Yoga.Universal.Tests
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    sealed partial class App : Application
+    {
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// Invoked when the application is launched normally by the end user.  Other entry points
+        /// will be used such as when the application is launched to open a specific file.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        {
+
+#if DEBUG
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                this.DebugSettings.EnableFrameRateCounter = true;
+            }
+#endif
+
+            Frame rootFrame = Window.Current.Content as Frame;
+
+            // Do not repeat app initialization when the Window already has content,
+            // just ensure that the window is active
+            if (rootFrame == null)
+            {
+                // Create a Frame to act as the navigation context and navigate to the first page
+                rootFrame = new Frame();
+
+                rootFrame.NavigationFailed += OnNavigationFailed;
+
+                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+                {
+                    //TODO: Load state from previously suspended application
+                }
+
+                // Place the frame in the current Window
+                Window.Current.Content = rootFrame;
+            }
+            
+            Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
+
+            // Ensure the current window is active
+            Window.Current.Activate();
+
+            Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// Invoked when application execution is being suspended.  Application state is saved
+        /// without knowing whether the application will be terminated or resumed with the contents
+        /// of memory still intact.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            //TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}

csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs

@@ -0,0 +1,417 @@
+using System;
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Facebook.Yoga;
+
+namespace Facebook.Yoga.Universal.Tests
+{
+    [TestClass]
+    public class YogaNodeTest
+    {
+        [TestMethod]
+        public void TestAddChildGetParent()
+        {
+            YogaNode parent = new YogaNode();
+            YogaNode child = new YogaNode();
+
+            Assert.IsNull(child.Parent);
+            Assert.AreEqual(0, parent.Count);
+
+            parent.Insert(0, child);
+
+            Assert.AreEqual(1, parent.Count);
+            Assert.AreEqual(child, parent[0]);
+            Assert.AreEqual(parent, child.Parent);
+
+            parent.RemoveAt(0);
+
+            Assert.IsNull(child.Parent);
+            Assert.AreEqual(0, parent.Count);
+        }
+
+        [TestMethod]
+        public void TestChildren()
+        {
+            YogaNode parent = new YogaNode();
+            foreach (YogaNode node in parent)
+            {
+                Assert.Fail(node.ToString());
+            }
+
+            YogaNode child0 = new YogaNode();
+            Assert.AreEqual(-1, parent.IndexOf(child0));
+            parent.Insert(0, child0);
+            foreach (YogaNode node in parent)
+            {
+                Assert.AreEqual(0, parent.IndexOf(node));
+            }
+
+            YogaNode child1 = new YogaNode();
+            parent.Insert(1, child1);
+            int index = 0;
+            foreach (YogaNode node in parent)
+            {
+                Assert.AreEqual(index++, parent.IndexOf(node));
+            }
+
+            parent.RemoveAt(0);
+            Assert.AreEqual(-1, parent.IndexOf(child0));
+            Assert.AreEqual(0, parent.IndexOf(child1));
+
+            parent.Clear();
+            Assert.AreEqual(0, parent.Count);
+
+            parent.Clear();
+            Assert.AreEqual(0, parent.Count);
+        }
+
+        [TestMethod]
+        public void TestRemoveAtFromEmpty()
+        {
+            YogaNode parent = new YogaNode();
+
+            try
+            {
+                parent.RemoveAt(0);
+            }
+            catch (System.NullReferenceException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.NullReferenceException'.");
+        }
+
+        [TestMethod]
+        public void TestRemoveAtOutOfRange()
+        {
+            YogaNode parent = new YogaNode();
+            YogaNode child = new YogaNode();
+            parent.Insert(0, child);
+
+            try
+            {
+                parent.RemoveAt(1);
+            }
+            catch (System.ArgumentOutOfRangeException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.ArgumentOutOfRangeException'.");
+        }
+
+        [TestMethod]
+        public void TestCannotAddChildToMultipleParents()
+        {
+            YogaNode parent1 = new YogaNode();
+            YogaNode parent2 = new YogaNode();
+            YogaNode child = new YogaNode();
+
+            parent1.Insert(0, child);
+
+            try
+            {
+                parent2.Insert(0, child);
+            }
+            catch (System.InvalidOperationException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.InvalidOperationException'.");
+        }
+
+        [TestMethod]
+        public void TestReset()
+        {
+            int instanceCount = YogaNode.GetInstanceCount();
+            YogaNode node = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            node.Reset();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+        }
+
+        [TestMethod]
+        public void TestResetParent()
+        {
+            YogaNode parent = new YogaNode();
+            YogaNode child = new YogaNode();
+            parent.Insert(0, child);
+
+            try
+            {
+                parent.Reset();
+            }
+            catch (System.InvalidOperationException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.InvalidOperationException'.");
+        }
+
+        [TestMethod]
+        public void TestResetChild()
+        {
+            YogaNode parent = new YogaNode();
+            YogaNode child = new YogaNode();
+            parent.Insert(0, child);
+
+            try
+            {
+                child.Reset();
+            }
+            catch (System.InvalidOperationException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.InvalidOperationException'.");
+        }
+
+        [TestMethod]
+        public void TestClear()
+        {
+            int instanceCount = YogaNode.GetInstanceCount();
+            YogaNode parent = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            YogaNode child = new YogaNode();
+            Assert.AreEqual(instanceCount + 2, YogaNode.GetInstanceCount());
+            parent.Insert(0, child);
+            Assert.AreEqual(1, parent.Count);
+            Assert.AreEqual(parent, child.Parent);
+            parent.Clear();
+            Assert.AreEqual(0, parent.Count);
+            Assert.IsNull(child.Parent);
+            Assert.AreEqual(instanceCount + 2, YogaNode.GetInstanceCount());
+        }
+
+        [TestMethod]
+        public void TestMeasureFunc()
+        {
+            YogaNode node = new YogaNode();
+            node.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(100, 150);
+            });
+            node.CalculateLayout();
+            Assert.AreEqual(100, node.LayoutWidth);
+            Assert.AreEqual(150, node.LayoutHeight);
+        }
+
+        [TestMethod]
+        public void TestMeasureFuncWithFloat()
+        {
+            YogaNode node = new YogaNode();
+            node.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(123.4f, 81.7f);
+            });
+            node.CalculateLayout();
+            Assert.AreEqual(123, node.LayoutWidth);
+            Assert.AreEqual(81, node.LayoutHeight);
+        }
+
+        [TestMethod]
+        public void TestChildWithMeasureFunc()
+        {
+            YogaNode node = new YogaNode();
+
+            node.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(100, 150);
+            });
+            YogaNode child = new YogaNode();
+
+            try
+            {
+                node.Insert(0, child);
+            }
+            catch (System.InvalidOperationException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.InvalidOperationException'.");
+        }
+
+        [TestMethod]
+        public void TestMeasureFuncWithChild()
+        {
+            YogaNode node = new YogaNode();
+            YogaNode child = new YogaNode();
+            node.Insert(0, child);
+
+            try
+            {
+                node.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(100, 150);
+                });
+            }
+            catch (System.InvalidOperationException)
+            {
+                return;
+            }
+
+            Assert.Fail("Excepted exception of type 'System.InvalidOperationException'.");
+        }
+
+        [TestMethod]
+        public void TestPrint()
+        {
+            YogaNode parent = new YogaNode();
+            parent.Width = 100;
+            parent.Height = 120;
+            YogaNode child0 = new YogaNode();
+            child0.Width = 30;
+            child0.Height = 40;
+            YogaNode child1 = new YogaNode();
+            child1.Width = 35;
+            child1.Height = 45;
+            parent.Insert(0, child0);
+            parent.Insert(0, child1);
+            parent.CalculateLayout();
+            Assert.AreEqual(parent.Print(), "{layout: {width: 100, height: 120, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 100, height: 120, children: [\n  {layout: {width: 35, height: 45, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 35, height: 45, },\n  {layout: {width: 30, height: 40, top: 45, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 30, height: 40, },\n]},\n");
+        }
+
+        [TestMethod]
+        public void TestCopyStyle()
+        {
+            YogaNode node0 = new YogaNode();
+            Assert.IsTrue(YogaConstants.IsUndefined(node0.MaxHeight));
+
+            YogaNode node1 = new YogaNode();
+            node1.MaxHeight = 100;
+
+            node0.CopyStyle(node1);
+            Assert.AreEqual(100, node0.MaxHeight);
+        }
+
+#if !UNITY_EDITOR
+        private void ForceGC()
+        {
+            GC.Collect(GC.MaxGeneration);
+            GC.WaitForPendingFinalizers();
+        }
+
+        [TestMethod]
+        public void TestDestructor()
+        {
+            ForceGC();
+            int instanceCount = YogaNode.GetInstanceCount();
+            TestDestructorForGC(instanceCount);
+            ForceGC();
+            Assert.AreEqual(instanceCount, YogaNode.GetInstanceCount());
+        }
+
+        private void TestDestructorForGC(int instanceCount)
+        {
+            YogaNode node = new YogaNode();
+            Assert.IsNotNull(node);
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            node = null;
+        }
+
+        [TestMethod]
+        public void TestDestructorWithChildren()
+        {
+            ForceGC();
+            int instanceCount = YogaNode.GetInstanceCount();
+            TestDestructorWithChildrenForGC1(instanceCount);
+            ForceGC();
+            Assert.AreEqual(instanceCount, YogaNode.GetInstanceCount());
+        }
+
+        private void TestDestructorWithChildrenForGC1(int instanceCount)
+        {
+            YogaNode node = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+
+            TestDestructorWithChildrenForGC2(node, instanceCount + 1);
+            ForceGC();
+            Assert.AreEqual(instanceCount + 2, YogaNode.GetInstanceCount());
+
+            TestDestructorWithChildrenForGC2(node, instanceCount + 2);
+            ForceGC();
+            Assert.AreEqual(instanceCount + 3, YogaNode.GetInstanceCount());
+
+            node = null;
+        }
+
+        private void TestDestructorWithChildrenForGC2(YogaNode parent, int instanceCount)
+        {
+            YogaNode child = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+
+            parent.Insert(0, child);
+            child = null;
+        }
+
+        [TestMethod]
+        public void TestParentDestructor()
+        {
+            ForceGC();
+            int instanceCount = YogaNode.GetInstanceCount();
+            YogaNode child = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+
+            TestParentDestructorForGC(child, instanceCount + 1);
+            ForceGC();
+
+            Assert.IsNull(child.Parent);
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+        }
+
+        private void TestParentDestructorForGC(YogaNode child, int instanceCount)
+        {
+            YogaNode parent = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            parent.Insert(0, child);
+        }
+
+        [TestMethod]
+        public void TestClearWithChildDestructor()
+        {
+            ForceGC();
+            int instanceCount = YogaNode.GetInstanceCount();
+            YogaNode node = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            TestClearWithChildDestructorForGC(node, instanceCount + 1);
+            ForceGC();
+            Assert.AreEqual(instanceCount + 2, YogaNode.GetInstanceCount());
+            node.Clear();
+            Assert.AreEqual(0, node.Count);
+            ForceGC();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+        }
+
+        private void TestClearWithChildDestructorForGC(YogaNode parent, int instanceCount)
+        {
+            YogaNode child = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            parent.Insert(0, child);
+        }
+
+        [TestMethod]
+        public void TestMeasureFuncWithDestructor()
+        {
+            ForceGC();
+            int instanceCount = YogaNode.GetInstanceCount();
+            YogaNode parent = new YogaNode();
+            Assert.AreEqual(instanceCount + 1, YogaNode.GetInstanceCount());
+            TestMeasureFuncWithDestructorForGC(parent);
+            ForceGC();
+            Assert.AreEqual(instanceCount + 2, YogaNode.GetInstanceCount());
+            parent.CalculateLayout();
+            Assert.AreEqual(120, (int)parent.LayoutWidth);
+            Assert.AreEqual(130, (int)parent.LayoutHeight);
+        }
+
+        private void TestMeasureFuncWithDestructorForGC(YogaNode parent)
+        {
+            YogaNode child = new YogaNode();
+            parent.Insert(0, child);
+            child.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(120, 130);
+            });
+        }
+#endif
+    }
+}

csharp/Windows/Facebook.Yoga.Universal.Tests/project.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}

csharp/Windows/Facebook.Yoga.Universal.sln

@@ -0,0 +1,105 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+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", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
+	EndProjectSection
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.Build.0 = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.ActiveCfg = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.Build.0 = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.ActiveCfg = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
+	EndGlobalSection
+EndGlobal

csharp/Windows/Facebook.Yoga.sln

@@ -0,0 +1,125 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+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", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
+	EndProjectSection
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.Build.0 = Debug|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.ActiveCfg = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.Build.0 = Debug|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.ActiveCfg = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
+	EndGlobalSection
+EndGlobal

csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Facebook.Yoga</RootNamespace>
+    <AssemblyName>Facebook.Yoga</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

csharp/Windows/Facebook.Yoga/Properties/AssemblyInfo.cs

@@ -11,22 +11,19 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
+[assembly: AssemblyTitle("Facebook.Yoga")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Facebook, Inc.")]
 [assembly: AssemblyProduct("Facebook.Yoga")]
-[assembly: AssemblyTrademark("Copyright (c) 2014-present, Facebook, Inc.")]
+[assembly: AssemblyDescription("A subset of CSS's flexbox layout algorithm and box model.")]
+[assembly: AssemblyCopyright("Copyright (c) 2014-present, Facebook, Inc.")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("75bb7605-e54b-4ede-8f5a-ff1f24464236")]
 
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+

csharp/Windows/Facebook.Yoga/project.json

@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+    "NETStandard.Library": "1.6.0"
+  },
+  "frameworks": {
+    "netstandard1.1": {}
+  },
+  "language": "en",
+  "supports": {},
+  "version": "3.0.0-*"
+}

csharp/Yoga/Yoga.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,7 +31,8 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectName>yoga</ProjectName>
     <RootNamespace>Yoga</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -32,6 +41,12 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -39,6 +54,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -60,9 +82,15 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -72,15 +100,33 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -97,12 +143,26 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -115,8 +175,25 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -134,8 +211,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -154,6 +230,7 @@
     <ClInclude Include="..\..\yoga\Yoga.h" />
     <ClInclude Include="..\..\yoga\YGMacros.h" />
     <ClInclude Include="..\..\yoga\YGNodeList.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="YGInterop.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
@@ -164,21 +241,30 @@
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsManaged>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+      </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsManaged>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+      </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Yoga.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

csharp/Yoga/Yoga.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClInclude Include="YGInterop.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -51,4 +54,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ResourceCompile Include="Yoga.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

csharp/Yoga/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Yoga.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

csharp/nuget/Facebook.Yoga.Native.nuspec

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>Facebook.Yoga.Native</id>
+    <version>1.0.1-pre</version>
+    <title>Facebook.Yoga.Native</title>
+    <authors>Facebook</authors>
+    <owners>Facebook</owners>
+    <licenseUrl>https://github.com/facebook/css-layout/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/facebook/css-layout</projectUrl>    
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>A subset of CSS's flexbox layout algorithm and box model.</description>
+    <copyright>Copyright 2016 Facebook</copyright>
+    <tags>native flexbox flex-box css layout css-layout yoga facebook</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.0" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- build -->
+    <file src="Facebook.Yoga.Native.targets" target="build\netstandard1.0"/>
+
+    <!-- lib -->
+    <file src="_._" target="lib\netstandard1.0"/>
+
+    <!-- Native -->
+    <file src="..\Yoga\bin\x86\Release\Yoga.dll" target="runtimes\win-x86\native"/>
+    <file src="..\Yoga\bin\x86\Release\Yoga.pdb" target="runtimes\win-x86\native"/>
+    
+    <file src="..\Yoga\bin\x64\Release\Yoga.dll" target="runtimes\win-x64\native"/>
+    <file src="..\Yoga\bin\x64\Release\Yoga.pdb" target="runtimes\win-x64\native"/>
+
+    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win8-arm\native"/>
+    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win8-arm\native"/>    
+  </files>
+  
+</package>

csharp/nuget/Facebook.Yoga.Native.targets

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'AnyCPU'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
+      <Link>x86\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
+      <Link>x64\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'x86'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'x64'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'ARM'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>  
+</Project>

csharp/nuget/Facebook.Yoga.nuspec

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>Facebook.Yoga</id>
+    <version>1.0.1-pre</version>
+    <title>Facebook.Yoga</title>
+    <authors>Facebook</authors>
+    <owners>Facebook</owners>
+    <licenseUrl>https://github.com/facebook/css-layout/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/facebook/css-layout</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>A subset of CSS's flexbox layout algorithm and box model.</description>
+    <copyright>Copyright 2016 Facebook</copyright>
+    <tags>flexbox flex-box css layout css-layout yoga facebook native</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.1" />
+    </dependencies>
+  </metadata>
+  <files>
+    <!-- build -->
+    <file src="Facebook.Yoga.targets" target="build\netstandard"/>
+
+    <!-- lib -->
+    <file src="..\Windows\Facebook.Yoga\bin\Release\Facebook.Yoga.dll" target="lib\netstandard"/>
+
+    <!-- runtimes -->
+    <file src="..\Windows\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win-x86\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win-x86\lib\netstandard"/>
+    
+    <file src="..\Windows\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard"/>
+    
+    <file src="..\Windows\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard"/>    
+
+    <!-- Native -->
+    <file src="..\Yoga\bin\x86\Release\Yoga.dll" target="runtimes\win-x86\native"/>
+    <file src="..\Yoga\bin\x86\Release\Yoga.pdb" target="runtimes\win-x86\native"/>
+    
+    <file src="..\Yoga\bin\x64\Release\Yoga.dll" target="runtimes\win-x64\native"/>
+    <file src="..\Yoga\bin\x64\Release\Yoga.pdb" target="runtimes\win-x64\native"/>
+
+    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win8-arm\native"/>
+    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win8-arm\native"/>
+  </files>
+</package>

csharp/nuget/Facebook.Yoga.targets

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'AnyCPU'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
+      <Link>x86\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
+      <Link>x64\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'x86'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\lib\netstandard\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>    
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'x64'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\lib\netstandard\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>    
+  </ItemGroup>
+  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'ARM'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\lib\netstandard\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\native\*">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+</Project>

csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>4edc82d9-a201-4831-8fe0-98f468f8e4ae</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Facebook.Yoga.Shared.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)YGAbsolutePositionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGAlignContentTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGAlignItemsTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGAlignSelfTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGBorderTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGFlexDirectionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGFlexTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGFlexWrapTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGJustifyContentTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGMarginTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGMinMaxDimensionTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGPaddingTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGRoundingTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNodeCreateTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNodeTest.cs" />
+  </ItemGroup>
+</Project>

csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>4edc82d9-a201-4831-8fe0-98f468f8e4ae</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Facebook.Yoga.Shared.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -21,15 +21,15 @@ namespace Facebook.Yoga
         public void Test_absolute_layout_width_height_start_top()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.Start, 10f);
-            root_child0.SetPosition(YogaEdge.Top, 10f);
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Start = 10;
+            root_child0.Top = 10;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -62,15 +62,15 @@ namespace Facebook.Yoga
         public void Test_absolute_layout_width_height_end_bottom()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.End, 10f);
-            root_child0.SetPosition(YogaEdge.Bottom, 10f);
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.End = 10;
+            root_child0.Bottom = 10;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -103,15 +103,15 @@ namespace Facebook.Yoga
         public void Test_absolute_layout_start_top_end_bottom()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.Start, 10f);
-            root_child0.SetPosition(YogaEdge.Top, 10f);
-            root_child0.SetPosition(YogaEdge.End, 10f);
-            root_child0.SetPosition(YogaEdge.Bottom, 10f);
+            root_child0.Start = 10;
+            root_child0.Top = 10;
+            root_child0.End = 10;
+            root_child0.Bottom = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -144,17 +144,17 @@ namespace Facebook.Yoga
         public void Test_absolute_layout_width_height_start_top_end_bottom()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.Start, 10f);
-            root_child0.SetPosition(YogaEdge.Top, 10f);
-            root_child0.SetPosition(YogaEdge.End, 10f);
-            root_child0.SetPosition(YogaEdge.Bottom, 10f);
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Start = 10;
+            root_child0.Top = 10;
+            root_child0.End = 10;
+            root_child0.Bottom = 10;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -189,18 +189,18 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.Overflow = YogaOverflow.Hidden;
-            root.Width = 50f;
-            root.Height = 50f;
+            root.Width = 50;
+            root.Height = 50;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.Start, 0f);
-            root_child0.SetPosition(YogaEdge.Top, 0f);
+            root_child0.Start = 0;
+            root_child0.Top = 0;
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.Width = 100f;
-            root_child0_child0.Height = 100f;
+            root_child0_child0.Width = 100;
+            root_child0_child0.Height = 100;
             root_child0.Insert(0, root_child0_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -243,35 +243,35 @@ namespace Facebook.Yoga
         public void Test_absolute_layout_within_border()
         {
             YogaNode root = new YogaNode();
-            root.SetMargin(YogaEdge.Left, 10f);
-            root.SetMargin(YogaEdge.Top, 10f);
-            root.SetMargin(YogaEdge.Right, 10f);
-            root.SetMargin(YogaEdge.Bottom, 10f);
-            root.SetPadding(YogaEdge.Left, 10f);
-            root.SetPadding(YogaEdge.Top, 10f);
-            root.SetPadding(YogaEdge.Right, 10f);
-            root.SetPadding(YogaEdge.Bottom, 10f);
-            root.SetBorder(YogaEdge.Left, 10f);
-            root.SetBorder(YogaEdge.Top, 10f);
-            root.SetBorder(YogaEdge.Right, 10f);
-            root.SetBorder(YogaEdge.Bottom, 10f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.MarginLeft = 10;
+            root.MarginTop = 10;
+            root.MarginRight = 10;
+            root.MarginBottom = 10;
+            root.PaddingLeft = 10;
+            root.PaddingTop = 10;
+            root.PaddingRight = 10;
+            root.PaddingBottom = 10;
+            root.BorderLeftWidth = 10;
+            root.BorderTopWidth = 10;
+            root.BorderRightWidth = 10;
+            root.BorderBottomWidth = 10;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.PositionType = YogaPositionType.Absolute;
-            root_child0.SetPosition(YogaEdge.Left, 0f);
-            root_child0.SetPosition(YogaEdge.Top, 0f);
-            root_child0.Width = 50f;
-            root_child0.Height = 50f;
+            root_child0.Left = 0;
+            root_child0.Top = 0;
+            root_child0.Width = 50;
+            root_child0.Height = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
             root_child1.PositionType = YogaPositionType.Absolute;
-            root_child1.SetPosition(YogaEdge.Right, 0f);
-            root_child1.SetPosition(YogaEdge.Bottom, 0f);
-            root_child1.Width = 50f;
-            root_child1.Height = 50f;
+            root_child1.Right = 0;
+            root_child1.Bottom = 0;
+            root_child1.Width = 50;
+            root_child1.Height = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGAlignContentTest.cs

@@ -22,32 +22,32 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
-            root_child0.Height = 10f;
+            root_child0.Width = 50;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
-            root_child1.Height = 10f;
+            root_child1.Width = 50;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
-            root_child2.Height = 10f;
+            root_child2.Width = 50;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 50f;
-            root_child3.Height = 10f;
+            root_child3.Width = 50;
+            root_child3.Height = 10;
             root.Insert(3, root_child3);
 
             YogaNode root_child4 = new YogaNode();
-            root_child4.Width = 50f;
-            root_child4.Height = 10f;
+            root_child4.Width = 50;
+            root_child4.Height = 10;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -122,32 +122,32 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.AlignContent = YogaAlign.FlexEnd;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
-            root_child0.Height = 10f;
+            root_child0.Width = 50;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
-            root_child1.Height = 10f;
+            root_child1.Width = 50;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
-            root_child2.Height = 10f;
+            root_child2.Width = 50;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 50f;
-            root_child3.Height = 10f;
+            root_child3.Width = 50;
+            root_child3.Height = 10;
             root.Insert(3, root_child3);
 
             YogaNode root_child4 = new YogaNode();
-            root_child4.Width = 50f;
-            root_child4.Height = 10f;
+            root_child4.Width = 50;
+            root_child4.Height = 10;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -222,32 +222,32 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.AlignContent = YogaAlign.Center;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
-            root_child0.Height = 10f;
+            root_child0.Width = 50;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
-            root_child1.Height = 10f;
+            root_child1.Width = 50;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
-            root_child2.Height = 10f;
+            root_child2.Width = 50;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 50f;
-            root_child3.Height = 10f;
+            root_child3.Width = 50;
+            root_child3.Height = 10;
             root.Insert(3, root_child3);
 
             YogaNode root_child4 = new YogaNode();
-            root_child4.Width = 50f;
-            root_child4.Height = 10f;
+            root_child4.Width = 50;
+            root_child4.Height = 10;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -322,27 +322,27 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
+            root_child0.Width = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
+            root_child1.Width = 50;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
+            root_child2.Width = 50;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 50f;
+            root_child3.Width = 50;
             root.Insert(3, root_child3);
 
             YogaNode root_child4 = new YogaNode();
-            root_child4.Width = 50f;
+            root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGAlignSelfTest.cs

@@ -21,13 +21,13 @@ namespace Facebook.Yoga
         public void Test_align_self_center()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.AlignSelf = YogaAlign.Center;
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -60,13 +60,13 @@ namespace Facebook.Yoga
         public void Test_align_self_flex_end()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.AlignSelf = YogaAlign.FlexEnd;
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -99,13 +99,13 @@ namespace Facebook.Yoga
         public void Test_align_self_flex_start()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.AlignSelf = YogaAlign.FlexStart;
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -139,13 +139,13 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.AlignItems = YogaAlign.FlexStart;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.AlignSelf = YogaAlign.FlexEnd;
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -174,5 +174,76 @@ namespace Facebook.Yoga
             Assert.AreEqual(10f, root_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_align_self_baseline()
+        {
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.AlignSelf = YogaAlign.Baseline;
+            root_child0.Width = 50;
+            root_child0.Height = 50;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.AlignSelf = YogaAlign.Baseline;
+            root_child1.Width = 50;
+            root_child1.Height = 20;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child1_child0 = new YogaNode();
+            root_child1_child0.Width = 50;
+            root_child1_child0.Height = 10;
+            root_child1.Insert(0, root_child1_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child1.LayoutX);
+            Assert.AreEqual(40f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(20f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child1_child0.LayoutY);
+            Assert.AreEqual(50f, root_child1_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child1_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(40f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(20f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child1_child0.LayoutY);
+            Assert.AreEqual(50f, root_child1_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child1_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGBorderTest.cs

@@ -21,10 +21,10 @@ namespace Facebook.Yoga
         public void Test_border_no_size()
         {
             YogaNode root = new YogaNode();
-            root.SetBorder(YogaEdge.Left, 10f);
-            root.SetBorder(YogaEdge.Top, 10f);
-            root.SetBorder(YogaEdge.Right, 10f);
-            root.SetBorder(YogaEdge.Bottom, 10f);
+            root.BorderLeftWidth = 10;
+            root.BorderTopWidth = 10;
+            root.BorderRightWidth = 10;
+            root.BorderBottomWidth = 10;
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
 
@@ -46,14 +46,14 @@ namespace Facebook.Yoga
         public void Test_border_container_match_child()
         {
             YogaNode root = new YogaNode();
-            root.SetBorder(YogaEdge.Left, 10f);
-            root.SetBorder(YogaEdge.Top, 10f);
-            root.SetBorder(YogaEdge.Right, 10f);
-            root.SetBorder(YogaEdge.Bottom, 10f);
+            root.BorderLeftWidth = 10;
+            root.BorderTopWidth = 10;
+            root.BorderRightWidth = 10;
+            root.BorderBottomWidth = 10;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -86,16 +86,16 @@ namespace Facebook.Yoga
         public void Test_border_flex_child()
         {
             YogaNode root = new YogaNode();
-            root.SetBorder(YogaEdge.Left, 10f);
-            root.SetBorder(YogaEdge.Top, 10f);
-            root.SetBorder(YogaEdge.Right, 10f);
-            root.SetBorder(YogaEdge.Bottom, 10f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.BorderLeftWidth = 10;
+            root.BorderTopWidth = 10;
+            root.BorderRightWidth = 10;
+            root.BorderBottomWidth = 10;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.Width = 10f;
+            root_child0.FlexGrow = 1;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -128,15 +128,15 @@ namespace Facebook.Yoga
         public void Test_border_stretch_child()
         {
             YogaNode root = new YogaNode();
-            root.SetBorder(YogaEdge.Left, 10f);
-            root.SetBorder(YogaEdge.Top, 10f);
-            root.SetBorder(YogaEdge.Right, 10f);
-            root.SetBorder(YogaEdge.Bottom, 10f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.BorderLeftWidth = 10;
+            root.BorderTopWidth = 10;
+            root.BorderRightWidth = 10;
+            root.BorderBottomWidth = 10;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -171,15 +171,15 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
-            root.SetBorder(YogaEdge.Start, 10f);
-            root.SetBorder(YogaEdge.End, 20f);
-            root.SetBorder(YogaEdge.Bottom, 20f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.BorderStartWidth = 10;
+            root.BorderEndWidth = 20;
+            root.BorderBottomWidth = 20;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGFlexDirectionTest.cs

@@ -21,18 +21,18 @@ namespace Facebook.Yoga
         public void Test_flex_direction_column_no_height()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
+            root.Width = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -86,18 +86,18 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Height = 100f;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -150,19 +150,19 @@ namespace Facebook.Yoga
         public void Test_flex_direction_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -216,19 +216,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -282,19 +282,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.ColumnReverse;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -348,19 +348,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.RowReverse;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGFlexTest.cs

@@ -21,16 +21,16 @@ namespace Facebook.Yoga
         public void Test_flex_basis_flex_grow_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -74,16 +74,16 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -126,16 +126,16 @@ namespace Facebook.Yoga
         public void Test_flex_basis_flex_shrink_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexShrink = 1f;
-            root_child0.FlexBasis = 100f;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexBasis = 50f;
+            root_child1.FlexBasis = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -179,16 +179,16 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexShrink = 1f;
-            root_child0.FlexBasis = 100f;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexBasis = 50f;
+            root_child1.FlexBasis = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -231,22 +231,22 @@ namespace Facebook.Yoga
         public void Test_flex_shrink_to_zero()
         {
             YogaNode root = new YogaNode();
-            root.Height = 75f;
+            root.Height = 75;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
-            root_child0.Height = 50f;
+            root_child0.Width = 50;
+            root_child0.Height = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexShrink = 1f;
-            root_child1.Width = 50f;
-            root_child1.Height = 50f;
+            root_child1.FlexShrink = 1;
+            root_child1.Width = 50;
+            root_child1.Height = 50;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
-            root_child2.Height = 50f;
+            root_child2.Width = 50;
+            root_child2.Height = 50;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -299,23 +299,23 @@ namespace Facebook.Yoga
         public void Test_flex_basis_overrides_main_size()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -368,15 +368,15 @@ namespace Facebook.Yoga
         public void Test_flex_grow_shrink_at_most()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.FlexGrow = 1f;
-            root_child0_child0.FlexShrink = 1f;
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.FlexShrink = 1;
             root_child0.Insert(0, root_child0_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGFlexWrapTest.cs

@@ -22,26 +22,26 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.Wrap = YogaWrap.Wrap;
-            root.Height = 100f;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 30f;
-            root_child0.Height = 30f;
+            root_child0.Width = 30;
+            root_child0.Height = 30;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 30f;
-            root_child1.Height = 30f;
+            root_child1.Width = 30;
+            root_child1.Height = 30;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 30f;
-            root_child2.Height = 30f;
+            root_child2.Width = 30;
+            root_child2.Height = 30;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 30f;
-            root_child3.Height = 30f;
+            root_child3.Width = 30;
+            root_child3.Height = 30;
             root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -106,26 +106,26 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
+            root.Width = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 30f;
-            root_child0.Height = 30f;
+            root_child0.Width = 30;
+            root_child0.Height = 30;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 30f;
-            root_child1.Height = 30f;
+            root_child1.Width = 30;
+            root_child1.Height = 30;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 30f;
-            root_child2.Height = 30f;
+            root_child2.Width = 30;
+            root_child2.Height = 30;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 30f;
-            root_child3.Height = 30f;
+            root_child3.Width = 30;
+            root_child3.Height = 30;
             root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -191,26 +191,26 @@ namespace Facebook.Yoga
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignItems = YogaAlign.FlexEnd;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
+            root.Width = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 30f;
-            root_child0.Height = 10f;
+            root_child0.Width = 30;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 30f;
-            root_child1.Height = 20f;
+            root_child1.Width = 30;
+            root_child1.Height = 20;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 30f;
-            root_child2.Height = 30f;
+            root_child2.Width = 30;
+            root_child2.Height = 30;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 30f;
-            root_child3.Height = 30f;
+            root_child3.Width = 30;
+            root_child3.Height = 30;
             root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -276,26 +276,26 @@ namespace Facebook.Yoga
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignItems = YogaAlign.Center;
             root.Wrap = YogaWrap.Wrap;
-            root.Width = 100f;
+            root.Width = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 30f;
-            root_child0.Height = 10f;
+            root_child0.Width = 30;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 30f;
-            root_child1.Height = 20f;
+            root_child1.Width = 30;
+            root_child1.Height = 20;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 30f;
-            root_child2.Height = 30f;
+            root_child2.Width = 30;
+            root_child2.Height = 30;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.Width = 30f;
-            root_child3.Height = 30f;
+            root_child3.Width = 30;
+            root_child3.Height = 30;
             root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs

@@ -22,19 +22,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -89,19 +89,19 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.JustifyContent = YogaJustify.FlexEnd;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -156,19 +156,19 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.JustifyContent = YogaJustify.Center;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -223,19 +223,19 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.JustifyContent = YogaJustify.SpaceBetween;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -290,19 +290,19 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.JustifyContent = YogaJustify.SpaceAround;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 10f;
+            root_child1.Width = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 10f;
+            root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -355,18 +355,18 @@ namespace Facebook.Yoga
         public void Test_justify_content_column_flex_start()
         {
             YogaNode root = new YogaNode();
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -420,19 +420,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.FlexEnd;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -486,19 +486,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.Center;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -552,19 +552,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.SpaceBetween;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -618,19 +618,19 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.SpaceAround;
-            root.Width = 102f;
-            root.Height = 102f;
+            root.Width = 102;
+            root.Height = 102;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Height = 10f;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGMarginTest.cs

@@ -22,12 +22,12 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.SetMargin(YogaEdge.Start, 10f);
-            root_child0.Width = 10f;
+            root_child0.MarginStart = 10;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -60,12 +60,12 @@ namespace Facebook.Yoga
         public void Test_margin_top()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.SetMargin(YogaEdge.Top, 10f);
-            root_child0.Height = 10f;
+            root_child0.MarginTop = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -100,12 +100,12 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
             root.JustifyContent = YogaJustify.FlexEnd;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.SetMargin(YogaEdge.End, 10f);
-            root_child0.Width = 10f;
+            root_child0.MarginEnd = 10;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -139,12 +139,12 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.FlexEnd;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.SetMargin(YogaEdge.Bottom, 10f);
-            root_child0.Height = 10f;
+            root_child0.MarginBottom = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -178,12 +178,12 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.SetMargin(YogaEdge.Start, 10f);
+            root_child0.FlexGrow = 1;
+            root_child0.MarginStart = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -216,12 +216,12 @@ namespace Facebook.Yoga
         public void Test_margin_and_flex_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.SetMargin(YogaEdge.Top, 10f);
+            root_child0.FlexGrow = 1;
+            root_child0.MarginTop = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -255,12 +255,12 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.SetMargin(YogaEdge.Top, 10f);
+            root_child0.FlexGrow = 1;
+            root_child0.MarginTop = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -293,12 +293,12 @@ namespace Facebook.Yoga
         public void Test_margin_and_stretch_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.SetMargin(YogaEdge.Start, 10f);
+            root_child0.FlexGrow = 1;
+            root_child0.MarginStart = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -332,15 +332,15 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -383,15 +383,15 @@ namespace Facebook.Yoga
         public void Test_margin_with_sibling_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs

@@ -21,12 +21,12 @@ namespace Facebook.Yoga
         public void Test_max_width()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.MaxWidth = 50f;
-            root_child0.Height = 10f;
+            root_child0.MaxWidth = 50;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -60,12 +60,12 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
-            root_child0.MaxHeight = 50f;
+            root_child0.Width = 10;
+            root_child0.MaxHeight = 50;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -98,16 +98,16 @@ namespace Facebook.Yoga
         public void Test_min_height()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.MinHeight = 60f;
+            root_child0.FlexGrow = 1;
+            root_child0.MinHeight = 60;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -151,16 +151,16 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.MinWidth = 60f;
+            root_child0.FlexGrow = 1;
+            root_child0.MinWidth = 60;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -204,13 +204,13 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.Center;
-            root.Width = 100f;
-            root.MinHeight = 100f;
-            root.MaxHeight = 200f;
+            root.Width = 100;
+            root.MinHeight = 100;
+            root.MaxHeight = 200;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 60f;
-            root_child0.Height = 60f;
+            root_child0.Width = 60;
+            root_child0.Height = 60;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -244,13 +244,13 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.AlignItems = YogaAlign.Center;
-            root.MinWidth = 100f;
-            root.MaxWidth = 200f;
-            root.Height = 100f;
+            root.MinWidth = 100;
+            root.MaxWidth = 200;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 60f;
-            root_child0.Height = 60f;
+            root_child0.Width = 60;
+            root_child0.Height = 60;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -284,22 +284,22 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.Center;
-            root.MinHeight = 100f;
-            root.MaxHeight = 110f;
+            root.MinHeight = 100;
+            root.MaxHeight = 110;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 50f;
-            root_child0.Height = 50f;
+            root_child0.Width = 50;
+            root_child0.Height = 50;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
-            root_child1.Height = 50f;
+            root_child1.Width = 50;
+            root_child1.Height = 50;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.Width = 50f;
-            root_child2.Height = 50f;
+            root_child2.Width = 50;
+            root_child2.Height = 50;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -352,17 +352,17 @@ namespace Facebook.Yoga
         public void Test_flex_grow_within_max_width()
         {
             YogaNode root = new YogaNode();
-            root.Width = 200f;
-            root.Height = 100f;
+            root.Width = 200;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0.MaxWidth = 100f;
+            root_child0.MaxWidth = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.FlexGrow = 1f;
-            root_child0_child0.Height = 20f;
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.Height = 20;
             root_child0.Insert(0, root_child0_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -405,17 +405,17 @@ namespace Facebook.Yoga
         public void Test_flex_grow_within_constrained_max_width()
         {
             YogaNode root = new YogaNode();
-            root.Width = 200f;
-            root.Height = 100f;
+            root.Width = 200;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0.MaxWidth = 300f;
+            root_child0.MaxWidth = 300;
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.FlexGrow = 1f;
-            root_child0_child0.Height = 20f;
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.Height = 20;
             root_child0.Insert(0, root_child0_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -459,15 +459,15 @@ namespace Facebook.Yoga
         {
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.MinWidth = 100f;
-            root.Height = 100f;
+            root.MinWidth = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Width = 50f;
+            root_child1.Width = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -510,14 +510,14 @@ namespace Facebook.Yoga
         public void Test_flex_grow_within_constrained_min_column()
         {
             YogaNode root = new YogaNode();
-            root.MinHeight = 100f;
+            root.MinHeight = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 50f;
+            root_child1.Height = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -560,21 +560,21 @@ namespace Facebook.Yoga
         public void Test_flex_grow_within_constrained_max_row()
         {
             YogaNode root = new YogaNode();
-            root.Width = 200f;
+            root.Width = 200;
 
             YogaNode root_child0 = new YogaNode();
             root_child0.FlexDirection = YogaFlexDirection.Row;
-            root_child0.MaxWidth = 100f;
-            root_child0.Height = 100f;
+            root_child0.MaxWidth = 100;
+            root_child0.Height = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.FlexShrink = 1f;
-            root_child0_child0.FlexBasis = 100f;
+            root_child0_child0.FlexShrink = 1;
+            root_child0_child0.FlexBasis = 100;
             root_child0.Insert(0, root_child0_child0);
 
             YogaNode root_child0_child1 = new YogaNode();
-            root_child0_child1.Width = 50f;
+            root_child0_child1.Width = 50;
             root_child0.Insert(1, root_child0_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -627,16 +627,16 @@ namespace Facebook.Yoga
         public void Test_flex_grow_within_constrained_max_column()
         {
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.MaxHeight = 100f;
+            root.Width = 100;
+            root.MaxHeight = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexShrink = 1f;
-            root_child0.FlexBasis = 100f;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.Height = 50f;
+            root_child1.Height = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGPaddingTest.cs

@@ -21,10 +21,10 @@ namespace Facebook.Yoga
         public void Test_padding_no_size()
         {
             YogaNode root = new YogaNode();
-            root.SetPadding(YogaEdge.Left, 10f);
-            root.SetPadding(YogaEdge.Top, 10f);
-            root.SetPadding(YogaEdge.Right, 10f);
-            root.SetPadding(YogaEdge.Bottom, 10f);
+            root.PaddingLeft = 10;
+            root.PaddingTop = 10;
+            root.PaddingRight = 10;
+            root.PaddingBottom = 10;
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
 
@@ -46,14 +46,14 @@ namespace Facebook.Yoga
         public void Test_padding_container_match_child()
         {
             YogaNode root = new YogaNode();
-            root.SetPadding(YogaEdge.Left, 10f);
-            root.SetPadding(YogaEdge.Top, 10f);
-            root.SetPadding(YogaEdge.Right, 10f);
-            root.SetPadding(YogaEdge.Bottom, 10f);
+            root.PaddingLeft = 10;
+            root.PaddingTop = 10;
+            root.PaddingRight = 10;
+            root.PaddingBottom = 10;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -86,16 +86,16 @@ namespace Facebook.Yoga
         public void Test_padding_flex_child()
         {
             YogaNode root = new YogaNode();
-            root.SetPadding(YogaEdge.Left, 10f);
-            root.SetPadding(YogaEdge.Top, 10f);
-            root.SetPadding(YogaEdge.Right, 10f);
-            root.SetPadding(YogaEdge.Bottom, 10f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.PaddingLeft = 10;
+            root.PaddingTop = 10;
+            root.PaddingRight = 10;
+            root.PaddingBottom = 10;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.Width = 10f;
+            root_child0.FlexGrow = 1;
+            root_child0.Width = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -128,15 +128,15 @@ namespace Facebook.Yoga
         public void Test_padding_stretch_child()
         {
             YogaNode root = new YogaNode();
-            root.SetPadding(YogaEdge.Left, 10f);
-            root.SetPadding(YogaEdge.Top, 10f);
-            root.SetPadding(YogaEdge.Right, 10f);
-            root.SetPadding(YogaEdge.Bottom, 10f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.PaddingLeft = 10;
+            root.PaddingTop = 10;
+            root.PaddingRight = 10;
+            root.PaddingBottom = 10;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Height = 10f;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -171,15 +171,15 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
-            root.SetPadding(YogaEdge.Start, 10f);
-            root.SetPadding(YogaEdge.End, 20f);
-            root.SetPadding(YogaEdge.Bottom, 20f);
-            root.Width = 100f;
-            root.Height = 100f;
+            root.PaddingStart = 10;
+            root.PaddingEnd = 20;
+            root.PaddingBottom = 20;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.Width = 10f;
-            root_child0.Height = 10f;
+            root_child0.Width = 10;
+            root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -214,16 +214,16 @@ namespace Facebook.Yoga
             YogaNode root = new YogaNode();
             root.JustifyContent = YogaJustify.FlexEnd;
             root.AlignItems = YogaAlign.FlexEnd;
-            root.Width = 200f;
-            root.Height = 200f;
+            root.Width = 200;
+            root.Height = 200;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.SetPadding(YogaEdge.Left, 20f);
-            root_child0.SetPadding(YogaEdge.Top, 20f);
-            root_child0.SetPadding(YogaEdge.Right, 20f);
-            root_child0.SetPadding(YogaEdge.Bottom, 20f);
-            root_child0.Width = 100f;
-            root_child0.Height = 100f;
+            root_child0.PaddingLeft = 20;
+            root_child0.PaddingTop = 20;
+            root_child0.PaddingRight = 20;
+            root_child0.PaddingBottom = 20;
+            root_child0.Width = 100;
+            root_child0.Height = 100;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YGPercentageTest.cs

@@ -0,0 +1,959 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+ // @Generated by gentest/gentest.rb from gentest/fixtures/YGPercentageTest.html
+
+using System;
+using NUnit.Framework;
+
+namespace Facebook.Yoga
+{
+    [TestFixture]
+    public class YGPercentageTest
+    {
+        [Test]
+        public void Test_percentage_width_height()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.Width = 30.Percent();
+            root_child0.Height = 30.Percent();
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(60f, root_child0.LayoutWidth);
+            Assert.AreEqual(60f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(140f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(60f, root_child0.LayoutWidth);
+            Assert.AreEqual(60f, root_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_position_left_top()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 400;
+            root.Height = 400;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.Left = 10.Percent();
+            root_child0.Top = 20.Percent();
+            root_child0.Width = 45.Percent();
+            root_child0.Height = 55.Percent();
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(400f, root.LayoutWidth);
+            Assert.AreEqual(400f, root.LayoutHeight);
+
+            Assert.AreEqual(40f, root_child0.LayoutX);
+            Assert.AreEqual(80f, root_child0.LayoutY);
+            Assert.AreEqual(180f, root_child0.LayoutWidth);
+            Assert.AreEqual(220f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(400f, root.LayoutWidth);
+            Assert.AreEqual(400f, root.LayoutHeight);
+
+            Assert.AreEqual(260f, root_child0.LayoutX);
+            Assert.AreEqual(80f, root_child0.LayoutY);
+            Assert.AreEqual(180f, root_child0.LayoutWidth);
+            Assert.AreEqual(220f, root_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_position_bottom_right()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.Right = 20.Percent();
+            root_child0.Bottom = 10.Percent();
+            root_child0.Width = 55.Percent();
+            root_child0.Height = 15.Percent();
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(-100f, root_child0.LayoutX);
+            Assert.AreEqual(-50f, root_child0.LayoutY);
+            Assert.AreEqual(275f, root_child0.LayoutWidth);
+            Assert.AreEqual(75f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(125f, root_child0.LayoutX);
+            Assert.AreEqual(-50f, root_child0.LayoutY);
+            Assert.AreEqual(275f, root_child0.LayoutWidth);
+            Assert.AreEqual(75f, root_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 1;
+            root_child1.FlexBasis = 25.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(125f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(125f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(75f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(75f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(125f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(75f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_cross()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 1;
+            root_child1.FlexBasis = 25.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(125f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(125f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(75f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(125f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(125f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(75f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_cross_min_height()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.MinHeight = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 2;
+            root_child1.MinHeight = 10.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(140f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(140f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(60f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(140f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(140f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(60f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_main_max_height()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 10.Percent();
+            root_child0.MaxHeight = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 10.Percent();
+            root_child1.MaxHeight = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(52f, root_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(52f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(148f, root_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(148f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(52f, root_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(148f, root_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_cross_max_height()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 10.Percent();
+            root_child0.MaxHeight = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 10.Percent();
+            root_child1.MaxHeight = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(120f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(120f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_main_max_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 15.Percent();
+            root_child0.MaxWidth = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 10.Percent();
+            root_child1.MaxWidth = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(120f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(40f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(40f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(40f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_cross_max_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 10.Percent();
+            root_child0.MaxWidth = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 15.Percent();
+            root_child1.MaxWidth = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(40f, root_child1.LayoutWidth);
+            Assert.AreEqual(150f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(160f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(40f, root_child1.LayoutWidth);
+            Assert.AreEqual(150f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_main_min_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 15.Percent();
+            root_child0.MinWidth = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 10.Percent();
+            root_child1.MinWidth = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(120f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(80f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(80f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_flex_basis_cross_min_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 10.Percent();
+            root_child0.MinWidth = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 15.Percent();
+            root_child1.MinWidth = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(150f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(150f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_multiple_nested_with_padding_margin_and_percentage_values()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 10.Percent();
+            root_child0.MarginLeft = 5;
+            root_child0.MarginTop = 5;
+            root_child0.MarginRight = 5;
+            root_child0.MarginBottom = 5;
+            root_child0.PaddingLeft = 3;
+            root_child0.PaddingTop = 3;
+            root_child0.PaddingRight = 3;
+            root_child0.PaddingBottom = 3;
+            root_child0.MinWidth = 60.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode();
+            root_child0_child0.MarginLeft = 5;
+            root_child0_child0.MarginTop = 5;
+            root_child0_child0.MarginRight = 5;
+            root_child0_child0.MarginBottom = 5;
+            root_child0_child0.PaddingLeft = 3.Percent();
+            root_child0_child0.PaddingTop = 3.Percent();
+            root_child0_child0.PaddingRight = 3.Percent();
+            root_child0_child0.PaddingBottom = 3.Percent();
+            root_child0_child0.Width = 50.Percent();
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode();
+            root_child0_child0_child0.MarginLeft = 5.Percent();
+            root_child0_child0_child0.MarginTop = 5.Percent();
+            root_child0_child0_child0.MarginRight = 5.Percent();
+            root_child0_child0_child0.MarginBottom = 5.Percent();
+            root_child0_child0_child0.PaddingLeft = 3;
+            root_child0_child0_child0.PaddingTop = 3;
+            root_child0_child0_child0.PaddingRight = 3;
+            root_child0_child0_child0.PaddingBottom = 3;
+            root_child0_child0_child0.Width = 45.Percent();
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.FlexGrow = 4;
+            root_child1.FlexBasis = 15.Percent();
+            root_child1.MinWidth = 20.Percent();
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(5f, root_child0.LayoutX);
+            Assert.AreEqual(5f, root_child0.LayoutY);
+            Assert.AreEqual(190f, root_child0.LayoutWidth);
+            Assert.AreEqual(48f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(8f, root_child0_child0.LayoutX);
+            Assert.AreEqual(8f, root_child0_child0.LayoutY);
+            Assert.AreEqual(92f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(25f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(10f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(10f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(36f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(6f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(58f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(142f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(5f, root_child0.LayoutX);
+            Assert.AreEqual(5f, root_child0.LayoutY);
+            Assert.AreEqual(190f, root_child0.LayoutWidth);
+            Assert.AreEqual(48f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child0_child0.LayoutX);
+            Assert.AreEqual(8f, root_child0_child0.LayoutY);
+            Assert.AreEqual(92f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(25f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(46f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(10f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(36f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(6f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(58f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(142f, root_child1.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_margin_should_calculate_based_only_on_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.MarginLeft = 10.Percent();
+            root_child0.MarginTop = 10.Percent();
+            root_child0.MarginRight = 10.Percent();
+            root_child0.MarginBottom = 10.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode();
+            root_child0_child0.Width = 10;
+            root_child0_child0.Height = 10;
+            root_child0.Insert(0, root_child0_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(20f, root_child0.LayoutX);
+            Assert.AreEqual(20f, root_child0.LayoutY);
+            Assert.AreEqual(160f, root_child0.LayoutWidth);
+            Assert.AreEqual(60f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(20f, root_child0.LayoutX);
+            Assert.AreEqual(20f, root_child0.LayoutY);
+            Assert.AreEqual(160f, root_child0.LayoutWidth);
+            Assert.AreEqual(60f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(150f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_padding_should_calculate_based_only_on_width()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1;
+            root_child0.PaddingLeft = 10.Percent();
+            root_child0.PaddingTop = 10.Percent();
+            root_child0.PaddingRight = 10.Percent();
+            root_child0.PaddingBottom = 10.Percent();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode();
+            root_child0_child0.Width = 10;
+            root_child0_child0.Height = 10;
+            root_child0.Insert(0, root_child0_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(20f, root_child0_child0.LayoutX);
+            Assert.AreEqual(20f, root_child0_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(170f, root_child0_child0.LayoutX);
+            Assert.AreEqual(20f, root_child0_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+        [Test]
+        public void Test_percentage_absolute_position()
+        {
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
+
+            YogaNode root = new YogaNode();
+            root.Width = 200;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Left = 30.Percent();
+            root_child0.Top = 10.Percent();
+            root_child0.Width = 10;
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(60f, root_child0.LayoutX);
+            Assert.AreEqual(10f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(60f, root_child0.LayoutX);
+            Assert.AreEqual(10f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, false);
+        }
+
+    }
+}

csharp/tests/Facebook.Yoga/YGRoundingTest.cs

@@ -24,19 +24,19 @@ namespace Facebook.Yoga
 
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 100f;
-            root.Height = 100f;
+            root.Width = 100;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
+            root_child2.FlexGrow = 1;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -94,27 +94,27 @@ namespace Facebook.Yoga
 
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 113f;
-            root.Height = 100f;
+            root.Width = 113;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
+            root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
+            root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
+            root_child2.FlexGrow = 1;
             root.Insert(2, root_child2);
 
             YogaNode root_child3 = new YogaNode();
-            root_child3.FlexGrow = 1f;
+            root_child3.FlexGrow = 1;
             root.Insert(3, root_child3);
 
             YogaNode root_child4 = new YogaNode();
-            root_child4.FlexGrow = 1f;
+            root_child4.FlexGrow = 1;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -192,20 +192,20 @@ namespace Facebook.Yoga
 
             YogaNode root = new YogaNode();
             root.FlexDirection = YogaFlexDirection.Row;
-            root.Width = 101f;
-            root.Height = 100f;
+            root.Width = 101;
+            root.Height = 100;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexShrink = 1f;
-            root_child0.FlexBasis = 100f;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 100;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexBasis = 25f;
+            root_child1.FlexBasis = 25;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexBasis = 25f;
+            root_child2.FlexBasis = 25;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -262,23 +262,23 @@ namespace Facebook.Yoga
             YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode();
-            root.Width = 100f;
-            root.Height = 113f;
+            root.Width = 100;
+            root.Height = 113;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -346,7 +346,7 @@ namespace Facebook.Yoga
 
             YogaNode root_child1 = new YogaNode();
             root_child1.FlexGrow = 1.6f;
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
@@ -418,22 +418,22 @@ namespace Facebook.Yoga
             root.Insert(0, root_child0);
 
             YogaNode root_child0_child0 = new YogaNode();
-            root_child0_child0.FlexGrow = 1f;
+            root_child0_child0.FlexGrow = 1;
             root_child0_child0.FlexBasis = 0.3f;
-            root_child0_child0.SetPosition(YogaEdge.Bottom, 13.3f);
+            root_child0_child0.Bottom = 13.3f;
             root_child0_child0.Height = 9.9f;
             root_child0.Insert(0, root_child0_child0);
 
             YogaNode root_child0_child1 = new YogaNode();
-            root_child0_child1.FlexGrow = 4f;
+            root_child0_child1.FlexGrow = 4;
             root_child0_child1.FlexBasis = 0.3f;
-            root_child0_child1.SetPosition(YogaEdge.Top, 13.3f);
+            root_child0_child1.Top = 13.3f;
             root_child0_child1.Height = 1.1f;
             root_child0.Insert(1, root_child0_child1);
 
             YogaNode root_child1 = new YogaNode();
             root_child1.FlexGrow = 1.6f;
-            root_child1.Height = 10f;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
@@ -515,23 +515,23 @@ namespace Facebook.Yoga
             YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode();
-            root.Width = 100f;
+            root.Width = 100;
             root.Height = 113.4f;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -588,23 +588,23 @@ namespace Facebook.Yoga
             YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode();
-            root.Width = 100f;
+            root.Width = 100;
             root.Height = 113.6f;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -661,24 +661,24 @@ namespace Facebook.Yoga
             YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode();
-            root.SetPosition(YogaEdge.Top, 0.3f);
-            root.Width = 100f;
+            root.Top = 0.3f;
+            root.Width = 100;
             root.Height = 113.4f;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
@@ -735,24 +735,24 @@ namespace Facebook.Yoga
             YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode();
-            root.SetPosition(YogaEdge.Top, 0.7f);
-            root.Width = 100f;
+            root.Top = 0.7f;
+            root.Width = 100;
             root.Height = 113.4f;
 
             YogaNode root_child0 = new YogaNode();
-            root_child0.FlexGrow = 1f;
-            root_child0.FlexBasis = 50f;
-            root_child0.Height = 20f;
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 50;
+            root_child0.Height = 20;
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode();
-            root_child1.FlexGrow = 1f;
-            root_child1.Height = 10f;
+            root_child1.FlexGrow = 1;
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode();
-            root_child2.FlexGrow = 1f;
-            root_child2.Height = 10f;
+            root_child2.FlexGrow = 1;
+            root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();

csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs

@@ -1,143 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using NUnit.Framework;
-using System;
-
-/**
- * Tests for {@link YogaNode}.
- */
-namespace Facebook.Yoga
-{
-    [TestFixture]
-    public class YogaNodeCreateTest
-    {
-        [Test]
-        public void TestSimple()
-        {
-            YogaNode nodeDefault = new YogaNode();
-            YogaNode nodeCreated = YogaNode.Create(flexDirection: YogaFlexDirection.Row);
-            Assert.AreEqual(YogaFlexDirection.Row, nodeCreated.FlexDirection);
-            Assert.IsFalse(nodeDefault.IsDirty);
-            nodeDefault.CopyStyle(nodeCreated);
-            Assert.IsTrue(nodeDefault.IsDirty);
-        }
-
-        [Test]
-        public void TestSame()
-        {
-            YogaNode nodeDefault = new YogaNode();
-            YogaNode nodeCreated = YogaNode.Create();
-            Assert.IsFalse(nodeDefault.IsDirty);
-            nodeDefault.CopyStyle(nodeCreated);
-            Assert.IsFalse(nodeDefault.IsDirty);
-        }
-
-        [Test]
-        public void TestMultiple()
-        {
-            YogaNode node = YogaNode.Create(
-                positionType: YogaPositionType.Absolute,
-                wrap: YogaWrap.Wrap,
-                position: new Spacing(top:6, right:4),
-                margin: new Spacing(bottom:5, left:3));
-
-            Assert.AreEqual(YogaFlexDirection.Column, node.FlexDirection);
-            Assert.AreEqual(YogaPositionType.Absolute, node.PositionType);
-            Assert.AreEqual(YogaWrap.Wrap, node.Wrap);
-            Assert.AreEqual(6, node.GetPosition(YogaEdge.Top));
-            Assert.IsTrue(YogaConstants.IsUndefined(node.GetPosition(YogaEdge.Bottom)));
-            Assert.AreEqual(4, node.GetPosition(YogaEdge.Right));
-            Assert.IsTrue(YogaConstants.IsUndefined(node.GetPosition(YogaEdge.Left)));
-            Assert.AreEqual(0, node.GetMargin(YogaEdge.Top));
-            Assert.AreEqual(5, node.GetMargin(YogaEdge.Bottom));
-            Assert.AreEqual(3, node.GetMargin(YogaEdge.Left));
-            Assert.AreEqual(0, node.GetMargin(YogaEdge.Right));
-        }
-
-        [Test]
-        public void TestFull()
-        {
-            YogaNode node = YogaNode.Create(
-                styleDirection: YogaDirection.RTL,
-                flexDirection: YogaFlexDirection.RowReverse,
-
-                justifyContent: YogaJustify.SpaceAround,
-                alignContent: YogaAlign.Center,
-                alignItems: YogaAlign.FlexEnd,
-                alignSelf: YogaAlign.Stretch,
-
-                positionType: YogaPositionType.Absolute,
-                wrap: YogaWrap.Wrap,
-                overflow: YogaOverflow.Scroll,
-
-                flex: 1,
-                flexGrow: 2,
-                flexShrink: 3,
-                flexBasis: 4,
-
-                position: new Spacing(top: 5, bottom: 6, left: 7, right: 8),
-                margin: new Spacing(top: 9, bottom: 10, left: 11, right: 12),
-                padding: new Spacing(top: 13, bottom: 14, left: 15, right: 16),
-                border: new Spacing(top: 17, bottom: 18, left: 19, right: 20),
-
-                width: 21,
-                height: 22,
-                minWidth: 23,
-                minHeight: 24,
-                maxWidth: 25,
-                maxHeight: 26);
-
-            Assert.AreEqual(YogaDirection.RTL, node.StyleDirection);
-            Assert.AreEqual(YogaFlexDirection.RowReverse, node.FlexDirection);
-
-            Assert.AreEqual(YogaJustify.SpaceAround, node.JustifyContent);
-            Assert.AreEqual(YogaAlign.Center, node.AlignContent);
-            Assert.AreEqual(YogaAlign.FlexEnd, node.AlignItems);
-            Assert.AreEqual(YogaAlign.Stretch, node.AlignSelf);
-
-            Assert.AreEqual(YogaPositionType.Absolute, node.PositionType);
-            Assert.AreEqual(YogaWrap.Wrap, node.Wrap);
-            Assert.AreEqual(YogaOverflow.Scroll, node.Overflow);
-
-            Assert.AreEqual(2, node.FlexGrow);
-            Assert.AreEqual(3, node.FlexShrink);
-            Assert.AreEqual(4, node.FlexBasis);
-            node.FlexGrow = YogaConstants.Undefined;
-            Assert.AreEqual(1, node.FlexGrow);
-
-            Assert.AreEqual(5, node.GetPosition(YogaEdge.Top));
-            Assert.AreEqual(6, node.GetPosition(YogaEdge.Bottom));
-            Assert.AreEqual(7, node.GetPosition(YogaEdge.Left));
-            Assert.AreEqual(8, node.GetPosition(YogaEdge.Right));
-
-            Assert.AreEqual(9, node.GetMargin(YogaEdge.Top));
-            Assert.AreEqual(10, node.GetMargin(YogaEdge.Bottom));
-            Assert.AreEqual(11, node.GetMargin(YogaEdge.Left));
-            Assert.AreEqual(12, node.GetMargin(YogaEdge.Right));
-
-            Assert.AreEqual(13, node.GetPadding(YogaEdge.Top));
-            Assert.AreEqual(14, node.GetPadding(YogaEdge.Bottom));
-            Assert.AreEqual(15, node.GetPadding(YogaEdge.Left));
-            Assert.AreEqual(16, node.GetPadding(YogaEdge.Right));
-
-            Assert.AreEqual(17, node.GetBorder(YogaEdge.Top));
-            Assert.AreEqual(18, node.GetBorder(YogaEdge.Bottom));
-            Assert.AreEqual(19, node.GetBorder(YogaEdge.Left));
-            Assert.AreEqual(20, node.GetBorder(YogaEdge.Right));
-
-            Assert.AreEqual(21, node.Width);
-            Assert.AreEqual(22, node.Height);
-            Assert.AreEqual(23, node.MinWidth);
-            Assert.AreEqual(24, node.MinHeight);
-            Assert.AreEqual(25, node.MaxWidth);
-            Assert.AreEqual(26, node.MaxHeight);
-        }
-    }
-}

csharp/tests/Facebook.Yoga/YogaNodeSpacingTest.cs

@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using NUnit.Framework;
+using System;
+
+/**
+ * Tests for {@link YogaNode}.
+ */
+namespace Facebook.Yoga
+{
+    [TestFixture]
+    public class YogaNodeSpacingTest
+    {
+        [Test]
+        public void TestObjectInitializer()
+        {
+            YogaNode node = new YogaNode
+            {
+                Top = 1,
+                Bottom = 2,
+                Left = 3,
+                Right = 4,
+
+                MarginTop = 5,
+                MarginBottom = 6,
+                MarginLeft = 7,
+                MarginRight = 8,
+
+                PaddingTop = 9,
+                PaddingBottom = 10,
+                PaddingLeft = 11,
+                PaddingRight = 12,
+
+                BorderTopWidth = 13,
+                BorderBottomWidth = 14,
+                BorderLeftWidth = 15,
+                BorderRightWidth = 16,
+            };
+
+            Assert.AreEqual(1.Px(), node.Top);
+            Assert.AreEqual(2.Px(), node.Bottom);
+            Assert.AreEqual(3.Px(), node.Left);
+            Assert.AreEqual(4.Px(), node.Right);
+
+            Assert.AreEqual(5.Px(), node.MarginTop);
+            Assert.AreEqual(6.Px(), node.MarginBottom);
+            Assert.AreEqual(7.Px(), node.MarginLeft);
+            Assert.AreEqual(8.Px(), node.MarginRight);
+
+            Assert.AreEqual(9.Px(), node.PaddingTop);
+            Assert.AreEqual(10.Px(), node.PaddingBottom);
+            Assert.AreEqual(11.Px(), node.PaddingLeft);
+            Assert.AreEqual(12.Px(), node.PaddingRight);
+
+            Assert.AreEqual(13, node.BorderTopWidth);
+            Assert.AreEqual(14, node.BorderBottomWidth);
+            Assert.AreEqual(15, node.BorderLeftWidth);
+            Assert.AreEqual(16, node.BorderRightWidth);
+        }
+
+        [Test]
+        public void TestWriteRead()
+        {
+            YogaNode node = new YogaNode();
+
+            node.Top = 1;
+            node.Bottom = 2;
+            node.Left = 3;
+            node.Right = 4;
+
+            node.MarginTop = 5;
+            node.MarginBottom = 6;
+            node.MarginLeft = 7;
+            node.MarginRight = 8;
+
+            node.PaddingTop = 9;
+            node.PaddingBottom = 10;
+            node.PaddingLeft = 11;
+            node.PaddingRight = 12;
+
+            node.BorderTopWidth = 13;
+            node.BorderBottomWidth = 14;
+            node.BorderLeftWidth = 15;
+            node.BorderRightWidth = 16;
+
+            Assert.AreEqual(1.Px(), node.Top);
+            Assert.AreEqual(2.Px(), node.Bottom);
+            Assert.AreEqual(3.Px(), node.Left);
+            Assert.AreEqual(4.Px(), node.Right);
+
+            Assert.AreEqual(5.Px(), node.MarginTop);
+            Assert.AreEqual(6.Px(), node.MarginBottom);
+            Assert.AreEqual(7.Px(), node.MarginLeft);
+            Assert.AreEqual(8.Px(), node.MarginRight);
+
+            Assert.AreEqual(9.Px(), node.PaddingTop);
+            Assert.AreEqual(10.Px(), node.PaddingBottom);
+            Assert.AreEqual(11.Px(), node.PaddingLeft);
+            Assert.AreEqual(12.Px(), node.PaddingRight);
+
+            Assert.AreEqual(13, node.BorderTopWidth);
+            Assert.AreEqual(14, node.BorderBottomWidth);
+            Assert.AreEqual(15, node.BorderLeftWidth);
+            Assert.AreEqual(16, node.BorderRightWidth);
+        }
+    }
+}

csharp/tests/Facebook.Yoga/YogaNodeTest.cs

@@ -197,6 +197,54 @@ namespace Facebook.Yoga
             });
         }
 
+        [Test]
+        public void TestBaselineFunc()
+        {
+            YogaNode node = new YogaNode();
+            node.Height = 200;
+            node.FlexDirection = YogaFlexDirection.Row;
+            node.AlignItems = YogaAlign.Baseline;
+
+            YogaNode child0 = new YogaNode();
+            child0.Width = 100;
+            child0.Height = 110;
+            child0.SetBaselineFunction((_, width, height) => {
+                Assert.AreEqual(100, width);
+                Assert.AreEqual(110, height);
+                return 65;
+            });
+            node.Insert(0, child0);
+
+            YogaNode child1 = new YogaNode();
+            child1.Width = 100;
+            child1.Height = 110;
+            child1.SetBaselineFunction((_, width, height) => {
+                Assert.AreEqual(100, width);
+                Assert.AreEqual(110, height);
+                return 80;
+            });
+            node.Insert(1, child1);
+
+            YogaNode child2 = new YogaNode();
+            child2.Width = 100;
+            child2.Height = 110;
+            child2.SetBaselineFunction((_, width, height) => {
+                Assert.AreEqual(100, width);
+                Assert.AreEqual(110, height);
+                return 88;
+            });
+            node.Insert(2, child2);
+
+            node.CalculateLayout();
+
+            Assert.AreEqual(0, child0.LayoutX);
+            Assert.AreEqual(23, child0.LayoutY);
+            Assert.AreEqual(100, child1.LayoutX);
+            Assert.AreEqual(8, child1.LayoutY);
+            Assert.AreEqual(200, child2.LayoutX);
+            Assert.AreEqual(0, child2.LayoutY);
+        }
+
         [Test]
         public void TestPrint()
         {
@@ -212,7 +260,7 @@ namespace Facebook.Yoga
             parent.Insert(0, child0);
             parent.Insert(0, child1);
             parent.CalculateLayout();
-            Assert.AreEqual(parent.Print(), "{layout: {width: 100, height: 120, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 100, height: 120, children: [\n  {layout: {width: 35, height: 45, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 35, height: 45, },\n  {layout: {width: 30, height: 40, top: 45, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 30, height: 40, },\n]},\n");
+            Assert.AreEqual("{layout: {width: 100, height: 120, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 100px, height: 120px, children: [\n  {layout: {width: 35, height: 45, top: 0, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 35px, height: 45px, },\n  {layout: {width: 30, height: 40, top: 45, left: 0}, flexDirection: 'column', alignItems: 'stretch', flexGrow: 0, flexShrink: 0, overflow: 'visible', width: 30px, height: 40px, },\n]},\n", parent.Print());
         }
 
         [Test]
@@ -225,7 +273,7 @@ namespace Facebook.Yoga
             node1.MaxHeight = 100;
 
             node0.CopyStyle(node1);
-            Assert.AreEqual(100, node0.MaxHeight);
+            Assert.AreEqual(100.Px(), node0.MaxHeight);
         }
 
         private void ForceGC()
@@ -355,5 +403,22 @@ namespace Facebook.Yoga
                 return MeasureOutput.Make(120, 130);
             });
         }
+
+        [Test]
+        public void TestLayoutPadding() {
+          YogaNode node = new YogaNode();
+          node.Width = 100;
+          node.Height = 100;
+          node.PaddingStart = 1;
+          node.PaddingEnd = 2;
+          node.PaddingTop = 3;
+          node.PaddingBottom = 4;
+          node.CalculateLayout();
+
+          Assert.AreEqual(1, node.LayoutPaddingLeft);
+          Assert.AreEqual(2, node.LayoutPaddingRight);
+          Assert.AreEqual(3, node.LayoutPaddingTop);
+          Assert.AreEqual(4, node.LayoutPaddingBottom);
+        }
     }
 }

docs/_data/nav_docs.yml

@@ -22,3 +22,4 @@
   - id: objc
   - id: java
   - id: csharp
+  - id: javascript

docs/_docs/api/javascript.md

@@ -0,0 +1,53 @@
+---
+docid: javascript
+title: Javascript
+layout: docs
+permalink: /docs/api/javascript/
+---
+
+The `yoga-layout` module offers two different implementations of Yoga. The first one is a native Node module, and the second one is an asm.js fallback that can be used when native compilation isn't an option - such as web browsers.
+
+> Because this module is compiled from a C++ codebase, the function prototypes below will use the C++-syntax. Nevertheless, the corresponding methods all exist on the JS side, with the same arguments (`Node *` being a node object).
+
+### Lifecycle
+
+Create a node via `Yoga.Node.create()`, and destroy it by using its `free()` or `freeRecursive()` method. Note that unlike most objects in your Javascript applications, your nodes will not get automatically garbage collected, which means that it is especially important you keep track of them so you can free them when you no longer need them.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=14:17"></script>
+
+### Children
+
+The following methods help manage the children of a node.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=114:126"></script>
+
+### Style getters & setters
+
+The large part of Yoga's API consists of properties, setters, and getters for styles. These all follow the same general structure. Bellow are the function and enums used to control the various styles. For an in depth guide to how each style works see the getting started guide.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=41:77"></script>
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=79:112"></script>
+
+### Layout results
+
+Once you have set up a tree of nodes with styles you will want to get the result of a layout calculation. Call `calculateLayout()` perform layout calculation. Once this function returns the results of the layout calculation is stored on each node. Traverse the tree and retrieve the values from each node.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=142:157"></script>
+
+### Custom measurements
+
+Certain nodes need to ability to measure themselves, the most common example is nodes which represent text. Text has an intrinsic size and requires measuring itself to determine that size. This is not something Yoga can do as it requires relying on the host system's text rendering engine.
+
+- Call `markDirty()` if a node with a custom text measurement function needs to be re-measured during the next layout pass.
+- Note that in the prototype below, `Size` is an object that contain both `width` and `height` properties.
+
+> A measure function can only be attached to a leaf node in the hierarchy.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/Node.hh?slice=128:131"></script>
+
+### Experiments
+
+Yoga has the concept of experiments. An experiment is a feature which is not yet stable. To enable a feature use the following functions. Once a feature has been tested and is ready to be released as a stable API we will remove its feature flag.
+
+<script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/global.hh?slice=3:4"></script>

enums.py

@@ -17,6 +17,11 @@ ENUMS = {
         'LTR',
         'RTL',
     ],
+    'Unit': [
+        'Undefined',
+        'Pixel',
+        'Percent',
+    ],
     'FlexDirection': [
         'Column',
         'ColumnReverse',
@@ -41,6 +46,7 @@ ENUMS = {
         'Center',
         'FlexEnd',
         'Stretch',
+        'Baseline',
     ],
     'PositionType': [
         'Relative',
@@ -113,21 +119,21 @@ def to_java_upper(symbol):
 
 root = os.path.dirname(os.path.abspath(__file__))
 
-# write out C headers
+# write out C & Objective-C headers
 with open(root + '/yoga/YGEnums.h', 'w') as f:
     f.write(LICENSE)
     f.write('#pragma once\n\n')
     f.write('#include "YGMacros.h"\n\n')
     f.write('YG_EXTERN_C_BEGIN\n\n')
     for name, values in ENUMS.items():
-        f.write('#define YG%sCount %s\n' % (name, len(values)))
-        f.write('typedef enum YG%s {\n' % name)
+        f.write('#define YG%sCount %s\n' % (name, len(values)))        
+        f.write('typedef YG_ENUM_BEGIN(YG%s) {\n' % name)
         for value in values:
             if isinstance(value, tuple):
                 f.write('  YG%s%s = %d,\n' % (name, value[0], value[1]))
             else:
                 f.write('  YG%s%s,\n' % (name, value))
-        f.write('} YG%s;\n' % name)
+        f.write('} YG_ENUM_END(YG%s);\n' % name)
         f.write('\n')
     f.write('YG_EXTERN_C_END\n')
 
@@ -187,3 +193,20 @@ for name, values in ENUMS.items():
                 f.write('        %s,\n' % value)
         f.write('    }\n')
         f.write('}\n')
+
+# write out javascript file
+with open(root + '/javascript/sources/YGEnums.js', 'w') as f:
+    f.write(LICENSE)
+    f.write('module.exports = {\n\n')
+    for name, values in ENUMS.items():
+        f.write('  %s_COUNT: %s,\n' % (to_java_upper(name), len(values)))
+        base = 0
+        for value in values:
+            if isinstance(value, tuple):
+                f.write('  %s_%s: %d,\n' % (to_java_upper(name), to_java_upper(value[0]), value[1]))
+                base = value[1] + 1
+            else:
+                f.write('  %s_%s: %d,\n' % (to_java_upper(name), to_java_upper(value), base))
+                base += 1
+        f.write('\n');
+    f.write('};\n')