Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Bump fastfloat to 8.0.0",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,11 @@ exports[`Pressable Tests Pressables can change style when pressed 1`] = `
},
"Comment": "style-change-pressable",
"Offset": "0, 0, 0",
"Size": "76, 33",
"Size": "916, 33",
"Visual Type": "SpriteVisual",
"__Children": [
{
"Offset": "6, 6, 0",
"Offset": "426, 6, 0",
"Size": "64, 22",
"Visual Type": "SpriteVisual",
"__Children": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,12 @@ exports[`View Tests Views can have backface visibility 1`] = `
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {},
},
{
"Type": "Microsoft.ReactNative.Composition.ParagraphComponentView",
"_Props": {},
"__Children": [
{
"Type": "Microsoft.ReactNative.Composition.ParagraphComponentView",
"_Props": {},
},
],
},
{
"Type": "Microsoft.ReactNative.Composition.ParagraphComponentView",
Expand Down Expand Up @@ -538,18 +540,20 @@ exports[`View Tests Views can have backface visibility 1`] = `
"Offset": "0, 0, 0",
"Size": "150, 150",
"Visual Type": "SpriteVisual",
},
],
},
{
"Offset": "393, 85, 0",
"Size": "130, 38",
"Visual Type": "SpriteVisual",
"__Children": [
{
"Offset": "0, 0, 0",
"Size": "130, 38",
"Visual Type": "SpriteVisual",
"__Children": [
{
"Offset": "10, 56, 0",
"Size": "130, 38",
"Visual Type": "SpriteVisual",
"__Children": [
{
"Offset": "0, 0, 0",
"Size": "130, 38",
"Visual Type": "SpriteVisual",
},
],
},
],
},
],
},
Expand Down
7 changes: 5 additions & 2 deletions vnext/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<IncludeSource Condition="'$(Configuration)' == 'Release'">false</IncludeSource>
<!-- When bumping the Folly version, be sure to bump the git hash of that version's commit, find the matching fastfloat dependency and build Folly.vcxproj (to update its cgmanifest.json) too. -->
<FollyVersion>2024.10.14.00</FollyVersion>
<FastFloatVersion>6.1.4</FastFloatVersion>
<FastFloatVersion>8.0.0</FastFloatVersion>
<FollyCommitHash>ad90720829db5ba0c3d0e44994856dcce33d7940</FollyCommitHash>
<FastFloatCommitHash>ad90720829db5ba0c3d0e44994856dcce33d7940</FastFloatCommitHash>
<FastFloatCommitHash>77cc847c842c49e7e3477c1e95da2b6540166d66</FastFloatCommitHash>
<!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
<FmtVersion>10.1.0</FmtVersion>
<FmtCommitHash>ca2e3685b160617d3d95fcd9e789c4e06ca88</FmtCommitHash>
Expand All @@ -52,6 +52,9 @@
<FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
<FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>

<FastFloatDir Condition="'$(FastFloatDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fastfloat\fast_float-$(FastFloatVersion)</FastFloatDir>
<FastFloatDir>$([MSBuild]::NormalizeDirectory($(FastFloatDir)))</FastFloatDir>

<FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
<FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>

Expand Down
13 changes: 6 additions & 7 deletions vnext/Folly/Folly.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
<ClInclude Include="$(FollyDir)\folly\Uri.h" />
<ClInclude Include="$(FollyDir)\folly\Utility.h" />
<ClInclude Include="$(FollyDir)\folly\Varint.h" />
<ClInclude Include="$(FollyDir)\..\fast_float-6.1.4\include\fast_float\fast_float.h" />
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -271,7 +270,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FollyDir)\..\fast_float-6.1.4\include;$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FastFloatDir)\include;$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>FOLLY_CFG_NO_COROUTINES;FOLLY_NO_CONFIG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WINAPI_PARTITION_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedUsingFiles />
<DisableSpecificWarnings>4251;4293;4305;4800;4804;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand All @@ -292,8 +291,8 @@
<CGManifestFile>$(MSBuildThisFileDirectory)cgmanifest.json</CGManifestFile>
</PropertyGroup>
<PropertyGroup>
<FastFloatZipDir>$(FollyDir)..\.fastfloatzip</FastFloatZipDir>
<FastFloatZipFile>$(FollyDir)..\.fastfloatzip\fastfloat.zip</FastFloatZipFile>
<FastFloatZipDir>$(FastFloatDir)..\.fastfloatzip</FastFloatZipDir>
<FastFloatZipFile>$(FastFloatZipDir)\fastfloat.zip</FastFloatZipFile>
</PropertyGroup>
<Target Name="DownloadFolly" BeforeTargets="PrepareForBuild" Inputs="$(FollyZipFile)" Outputs="$(FollyZipFile)">
<Message Importance="High" Text="Downloading folly..." />
Expand All @@ -320,11 +319,11 @@
OverwriteReadOnlyFiles="true" />
</Target>
<Target Name="UnzipFastFloat" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFastFloat">
<Message Condition="!Exists('$(FastFloatZipDir)\include\fast_float.h')" Importance="High" Text="Unzipping FastFloat to $([MSBuild]::NormalizePath($(FastFloatZipDir)..))." />
<Message Condition="!Exists('$(FastFloatDir)\include\fast_float\fast_float.h')" Importance="High" Text="Unzipping FastFloat to $([MSBuild]::NormalizePath($(FastFloatDir)..))." />
<Unzip
Condition="!Exists('$(FastFloatZipDir)\include\fast_float.h')"
Condition="!Exists('$(FastFloatDir)\include\fast_float\fast_float.h')"
SourceFiles="$(FastFloatZipFile)"
DestinationFolder="$([MSBuild]::NormalizePath($(FollyDir)..))"
DestinationFolder="$([MSBuild]::NormalizePath($(FastFloatDir)..))"
OverwriteReadOnlyFiles="true" />
</Target>
<Target Name="WriteCGManifest" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly" Inputs="$(FollyZipFile)" Outputs="$(CGManifestFile)">
Expand Down
2 changes: 1 addition & 1 deletion vnext/Folly/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/fastfloat/fast_float",
"CommitHash": "ad90720829db5ba0c3d0e44994856dcce33d7940"
"CommitHash": "77cc847c842c49e7e3477c1e95da2b6540166d66"
}
},
"DevelopmentDependency": false
Expand Down
1 change: 1 addition & 0 deletions vnext/PropertySheets/React.Cpp.props
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<AdditionalIncludeDirectories>
$(FollyDir);
$(FmtDir)include;
$(FastFloatDir)include;
$(ReactNativeDir)\ReactCommon;
$(ReactNativeDir)\ReactCommon\callinvoker;
$(ReactNativeDir)\ReactCommon\jsi;
Expand Down

This file was deleted.

Loading
Loading