react-native-windows 0.85.0 → 0.85.2

package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp

@@ -1796,7 +1796,7 @@ struct CompActivityVisual : winrt::implements<
     auto innerBrush = TTypeRedirects::CompositionContextHelper::InnerBrush(brush);
     if (brush) {
       _themeProperties.InsertVector4(
-          L"Foreground", ColorAsVector4(innerBrush.as<TTypeRedirects::CompositionColorBrush>().Color()));
+          L"Foreground", ColorAsVector4(innerBrush.template as<TTypeRedirects::CompositionColorBrush>().Color()));
     } else {
       _themeProperties.InsertVector4(L"Foreground", ColorAsVector4({0, 0, 0, 0}));
     }

package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp

@@ -95,10 +95,12 @@ struct ModalHostView : public winrt::implements<ModalHostView, winrt::Windows::F
       const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portalComponentView) noexcept {
     m_reactContext = portalComponentView.ReactContext();
 
-    portalComponentView.Mounted(
-        [](const auto & /*sender*/, const auto &view) { view.UserData().as<ModalHostView>()->OnMounted(view); });
-    portalComponentView.Unmounted(
-        [](const auto & /*sender*/, const auto &view) { view.UserData().as<ModalHostView>()->OnUnmounted(view); });
+    portalComponentView.Mounted([](const auto & /*sender*/, const auto &view) {
+      view.UserData().template as<ModalHostView>()->OnMounted(view);
+    });
+    portalComponentView.Unmounted([](const auto & /*sender*/, const auto &view) {
+      view.UserData().template as<ModalHostView>()->OnUnmounted(view);
+    });
   }
 
   void UpdateProps(

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -83,7 +83,7 @@ static PCreateTextServices g_pfnCreateTextServices;
 HRESULT HrEnsureRichEd20Loaded() noexcept {
   HRESULT hr = S_OK;
   std::call_once(g_richEditLoadedFlag, [&hr]() {
-    g_hInstRichEdit = LoadLibrary(L"Msftedit.dll");
+    g_hInstRichEdit = LoadLibraryExW(L"Msftedit.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
     if (!g_hInstRichEdit) {
       hr = E_FAIL;
       return;

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -97,7 +97,6 @@
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <WarningLevel>Level4</WarningLevel>
       <AdditionalOptions>%(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
-      <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <AdditionalIncludeDirectories>
         $(ExternalDir)fmt\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.85.0</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.85.2</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>85</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>0e2b495c27e04e4dacfcb02765d80cf61daef23b</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>fa2687b8e273be2ed4dfa9f5a92a12ab247c77a6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -17,7 +17,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.71.8</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.79.5</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
     <V8Package>$(NuGetPackageRoot)\$(V8PackageName).$(V8Version)</V8Package>

package/PropertySheets/React.Cpp.props

@@ -137,7 +137,6 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes Condition="'$(ShowIncludes)'=='true'">true</ShowIncludes>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <SpectreMitigation>Spectre</SpectreMitigation>
 

package/PropertySheets/WinUI.props

@@ -4,7 +4,8 @@
 
     <!--
       Internal versions are typically only located at: https://microsoft.visualstudio.com/DefaultCollection/ProjectReunion/_artifacts/feed/Project.Reunion.nuget.internal/NuGet/Microsoft.WindowsAppSDK/versions
-      For local testing of internal versions, modify WinUI3ExperimentalVersion, and comment out the additional nuget source in NuGet.Config
+      For local testing of internal versions, set WinUI3ExperimentalVersion and run
+      vnext\Scripts\EnableInternalWinAppSDKFeed.ps1 to add the internal source and its package mapping.
       When this version is updated, be sure to update the default for the enableInternalFeed parameter of /.ado/templates/enable-experimental-winui3.yml
     -->
     <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">2.0.0-experimental3</WinUI3ExperimentalVersion>

package/Scripts/EnableInternalWinAppSDKFeed.ps1

@@ -9,11 +9,18 @@ Set-Location -Path $RepoRoot
 try
 {
     [xml] $nugetConfig = Get-Content "NuGet.Config"
-    $newFeed = $nugetConfig.configuration.packageSources.add.clone()
-    $newFeed.key = "Project.Reunion.nuget.internal";
-    $newFeed.value = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json";
-    $nugetConfig.configuration.packageSources.AppendChild($newFeed)
-    $nugetConfig.Save("NuGet.Config")
+    $feedKey = "Project.Reunion.nuget.internal"
+    $newFeed = $nugetConfig.CreateElement("add")
+    $newFeed.SetAttribute("key", $feedKey)
+    $newFeed.SetAttribute("value", "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json")
+    [void] $nugetConfig.configuration.packageSources.AppendChild($newFeed)
+    $mapping = $nugetConfig.CreateElement("packageSource")
+    $mapping.SetAttribute("key", $feedKey)
+    $pattern = $nugetConfig.CreateElement("package")
+    $pattern.SetAttribute("pattern", "*")
+    [void] $mapping.AppendChild($pattern)
+    [void] $nugetConfig.configuration.packageSourceMapping.AppendChild($mapping)
+    $nugetConfig.Save("$RepoRoot\NuGet.Config")
 }
 finally
 {

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -19,8 +19,8 @@ function Restore-Solution([string] $solution, [string[]] $extraArgs) {
 
 try {
     # Some node_modules packages ship a NuGet.Config that re-adds the public nuget.org feed. That
-    # breaks the repo's single-ADO-feed compliance and trips corporate network blocks on api.nuget.org.
-    # Strip any nuget.org source so restore only uses the repo's ADO feed.
+    # bypasses the approved source policy and trips corporate network blocks on api.nuget.org.
+    # Strip any nuget.org source so restore uses the approved sources and mappings in the root NuGet.Config.
     Get-ChildItem -File -Recurse -Path $RepoRoot -Filter NuGet.Config -ErrorAction SilentlyContinue |
         Where-Object { $_.FullName -match '\\node_modules\\' } | ForEach-Object {
             $configPath = $_.FullName

package/Shared/Networking/WinRTWebSocketResource.h

@@ -7,6 +7,7 @@
 #include <eventWaitHandle/eventWaitHandle.h>
 #include <winrt/Windows.Networking.Sockets.h>
 #include <winrt/Windows.Storage.Streams.h>
+#include <coroutine>
 #include "IWebSocketResource.h"
 
 namespace Microsoft::React::Networking {
@@ -21,12 +22,7 @@ class WinRTWebSocketResource : public IWebSocketResource, public std::enable_sha
     void operator=(const TaskSequencer &) = delete;
 
    private:
-// `experimental` is deprecated starting Visual Studio 2026
-#if _MSC_VER >= 1951
     using CoroHandle = std::coroutine_handle<>;
-#else
-    using CoroHandle = std::experimental::coroutine_handle<>;
-#endif
     struct Suspender {
       CoroHandle m_handle;
 

package/Shared/OInstance.cpp

@@ -8,6 +8,7 @@
 #include <folly/Bits.h>
 #include <folly/json.h>
 #include <jsi/jsi.h>
+#include <cstring>
 #include <filesystem>
 #include "Unicode.h"
 
@@ -80,15 +81,13 @@ namespace Microsoft::ReactNative {
 bool isHBCBundle(const std::string &bundle) {
   static uint32_t constexpr HBCBundleMagicNumber = 0xffe7c3c3;
 
-  // Note:: Directly access the pointer to avoid copy/length-check. It matters as this string contains the bundle which
-  // can be potentially huge.
-  // https://herbsutter.com/2008/04/07/cringe-not-vectors-are-guaranteed-to-be-contiguous/#comment-483
-  auto header = reinterpret_cast<const facebook::react::BundleHeader *>(&bundle[0]);
-  if (HBCBundleMagicNumber == header->magic32.value) {
-    return true;
-  } else {
+  // Only the leading magic number is needed; copy just those bytes rather than the whole (potentially huge) bundle.
+  uint32_t magic = 0;
+  if (bundle.size() < sizeof(magic)) {
     return false;
   }
+  std::memcpy(&magic, bundle.data(), sizeof(magic));
+  return magic == HBCBundleMagicNumber;
 }
 
 void LoadRemoteUrlScript(
@@ -139,7 +138,12 @@ void LoadRemoteUrlScript(
   // This code is based on the HBC Bundle integration on Android
   // Ref:
   // https://github.com/facebook/react-native/blob/24d91268b64c7abbd4b26547ffcc663dc90ec5e7/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp#L231
-  if (isHBCBundle(jsBundleString)) {
+  // Bytecode bundles are only requested from the dev server when ENABLE_DEVSERVER_HBCBUNDLES is defined.
+  bool isBytecodeBundle = false;
+#if defined(ENABLE_DEVSERVER_HBCBUNDLES)
+  isBytecodeBundle = isHBCBundle(jsBundleString);
+#endif
+  if (isBytecodeBundle) {
     auto script = std::make_unique<facebook::react::JSBigStdString>(jsBundleString, false);
     const char *buffer = script->c_str();
     uint32_t bufferLength = (uint32_t)script->size();

package/external/folly/folly.vcxitems

@@ -153,6 +153,16 @@
       <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)Folly;$(ReactNativeWindowsDir)stubs;$(ExternalDir)folly;$(ExternalDir)fast-float\include;$(ExternalDir)fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
+  <!-- Work around MSVC v145 ARM64 optimizer C1001 in AtForkListSingleton::init.
+       Disable PCH use so its Release optimization settings cannot override /Od.
+       Keep the forced pch.h include as an ordinary header. Remove when the compiler is fixed. -->
+  <ItemGroup>
+    <ClCompile Update="$(ExternalDir)folly\folly\system\AtFork.cpp" Condition="'$(Platform)' == 'ARM64' And '$(PlatformToolsetVersion)' != '' And $(PlatformToolsetVersion)&gt;=145">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>Disabled</Optimization>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+    </ClCompile>
+  </ItemGroup>
   <!-- SysMman.cpp is Desktop-only and must not use folly's UWP pch; re-assert no-PCH after
        the blanket Update above, which would otherwise force pch.h onto it. -->
   <ItemGroup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.85.0",
+  "version": "0.85.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "20.0.0",
     "@react-native-community/cli-platform-android": "20.0.0",
     "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native-windows/cli": "0.85.0",
+    "@react-native-windows/cli": "0.85.1",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.85.3",
     "@react-native/codegen": "0.85.3",
@@ -73,8 +73,8 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
-    "@react-native-windows/codegen": "0.85.0",
-    "@react-native-windows/find-dotnet-tools": "0.85.0",
+    "@react-native-windows/codegen": "0.85.1",
+    "@react-native-windows/find-dotnet-tools": "0.85.1",
     "@react-native/metro-config": "0.85.3",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.38",
@@ -91,7 +91,7 @@
     "prettier": "^3.6.2",
     "react": "19.2.3",
     "react-native": "0.85.3",
-    "react-native-platform-override": "0.85.0",
+    "react-native-platform-override": "0.85.2",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
   },