Skip to content

Commit 830aad9

Browse files
authored
Use fork-sync for Folly and FastFloat (#15979)
* Add folly and fast-float to fork-sync * Change files * Fix the folly.natvis references
1 parent a0442a8 commit 830aad9

889 files changed

Lines changed: 238789 additions & 1678 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Add folly and fast-float to fork-sync",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "vmorozov@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Add folly and fast-float to fork-sync",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "vmorozov@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Add folly and fast-float to fork-sync",
4+
"packageName": "react-native-windows",
5+
"email": "vmorozov@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutomationChannel", "Automa
88
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
99
EndProjectSection
1010
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
12-
EndProject
1311
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\..\vnext\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
1412
ProjectSection(ProjectDependencies) = postProject
15-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
1613
EndProjectSection
1714
EndProject
1815
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
@@ -66,18 +63,6 @@ Global
6663
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.Release|x86.ActiveCfg = Release|Win32
6764
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.Release|x86.Build.0 = Release|Win32
6865
{C0A69310-6119-46DC-A6D6-0BAB7826DC92}.Release|x86.Deploy.0 = Release|Win32
69-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
70-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
71-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
72-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64
73-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32
74-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32
75-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64
76-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64
77-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64
78-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64
79-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32
80-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32
8166
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
8267
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64
8368
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,7 +104,6 @@ Global
119104
HideSolutionNode = FALSE
120105
EndGlobalSection
121106
GlobalSection(NestedProjects) = preSolution
122-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
123107
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
124108
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
125109
{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}

packages/@react-native-windows/automation-channel/windows/AutomationChannel/packages.lock.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,10 @@
161161
"boost": "[1.84.0, )"
162162
}
163163
},
164-
"folly": {
165-
"type": "Project",
166-
"dependencies": {
167-
"boost": "[1.84.0, )"
168-
}
169-
},
170164
"microsoft.reactnative": {
171165
"type": "Project",
172166
"dependencies": {
173167
"Common": "[1.0.0, )",
174-
"Folly": "[1.0.0, )",
175168
"Microsoft.JavaScript.Hermes": "[0.0.0-2512.22001-bc3d0ed7, )",
176169
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
177170
"Microsoft.WindowsAppSDK": "[1.8.260209005, )",
@@ -182,7 +175,6 @@
182175
"reactcommon": {
183176
"type": "Project",
184177
"dependencies": {
185-
"Folly": "[1.0.0, )",
186178
"boost": "[1.84.0, )"
187179
}
188180
}

packages/@react-native-windows/cli/src/e2etest/projects/WithIndirectDependency/windows/WithIndirectDependency.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WithIndirectDependency", "W
88
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
99
EndProjectSection
1010
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\node_modules\react-native-windows\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
1211
EndProject
1312
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modules\react-native-windows\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
1413
ProjectSection(ProjectDependencies) = postProject
15-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
1614
EndProjectSection
1715
EndProject
1816
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}"
@@ -70,18 +68,6 @@ Global
7068
{416476D5-974A-4EE2-8145-4E331297247E}.Release|x86.ActiveCfg = Release|Win32
7169
{416476D5-974A-4EE2-8145-4E331297247E}.Release|x86.Build.0 = Release|Win32
7270
{416476D5-974A-4EE2-8145-4E331297247E}.Release|x86.Deploy.0 = Release|Win32
73-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
74-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
75-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
76-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64
77-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32
78-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32
79-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64
80-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64
81-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64
82-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64
83-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32
84-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32
8571
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
8672
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64
8773
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64
@@ -123,7 +109,6 @@ Global
123109
HideSolutionNode = FALSE
124110
EndGlobalSection
125111
GlobalSection(NestedProjects) = preSolution
126-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
127112
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
128113
{C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
129114
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}

packages/e2e-test-app-fabric/windows/RNTesterApp-Fabric.Package/packages.lock.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,10 @@
161161
"boost": "[1.84.0, )"
162162
}
163163
},
164-
"folly": {
165-
"type": "Project",
166-
"dependencies": {
167-
"boost": "[1.84.0, )"
168-
}
169-
},
170164
"microsoft.reactnative": {
171165
"type": "Project",
172166
"dependencies": {
173167
"Common": "[1.0.0, )",
174-
"Folly": "[1.0.0, )",
175168
"Microsoft.JavaScript.Hermes": "[0.0.0-2512.22001-bc3d0ed7, )",
176169
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
177170
"Microsoft.WindowsAppSDK": "[1.8.260209005, )",
@@ -182,7 +175,6 @@
182175
"reactcommon": {
183176
"type": "Project",
184177
"dependencies": {
185-
"Folly": "[1.0.0, )",
186178
"boost": "[1.84.0, )"
187179
}
188180
},

packages/e2e-test-app-fabric/windows/RNTesterApp-Fabric.sln

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNTesterApp-Fabric", "RNTes
1010
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136}
1111
EndProjectSection
1212
EndProject
13-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}"
14-
EndProject
1513
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vnext\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}"
1614
ProjectSection(ProjectDependencies) = postProject
17-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D}
1815
EndProjectSection
1916
EndProject
2017
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}"
@@ -90,18 +87,6 @@ Global
9087
{3719BE61-52D1-4F42-8A4C-E575BA16E65F}.Release|ARM64.ActiveCfg = Release|ARM64
9188
{3719BE61-52D1-4F42-8A4C-E575BA16E65F}.Release|ARM64.Build.0 = Release|ARM64
9289
{3719BE61-52D1-4F42-8A4C-E575BA16E65F}.Release|ARM64.Deploy.0 = Release|ARM64
93-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64
94-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64
95-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
96-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64
97-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32
98-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32
99-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64
100-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64
101-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64
102-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64
103-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32
104-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32
10590
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
10691
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64
10792
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64
@@ -171,7 +156,6 @@ Global
171156
HideSolutionNode = FALSE
172157
EndGlobalSection
173158
GlobalSection(NestedProjects) = preSolution
174-
{A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
175159
{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
176160
{F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
177161
{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}

packages/e2e-test-app-fabric/windows/RNTesterApp-Fabric/packages.lock.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,10 @@
171171
"boost": "[1.84.0, )"
172172
}
173173
},
174-
"folly": {
175-
"type": "Project",
176-
"dependencies": {
177-
"boost": "[1.84.0, )"
178-
}
179-
},
180174
"microsoft.reactnative": {
181175
"type": "Project",
182176
"dependencies": {
183177
"Common": "[1.0.0, )",
184-
"Folly": "[1.0.0, )",
185178
"Microsoft.JavaScript.Hermes": "[0.0.0-2512.22001-bc3d0ed7, )",
186179
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
187180
"Microsoft.WindowsAppSDK": "[1.8.260209005, )",
@@ -192,7 +185,6 @@
192185
"reactcommon": {
193186
"type": "Project",
194187
"dependencies": {
195-
"Folly": "[1.0.0, )",
196188
"boost": "[1.84.0, )"
197189
}
198190
},

packages/playground/windows/playground-composition.Package/packages.experimentalwinui3.lock.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,10 @@
152152
"boost": "[1.84.0, )"
153153
}
154154
},
155-
"folly": {
156-
"type": "Project",
157-
"dependencies": {
158-
"boost": "[1.84.0, )"
159-
}
160-
},
161155
"microsoft.reactnative": {
162156
"type": "Project",
163157
"dependencies": {
164158
"Common": "[1.0.0, )",
165-
"Folly": "[1.0.0, )",
166159
"Microsoft.JavaScript.Hermes": "[0.0.0-2512.22001-bc3d0ed7, )",
167160
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
168161
"Microsoft.WindowsAppSDK": "[2.0.0-experimental3, )",
@@ -184,7 +177,6 @@
184177
"reactcommon": {
185178
"type": "Project",
186179
"dependencies": {
187-
"Folly": "[1.0.0, )",
188180
"boost": "[1.84.0, )"
189181
}
190182
},

0 commit comments

Comments
 (0)