Skip to content

Commit

Permalink
[0.75] Upgrade to boost 1.83 (#13527)
Browse files Browse the repository at this point in the history
* Upgrade to boost 1.83 (#13511)

* Upgrade to boost 1.83

* Change files

* Remove change file

* Change files
  • Loading branch information
JunielKatarn authored Aug 2, 2024
1 parent 79179c5 commit 2a86151
Show file tree
Hide file tree
Showing 31 changed files with 119 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Upgrade to boost 1.83 (#13511)",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion vnext/Common/Common.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
</ItemGroup>
<ImportGroup Label="ExtensionTargets">
Expand Down
6 changes: 3 additions & 3 deletions vnext/Common/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"boost": {
"type": "Direct",
"requested": "[1.76.0, )",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"requested": "[1.83.0, )",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand Down
24 changes: 12 additions & 12 deletions vnext/Desktop.ABITests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"boost": {
"type": "Transitive",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
Expand All @@ -26,8 +26,8 @@
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.21",
"contentHash": "5njCh+3eXTLOv7+8nOnp6nJ5C0r6it5ze54c0nuWleeDptuK8t3dEDB79XTU4D5DKNvAPlqJpgXRDOak5nYIug=="
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
Expand Down Expand Up @@ -64,7 +64,7 @@
"common": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"fmt": {
Expand All @@ -73,8 +73,8 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
"Fmt": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
"follywin32": {
Expand All @@ -89,29 +89,29 @@
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.21, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"react.windows.desktop.dll": {
"type": "Project",
"dependencies": {
"Microsoft.JavaScript.Hermes": "[0.1.21, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"React.Windows.Desktop": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
</ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions vnext/Desktop.DLL/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"boost": {
"type": "Direct",
"requested": "[1.76.0, )",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"requested": "[1.83.0, )",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.JavaScript.Hermes": {
"type": "Direct",
Expand Down Expand Up @@ -56,7 +56,7 @@
"common": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"fmt": {
Expand All @@ -65,8 +65,8 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
"Fmt": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
"follywin32": {
Expand All @@ -86,14 +86,14 @@
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<ClInclude Include="Modules\TestImageLoaderModule.h" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
<!-- TODO: Remove!!! -->
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ TEST_CLASS (WebSocketIntegrationTest)
string cookie;
auto server = make_shared<Test::WebSocketServer>(s_port);
server->SetOnHandshake([server](boost::beast::websocket::response_type &response) {
auto cookie = response[boost::beast::http::field::cookie].to_string();
auto cookie = string{response[boost::beast::http::field::cookie]};
server->SetMessageFactory([cookie](string &&) { return cookie; });
});
auto ws = IWebSocketResource::Make();
Expand Down
30 changes: 15 additions & 15 deletions vnext/Desktop.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"boost": {
"type": "Direct",
"requested": "[1.76.0, )",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"requested": "[1.83.0, )",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand All @@ -27,8 +27,8 @@
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.21",
"contentHash": "5njCh+3eXTLOv7+8nOnp6nJ5C0r6it5ze54c0nuWleeDptuK8t3dEDB79XTU4D5DKNvAPlqJpgXRDOak5nYIug=="
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
Expand Down Expand Up @@ -65,7 +65,7 @@
"common": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"fmt": {
Expand All @@ -74,8 +74,8 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
"Fmt": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
"follywin32": {
Expand All @@ -90,44 +90,44 @@
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.21, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"react.windows.desktop.dll": {
"type": "Project",
"dependencies": {
"Microsoft.JavaScript.Hermes": "[0.1.21, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"React.Windows.Desktop": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"react.windows.integrationtests": {
"type": "Project",
"dependencies": {
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"react.windows.test": {
"type": "Project",
"dependencies": {
"ReactWindows.OpenSSL.StdCall.Static": "[1.0.2-p.5, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<ClCompile Include="pch.cpp" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
8 changes: 4 additions & 4 deletions vnext/Desktop.Test.DLL/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"boost": {
"type": "Direct",
"requested": "[1.76.0, )",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"requested": "[1.83.0, )",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"ReactWindows.OpenSSL.StdCall.Static": {
"type": "Direct",
Expand All @@ -18,7 +18,7 @@
"type": "Project",
"dependencies": {
"ReactWindows.OpenSSL.StdCall.Static": "[1.0.2-p.5, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
</ItemGroup>
Expand Down
22 changes: 11 additions & 11 deletions vnext/Desktop.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"boost": {
"type": "Direct",
"requested": "[1.76.0, )",
"resolved": "1.76.0",
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
"requested": "[1.83.0, )",
"resolved": "1.83.0",
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand All @@ -27,8 +27,8 @@
},
"Microsoft.JavaScript.Hermes": {
"type": "Transitive",
"resolved": "0.1.21",
"contentHash": "5njCh+3eXTLOv7+8nOnp6nJ5C0r6it5ze54c0nuWleeDptuK8t3dEDB79XTU4D5DKNvAPlqJpgXRDOak5nYIug=="
"resolved": "0.1.23",
"contentHash": "cA9t1GjY4Yo0JD1AfA//e1lOwk48hLANfuX6GXrikmEBNZVr2TIX5ONJt5tqCnpZyLz6xGiPDgTfFNKbSfb21g=="
},
"Microsoft.SourceLink.Common": {
"type": "Transitive",
Expand Down Expand Up @@ -65,7 +65,7 @@
"common": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"fmt": {
Expand All @@ -74,8 +74,8 @@
"folly": {
"type": "Project",
"dependencies": {
"boost": "[1.76.0, )",
"fmt": "[1.0.0, )"
"Fmt": "[1.0.0, )",
"boost": "[1.83.0, )"
}
},
"follywin32": {
Expand All @@ -90,19 +90,19 @@
"Common": "[1.0.0, )",
"Folly": "[1.0.0, )",
"FollyWin32": "[1.0.0, )",
"Microsoft.JavaScript.Hermes": "[0.1.21, )",
"Microsoft.JavaScript.Hermes": "[0.1.23, )",
"Microsoft.SourceLink.GitHub": "[1.1.1, )",
"Microsoft.WindowsAppSDK": "[1.5.240227000, )",
"ReactCommon": "[1.0.0, )",
"ReactNative.V8Jsi.Windows": "[0.71.8, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
},
"reactcommon": {
"type": "Project",
"dependencies": {
"Folly": "[1.0.0, )",
"boost": "[1.76.0, )"
"boost": "[1.83.0, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion vnext/Desktop/React.Windows.Desktop.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.76.0.0" />
<PackageReference Include="boost" Version="1.83.0.0" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
Expand Down
Loading

0 comments on commit 2a86151

Please sign in to comment.