Bump folly to 2024.10.14.00 #14532
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "merge in folly 2024.10.14.00", | ||
| "packageName": "react-native-windows", | ||
| "email": "tatianakapos@microsoft.com", | ||
| "dependentChangeType": "patch" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,16 +48,16 @@ | |
| <ClCompile Include="$(FollyDir)\folly\Demangle.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="$(FollyDir)\folly\json\dynamic.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="$(FollyDir)\folly\container\detail\F14Table.cpp"> | ||
| <Filter>Source Files\container\detail</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="$(FollyDir)\folly\json\json_pointer.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="$(FollyDir)\folly\json\json.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="$(FollyDir)\folly\Format.cpp"> | ||
|
|
@@ -151,6 +151,9 @@ | |
| <ClInclude Include="$(FollyDir)\folly\ConcurrentSkipList.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\..\fast_float-6.1.4\include\fast_float\fast_float.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\portability\Constexpr.h"> | ||
| <Filter>Header Files\portability</Filter> | ||
| </ClInclude> | ||
|
|
@@ -183,10 +186,19 @@ | |
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\dynamic-inl.h"> | ||
|
There was a problem hiding this comment. These files still exist but they just include the new files to not break dependencies (see: facebook/folly@cb47968#diff-392b91b8b87bb9159b6158d7a291dad8884feabc65719bf737a010a6f7334511). Opted to keep them until these get removed. |
||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\json\dynamic.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\json\dynamic-inl.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\DynamicConverter.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\json\DynamicConverter.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\portability\Event.h"> | ||
| <Filter>Header Files\portability</Filter> | ||
| </ClInclude> | ||
|
|
@@ -268,7 +280,7 @@ | |
| <ClInclude Include="$(FollyDir)\folly\IPAddressV6.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\json\json.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="$(FollyDir)\folly\Lazy.h"> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@acoates-ms Does this look right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they may have deleted these methods. I wouldn't block the update of folly on these anyway. -- If we need to readd some other methods here for Office we'll get a better sense when Office actually takes in the change.