From 447bd024524ba15ea69002759dd6a33c6fc4614a Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Fri, 17 Apr 2020 10:57:41 -0700
Subject: [PATCH 1/4] Fix issue with yoga layout in x64 release

---
 vnext/ReactCommon/ReactCommon.vcxproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj
index 846b89deded..b55c6cb6494 100644
--- a/vnext/ReactCommon/ReactCommon.vcxproj
+++ b/vnext/ReactCommon/ReactCommon.vcxproj
@@ -155,7 +155,8 @@
     <ClCompile Include="$(YogaDir)\yoga\YGNodePrint.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\YGStyle.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\YGValue.cpp" />
-    <ClCompile Include="$(YogaDir)\yoga\Yoga.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
+    <ClCompile Condition="'$(Platform)' == 'x64'" Include="$(YogaDir)\yoga\Yoga.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" FloatingPointModel="Strict" />
+    <ClCompile Condition="'$(Platform)' != 'x64'" Include="$(YogaDir)\yoga\Yoga.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\event\event.cpp" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\callinvoker\ReactCommon\BridgeJSCallInvoker.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\callinvoker\ReactCommon\CallInvoker.h" />

From 31c767ea094d8c4bab16a07a1ca94a1ed2a5d30e Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Fri, 17 Apr 2020 10:57:52 -0700
Subject: [PATCH 2/4] Change files

---
 ...native-windows-2020-04-17-10-57-52-x64releaseyoga.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 change/react-native-windows-2020-04-17-10-57-52-x64releaseyoga.json

diff --git a/change/react-native-windows-2020-04-17-10-57-52-x64releaseyoga.json b/change/react-native-windows-2020-04-17-10-57-52-x64releaseyoga.json
new file mode 100644
index 00000000000..06de46f36b9
--- /dev/null
+++ b/change/react-native-windows-2020-04-17-10-57-52-x64releaseyoga.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Fix issue with yoga layout in x64 release",
+  "packageName": "react-native-windows",
+  "email": "acoates@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-04-17T17:57:52.347Z"
+}
\ No newline at end of file

From 67585ce52fd2c1b60d5d608b5dda0fc39fdc6ab8 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Fri, 17 Apr 2020 11:50:12 -0700
Subject: [PATCH 3/4] Update E2E masters

---
 .../masters/ControlStyleRegularBorder.json    | 54 +++++++++----------
 .../masters/ControlStyleRoundBorder.json      | 52 +++++++++---------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
index e566a06df93..818fa573d29 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
@@ -152,11 +152,11 @@
         "CornerRadius": "0,0,0,0",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FFFFFFFF",
-        "Height": 41,
+        "Height": 50,
         "HorizontalAlignment": "Stretch",
         "Margin": "0,0,0,0",
         "Padding": "10,10,10,10",
-        "RenderSize": [800, 41],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Stretch",
         "Visibility": "Visible",
         "Width": 800,
@@ -172,7 +172,7 @@
             "HorizontalAlignment": "Stretch",
             "Margin": "0,0,0,0",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 41],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -188,7 +188,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "BorderElement",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 41],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -205,7 +205,7 @@
                 "Margin": "1,1,1,1",
                 "Name": "ContentElement",
                 "Padding": "10,10,10,10",
