diff --git a/csharp/Facebook.Yoga/Native.cs b/csharp/Facebook.Yoga/Native.cs
index 02e9399d..3271c7d2 100644
--- a/csharp/Facebook.Yoga/Native.cs
+++ b/csharp/Facebook.Yoga/Native.cs
@@ -74,6 +74,14 @@ namespace Facebook.Yoga
[DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
public static extern bool YGConfigGetUseWebDefaults(YGConfigHandle config);
+ [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+ public static extern void YGConfigSetUseLegacyStretchBehaviour(
+ YGConfigHandle config,
+ bool useLegacyStretchBehavior);
+
+ [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+ public static extern bool YGConfigGetUseLegacyStretchBehaviour(YGConfigHandle config);
+
[DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
public static extern void YGConfigSetPointScaleFactor(
YGConfigHandle config,
diff --git a/csharp/Facebook.Yoga/YogaConfig.cs b/csharp/Facebook.Yoga/YogaConfig.cs
index 7f175725..b8e58e09 100644
--- a/csharp/Facebook.Yoga/YogaConfig.cs
+++ b/csharp/Facebook.Yoga/YogaConfig.cs
@@ -1,4 +1,4 @@
-/**
+/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
@@ -117,6 +117,19 @@ namespace Facebook.Yoga
}
}
+ public bool UseLegacyStretchBehaviour
+ {
+ get
+ {
+ return Native.YGConfigGetUseLegacyStretchBehaviour(_ygConfig);
+ }
+
+ set
+ {
+ Native.YGConfigSetUseLegacyStretchBehaviour(_ygConfig, value);
+ }
+ }
+
public float PointScaleFactor
{
set
diff --git a/csharp/Yoga/Yoga.Universal.vcxproj b/csharp/Yoga/Yoga.Universal.vcxproj
index 43d62b17..1c956466 100644
--- a/csharp/Yoga/Yoga.Universal.vcxproj
+++ b/csharp/Yoga/Yoga.Universal.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -33,47 +33,47 @@
Yoga
true
Windows Store
- 10.0.10586.0
- 10.0.10240.0
+ 10.0.14393.0
+ 10.0.14393.0
10.0
DynamicLibrary
true
- v140
+ v141
Unicode
DynamicLibrary
true
- v140
+ v141
Unicode
DynamicLibrary
false
- v140
+ v141
true
Unicode
DynamicLibrary
false
- v140
+ v141
true
Unicode
DynamicLibrary
true
- v140
+ v141
Unicode
DynamicLibrary
false
- v140
+ v141
true
Unicode
@@ -116,7 +116,7 @@
true
bin\Universal\$(PlatformTarget)\$(Configuration)\
- obj\$(PlatformTarget)\$(Configuration)\
+ obj\Universal\$(PlatformTarget)\$(Configuration)\
yoga
@@ -242,19 +242,31 @@
+
+
-
+
+
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
false
@@ -284,4 +296,4 @@
-
\ No newline at end of file
+
diff --git a/csharp/Yoga/Yoga.Universal.vcxproj.filters b/csharp/Yoga/Yoga.Universal.vcxproj.filters
index 84cee3aa..697d52c1 100644
--- a/csharp/Yoga/Yoga.Universal.vcxproj.filters
+++ b/csharp/Yoga/Yoga.Universal.vcxproj.filters
@@ -21,22 +21,40 @@
Header Files
-
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
Header Files
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
+ Header Files
+
+
+ Header Files
+
+
Header Files
@@ -47,16 +65,34 @@
Source Files
-
- Source Files
-
-
- Source Files
-
Source Files
-
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
Source Files
@@ -65,4 +101,4 @@
Resource Files
-
\ No newline at end of file
+
diff --git a/yoga/Yoga.h b/yoga/Yoga.h
index dddab8bb..237fc46b 100644
--- a/yoga/Yoga.h
+++ b/yoga/Yoga.h
@@ -174,11 +174,11 @@ YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeRef node);
void YGNodeSetDirtiedFunc(YGNodeRef node, YGDirtiedFunc dirtiedFunc);
YGPrintFunc YGNodeGetPrintFunc(YGNodeRef node);
void YGNodeSetPrintFunc(YGNodeRef node, YGPrintFunc printFunc);
-bool YGNodeGetHasNewLayout(YGNodeRef node);
-void YGNodeSetHasNewLayout(YGNodeRef node, bool hasNewLayout);
+WIN_EXPORT bool YGNodeGetHasNewLayout(YGNodeRef node);
+WIN_EXPORT void YGNodeSetHasNewLayout(YGNodeRef node, bool hasNewLayout);
YGNodeType YGNodeGetNodeType(YGNodeRef node);
void YGNodeSetNodeType(YGNodeRef node, YGNodeType nodeType);
-bool YGNodeIsDirty(YGNodeRef node);
+WIN_EXPORT bool YGNodeIsDirty(YGNodeRef node);
bool YGNodeLayoutGetDidUseLegacyFlag(const YGNodeRef node);
WIN_EXPORT void YGNodeStyleSetDirection(