-                "RenderSize": [798, 39],
+                "RenderSize": [798, 48],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible",
                 "children": [
@@ -221,7 +221,7 @@
                     "Margin": "0,0,0,0",
                     "Name": "Root",
                     "Padding": "0,0,0,0",
-                    "RenderSize": [798, 39],
+                    "RenderSize": [798, 48],
                     "VerticalAlignment": "Stretch",
                     "Visibility": "Visible",
                     "children": [
@@ -236,7 +236,7 @@
                         "HorizontalAlignment": "Stretch",
                         "Margin": "0,0,0,0",
                         "Padding": "0,0,0,0",
-                        "RenderSize": [798, 39],
+                        "RenderSize": [798, 48],
                         "VerticalAlignment": "Stretch",
                         "Visibility": "Visible",
                         "children": [
@@ -253,7 +253,7 @@
                             "Margin": "10,10,10,10",
                             "Name": "ScrollContentPresenter",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [778, 19],
+                            "RenderSize": [778, 28],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible",
                             "children": [
@@ -263,7 +263,7 @@
                                 "FlowDirection": "LeftToRight",
                                 "HorizontalAlignment": "Stretch",
                                 "Margin": "0,0,0,0",
-                                "RenderSize": [778, 19],
+                                "RenderSize": [778, 28],
                                 "VerticalAlignment": "Stretch",
                                 "Visibility": "Visible"
                             }
@@ -280,7 +280,7 @@
                             "HorizontalAlignment": "Stretch",
                             "Margin": "0,0,0,0",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [798, 39],
+                            "RenderSize": [798, 48],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible"
                         },
@@ -349,7 +349,7 @@
                 "Margin": "1,1,1,1",
                 "Name": "PlaceholderTextContentPresenter",
                 "Padding": "10,10,10,10",
-                "RenderSize": [798, 39],
+                "RenderSize": [798, 48],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -400,11 +400,11 @@
         "CornerRadius": "0,0,0,0",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FFFFFFFF",
-        "Height": 41,
+        "Height": 50,
         "HorizontalAlignment": "Stretch",
         "Margin": "0,0,0,0",
         "Padding": "10,10,10,10",
-        "RenderSize": [800, 41],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Stretch",
         "Visibility": "Visible",
         "Width": 800,
@@ -420,7 +420,7 @@
             "HorizontalAlignment": "Stretch",
             "Margin": "0,0,0,0",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 41],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -436,7 +436,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "BorderElement",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 41],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -453,7 +453,7 @@
                 "Margin": "1,1,1,1",
                 "Name": "ContentElement",
                 "Padding": "10,10,10,10",
-                "RenderSize": [798, 39],
+                "RenderSize": [798, 48],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible",
                 "children": [
@@ -469,7 +469,7 @@
                     "Margin": "0,0,0,0",
                     "Name": "Root",
                     "Padding": "0,0,0,0",
-                    "RenderSize": [798, 39],
+                    "RenderSize": [798, 48],
                     "VerticalAlignment": "Stretch",
                     "Visibility": "Visible",
                     "children": [
@@ -484,7 +484,7 @@
                         "HorizontalAlignment": "Stretch",
                         "Margin": "0,0,0,0",
                         "Padding": "0,0,0,0",
-                        "RenderSize": [798, 39],
+                        "RenderSize": [798, 48],
                         "VerticalAlignment": "Stretch",
                         "Visibility": "Visible",
                         "children": [
@@ -501,7 +501,7 @@
                             "Margin": "10,10,10,10",
                             "Name": "ScrollContentPresenter",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [778, 19],
+                            "RenderSize": [778, 28],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible",
                             "children": [
@@ -511,7 +511,7 @@
                                 "FlowDirection": "LeftToRight",
                                 "HorizontalAlignment": "Stretch",
                                 "Margin": "0,0,0,0",
-                                "RenderSize": [778, 19],
+                                "RenderSize": [778, 28],
                                 "VerticalAlignment": "Stretch",
                                 "Visibility": "Visible"
                             }
@@ -528,7 +528,7 @@
                             "HorizontalAlignment": "Stretch",
                             "Margin": "0,0,0,0",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [798, 39],
+                            "RenderSize": [798, 48],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible"
                         },
@@ -597,7 +597,7 @@
                 "Margin": "1,1,1,1",
                 "Name": "PlaceholderTextContentPresenter",
                 "Padding": "10,10,10,10",
-                "RenderSize": [798, 39],
+                "RenderSize": [798, 48],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -775,11 +775,11 @@
         "CornerRadius": "0,0,0,0",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FFFFFFFF",
-        "Height": 32,
+        "Height": 50,
         "HorizontalAlignment": "Left",
         "Margin": "0,0,0,0",
         "Padding": "12,5,0,7",
-        "RenderSize": [800, 32],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Top",
         "Visibility": "Visible",
         "Width": 800,
@@ -796,7 +796,7 @@
             "Margin": "0,0,0,0",
             "Name": "LayoutRoot",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 32],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -812,7 +812,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "Background",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 32],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -828,7 +828,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "HighlightBackground",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 32],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json
index cf9079004f0..3e26498c954 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json
@@ -30,7 +30,7 @@
         "RenderSize": [120, 50],
         "VerticalAlignment": "Center",
         "Visibility": "Visible",
-        "Width": 32,
+        "Width": 40,
         "children": [
         {
             "XamlType": "Windows.UI.Xaml.Controls.Grid",
@@ -152,11 +152,11 @@
         "CornerRadius": "10,10,10,10",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FF000000",
-        "Height": 59,
+        "Height": 50,
         "HorizontalAlignment": "Stretch",
         "Margin": "0,0,0,0",
         "Padding": "10,10,10,10",
-        "RenderSize": [800, 59],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Stretch",
         "Visibility": "Visible",
         "Width": 800,
@@ -172,7 +172,7 @@
             "HorizontalAlignment": "Stretch",
             "Margin": "0,0,0,0",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 59],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -188,7 +188,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "BorderElement",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 59],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -205,7 +205,7 @@
                 "Margin": "10,10,10,10",
                 "Name": "ContentElement",
                 "Padding": "10,10,10,10",
-                "RenderSize": [780, 39],
+                "RenderSize": [780, 30],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible",
                 "children": [
@@ -221,7 +221,7 @@
                     "Margin": "0,0,0,0",
                     "Name": "Root",
                     "Padding": "0,0,0,0",
-                    "RenderSize": [780, 39],
+                    "RenderSize": [780, 30],
                     "VerticalAlignment": "Stretch",
                     "Visibility": "Visible",
                     "children": [
@@ -236,7 +236,7 @@
                         "HorizontalAlignment": "Stretch",
                         "Margin": "0,0,0,0",
                         "Padding": "0,0,0,0",
-                        "RenderSize": [780, 39],
+                        "RenderSize": [780, 30],
                         "VerticalAlignment": "Stretch",
                         "Visibility": "Visible",
                         "children": [
@@ -253,7 +253,7 @@
                             "Margin": "10,10,10,10",
                             "Name": "ScrollContentPresenter",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [760, 19],
+                            "RenderSize": [760, 10],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible",
                             "children": [
@@ -263,7 +263,7 @@
                                 "FlowDirection": "LeftToRight",
                                 "HorizontalAlignment": "Stretch",
                                 "Margin": "0,0,0,0",
-                                "RenderSize": [760, 19],
+                                "RenderSize": [760, 10],
                                 "VerticalAlignment": "Stretch",
                                 "Visibility": "Visible"
                             }
@@ -280,7 +280,7 @@
                             "HorizontalAlignment": "Stretch",
                             "Margin": "0,0,0,0",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [780, 39],
+                            "RenderSize": [780, 30],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible"
                         },
@@ -400,11 +400,11 @@
         "CornerRadius": "10,10,10,10",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FF000000",
-        "Height": 59,
+        "Height": 50,
         "HorizontalAlignment": "Stretch",
         "Margin": "0,0,0,0",
         "Padding": "10,10,10,10",
-        "RenderSize": [800, 59],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Stretch",
         "Visibility": "Visible",
         "Width": 800,
@@ -420,7 +420,7 @@
             "HorizontalAlignment": "Stretch",
             "Margin": "0,0,0,0",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 59],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -436,7 +436,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "BorderElement",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 59],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -453,7 +453,7 @@
                 "Margin": "10,10,10,10",
                 "Name": "ContentElement",
                 "Padding": "10,10,10,10",
-                "RenderSize": [780, 39],
+                "RenderSize": [780, 30],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible",
                 "children": [
@@ -469,7 +469,7 @@
                     "Margin": "0,0,0,0",
                     "Name": "Root",
                     "Padding": "0,0,0,0",
-                    "RenderSize": [780, 39],
+                    "RenderSize": [780, 30],
                     "VerticalAlignment": "Stretch",
                     "Visibility": "Visible",
                     "children": [
@@ -484,7 +484,7 @@
                         "HorizontalAlignment": "Stretch",
                         "Margin": "0,0,0,0",
                         "Padding": "0,0,0,0",
-                        "RenderSize": [780, 39],
+                        "RenderSize": [780, 30],
                         "VerticalAlignment": "Stretch",
                         "Visibility": "Visible",
                         "children": [
@@ -501,7 +501,7 @@
                             "Margin": "10,10,10,10",
                             "Name": "ScrollContentPresenter",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [760, 19],
+                            "RenderSize": [760, 10],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible",
                             "children": [
@@ -511,7 +511,7 @@
                                 "FlowDirection": "LeftToRight",
                                 "HorizontalAlignment": "Stretch",
                                 "Margin": "0,0,0,0",
-                                "RenderSize": [760, 19],
+                                "RenderSize": [760, 10],
                                 "VerticalAlignment": "Stretch",
                                 "Visibility": "Visible"
                             }
@@ -528,7 +528,7 @@
                             "HorizontalAlignment": "Stretch",
                             "Margin": "0,0,0,0",
                             "Padding": "0,0,0,0",
-                            "RenderSize": [780, 39],
+                            "RenderSize": [780, 30],
                             "VerticalAlignment": "Stretch",
                             "Visibility": "Visible"
                         },
@@ -775,11 +775,11 @@
         "CornerRadius": "10,10,10,10",
         "FlowDirection": "LeftToRight",
         "Foreground": "#FF000000",
-        "Height": 32,
+        "Height": 50,
         "HorizontalAlignment": "Left",
         "Margin": "0,0,0,0",
         "Padding": "12,5,0,7",
-        "RenderSize": [800, 32],
+        "RenderSize": [800, 50],
         "VerticalAlignment": "Top",
         "Visibility": "Visible",
         "Width": 800,
@@ -796,7 +796,7 @@
             "Margin": "0,0,0,0",
             "Name": "LayoutRoot",
             "Padding": "0,0,0,0",
-            "RenderSize": [800, 32],
+            "RenderSize": [800, 50],
             "VerticalAlignment": "Stretch",
             "Visibility": "Visible",
             "children": [
@@ -812,7 +812,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "Background",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 32],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },
@@ -828,7 +828,7 @@
                 "Margin": "0,0,0,0",
                 "Name": "HighlightBackground",
                 "Padding": "0,0,0,0",
-                "RenderSize": [800, 32],
+                "RenderSize": [800, 50],
                 "VerticalAlignment": "Stretch",
                 "Visibility": "Visible"
             },

From 8089800f7de65b84b65d2db54b3f8f7cae683664 Mon Sep 17 00:00:00 2001
From: "Andrew Coates (REDMOND)" <acoates@microsoft.com>
Date: Fri, 17 Apr 2020 11:50:23 -0700
Subject: [PATCH 4/4] code review feedback

---
 vnext/ReactCommon/ReactCommon.vcxproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj
index b55c6cb6494..a4e72c30509 100644
--- a/vnext/ReactCommon/ReactCommon.vcxproj
+++ b/vnext/ReactCommon/ReactCommon.vcxproj
@@ -155,6 +155,7 @@
     <ClCompile Include="$(YogaDir)\yoga\YGNodePrint.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\YGStyle.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\YGValue.cpp" />
+    <!-- Using Strict FloatingPointModel on x64 to workaround a compiler issue, See https://github.com/microsoft/react-native-windows/issues/4122 -->
     <ClCompile Condition="'$(Platform)' == 'x64'" Include="$(YogaDir)\yoga\Yoga.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" FloatingPointModel="Strict" />
     <ClCompile Condition="'$(Platform)' != 'x64'" Include="$(YogaDir)\yoga\Yoga.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(YogaDir)\yoga\event\event.cpp" />