react-native-windows 0.84.0 → 0.85.0-preview.1

package/PropertySheets/Autolink.props

@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <RunAutolinkCheck Condition="'$(RunAutolinkCheck)' == ''">true</RunAutolinkCheck>
-    <AutolinkCommand Condition="'$(AutolinkCommand)' == ''">npx --yes @react-native-community/cli autolink-windows</AutolinkCommand>
+    <AutolinkCommand Condition="'$(AutolinkCommand)' == ''">npx --yes --no-workspaces @react-native-community/cli autolink-windows</AutolinkCommand>
     <AutolinkCommandWorkingDir Condition="'$(AutolinkCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</AutolinkCommandWorkingDir>
     <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == '' And '$(SolutionPath)' != '' And '$(SolutionPath)' != '*Undefined*' And '$(ProjectPath)' != ''">--check --sln "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(SolutionPath)))" --proj "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(ProjectPath)))"</AutolinkCommandArgs>
     <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == ''">--check</AutolinkCommandArgs>

package/PropertySheets/Bundle.props

@@ -39,7 +39,7 @@
     <BundlerExtraArgs Condition="'$(BundlerExtraArgs)' == ''">--minify false</BundlerExtraArgs>
 
     <!-- Command to use to create a bundle -->
-    <BundleCliCommand Condition="'$(BundleCliCommand)' == ''">npx @react-native-community/cli bundle</BundleCliCommand>
+    <BundleCliCommand Condition="'$(BundleCliCommand)' == ''">npx --yes --no-workspaces @react-native-community/cli bundle</BundleCliCommand>
 
     <!-- This should be the app package root, this is where the bundle command will be run from -->
     <BundleCommandWorkingDir Condition="'$(BundleCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</BundleCommandWorkingDir>

package/PropertySheets/Codegen.props

@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <RunCodegenWindows Condition="'$(RunCodegenWindows)' == ''">true</RunCodegenWindows>
-    <CodegenCommand Condition="'$(CodegenCommand)' == ''">npx --yes @react-native-community/cli codegen-windows</CodegenCommand>
+    <CodegenCommand Condition="'$(CodegenCommand)' == ''">npx --yes --no-workspaces @react-native-community/cli codegen-windows</CodegenCommand>
     <CodegenCommandWorkingDir Condition="'$(CodegenCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</CodegenCommandWorkingDir>
     <CodegenCommandArgs Condition="'$(CodegenCommandArgs)' == ''">--logging</CodegenCommandArgs>
   </PropertyGroup>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.84.0</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.85.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
+    <ReactNativeWindowsMinor>85</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>691d92a59015db74e72c316204564f7a9d8d7680</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>e4ec8fe57ee86faa8c79d87f7083ce2457cc9fb3</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/NuGet.LockFile.props

@@ -9,6 +9,14 @@
 
   <PropertyGroup>
     <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">true</RestoreLockedMode>
+    <!--
+      VS's NuGet restore cannot evaluate vcxproj PackageReferences through the project reference
+      chain (the VC project system does not report them via the CPS nomination API). This causes
+      NU1004 lock file mismatches for csproj files that reference vcxproj. Disable locked mode
+      in VS so the initial restore succeeds and package targets load correctly.
+      CI is unaffected: it passes /p:RestoreLockedMode=true as a global property which overrides this.
+    -->
+    <RestoreLockedMode Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(MSBuildProjectExtension)' == '.csproj'">false</RestoreLockedMode>
 
     <NuGetLockFileName>packages</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseExperimentalWinUI3)'=='true'">$(NuGetLockFileName).experimentalwinui3</NuGetLockFileName>

package/PropertySheets/React.Cpp.props

@@ -64,7 +64,7 @@
       <PreprocessorDefinitions Condition="'$(UseHermes)'=='true'">USE_HERMES;REACT_NATIVE_DEBUGGER_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(EnableDevServerHBCBundles)'=='true'">ENABLE_DEVSERVER_HBCBUNDLES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(UseV8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>USE_FABRIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>RCT_REMOVE_LEGACY_ARCH;USE_FABRIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>JSI_VERSION=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!--
         To address the crash on the first call to std::mutex::lock.
@@ -143,9 +143,9 @@
 
       <!-- Add include directories expected by React Native C++ code and headers -->
       <AdditionalIncludeDirectories>
-        $(FollyDir);
-        $(FmtDir)include;
-        $(FastFloatDir)include;
+        $(ExternalDir)folly;
+        $(ExternalDir)fmt\include;
+        $(ExternalDir)fast-float\include;
         $(ReactNativeDir)\ReactCommon;
         $(ReactNativeDir)\ReactCommon\callinvoker;
         $(ReactNativeDir)\ReactCommon\jsi;

package/PropertySheets/ReactNativeArchitecture.props

@@ -7,23 +7,23 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RnwNewArch Condition="'$(RnwNewArch)'==''">false</RnwNewArch>
+    <RnwNewArch Condition="'$(RnwNewArch)'==''">true</RnwNewArch>
   </PropertyGroup>
 
   <!-- Check New Architecture properties and gently warn if they're misconfigured. -->
-  <Target Name="EnsureUseHermesForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(RnwNewArch)'=='true' and '$(UseHermes)'=='false'">
+  <Target Name="EnsureUseHermesForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(UseHermes)'=='false'">
     <Warning Text="Property 'UseHermes' was set to 'false'. Projects built against the New Architecture require Hermes so it will be set to 'true'." />
   </Target>
 
-  <Target Name="EnsureUseFabricForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(RnwNewArch)'=='true' and '$(UseFabric)'=='false'">
+  <Target Name="EnsureUseFabricForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(UseFabric)'=='false'">
     <Warning Text="Property 'UseFabric' was set to 'false'. Projects built against the New Architecture require Fabric so it will be set to 'true'." />
   </Target>
 
-  <Target Name="EnsureUseWinUI3ForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(RnwNewArch)'=='true' and '$(UseWinUI3)' == 'false'">
+  <Target Name="EnsureUseWinUI3ForNewArch" BeforeTargets="PrepareForBuild" Condition="'$(UseWinUI3)' == 'false'">
     <Warning Text="Property 'UseWinUI3' was set to 'false'. Projects built against the New Architecture require WinUI3 so it will be set to 'true'." />
   </Target>
 
-  <PropertyGroup Condition="'$(RnwNewArch)'=='true'">
+  <PropertyGroup>
     <!-- Every New Architecture project requires these to be true. -->
     <UseHermes>true</UseHermes>
     <UseFabric>true</UseFabric>
@@ -35,7 +35,7 @@
     <DefineConstants>RNW_NEW_ARCH;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
-  <ItemDefinitionGroup Condition="'$(RnwNewArch)'=='true'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>RNW_NEW_ARCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -44,24 +44,6 @@
     </Midl>
   </ItemDefinitionGroup>
 
-  <!-- Check Old Architecture properties and gently warn if they're misconfigured. -->
-  <Target Name="EnsureUseFabricForOldArch" BeforeTargets="PrepareForBuild" Condition="'$(RnwNewArch)'=='false' and '$(UseFabric)'=='true'">
-    <Warning Text="Property 'UseFabric' was set to 'true'. Projects built against the Old Architecture do not support Fabric so it will be set to 'false'." />
-  </Target>
-
-  <Target Name="EnsureUseWinUI3ForOldArch" BeforeTargets="PrepareForBuild" Condition="'$(RnwNewArch)'=='false' and '$(UseWinUI3)' == 'true' and '$(ForcePaperUseWinUI3)'!='true'">
-    <Warning Text="Property 'UseWinUI3' was set to 'true'. Projects built against the Old Architecture do not support WinUI3 so it will be set to 'false'. You may set 'ForcePaperUseWinUI3' to 'true' override this at your own risk." />
-  </Target>
-
-  <PropertyGroup Condition="'$(RnwNewArch)'=='false'">
-    <!-- Every Old Architecture project requires these to be false. -->
-    <UseFabric>false</UseFabric>
-
-    <!-- Set UseWinUI3 to false unless 'ForcePaperUseWinUI3'. -->
-    <UseWinUI3 Condition="'$(ForcePaperUseWinUI3)'=='true'">true</UseWinUI3>
-    <UseWinUI3 Condition="'$(ForcePaperUseWinUI3)'!='true'">false</UseWinUI3>
-  </PropertyGroup>
-
   <PropertyGroup>
     <ReactNativeArchitecturePropsSet>true</ReactNativeArchitecturePropsSet>
   </PropertyGroup>

package/ReactCommon/ReactCommon.vcxproj

@@ -185,6 +185,10 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\graphics\ValueUnit.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\graphics\DoubleConversions.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\telemetry\TransactionTelemetry.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\animationbackend\AnimatedPropSerializer.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\animationbackend\AnimatedPropsRegistry.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\animationbackend\AnimationBackend.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\animationbackend\AnimationBackendCommitHook.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceEntryReporter.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceObserverRegistry.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\performance\timeline\PerformanceEntryCircularBuffer.cpp" />
@@ -235,15 +239,10 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\DynamicPointerEvent.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.cpp" DisableSpecificWarnings="4996;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Folly\Folly.vcxproj">
-      <Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsi/jsi/test/testlib.cpp

@@ -1990,4 +1990,4 @@ TEST_P(JSITest, DeleteProperty) {
 INSTANTIATE_TEST_CASE_P(
     Runtimes,
     JSITest,
-    ::testing::ValuesIn(runtimeGenerators()));
+    ::testing::ValuesIn(runtimeGenerators()));

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/NetworkIOAgent.cpp

@@ -8,10 +8,10 @@
 #include "NetworkIOAgent.h"
 #include "InspectorFlags.h"
 
-#include "Base64.h"
 #include "Utf8.h"
 
 #include <jsinspector-modern/network/NetworkHandler.h>
+#include <react/utils/Base64.h>
 
 #include <sstream>
 #include <tuple>
@@ -262,6 +262,15 @@ class Stream : public NetworkRequestListener,
 };
 // } // namespace [Windows #13587]
 
+// [Windows #16263
+NetworkIOAgent::~NetworkIOAgent() {
+  if (networkAgentId_) {
+    NetworkHandler::getInstance().disableAgent(*networkAgentId_);
+    networkAgentId_ = std::nullopt;
+  }
+}
+// Windows]
+
 bool NetworkIOAgent::handleRequest(
     const cdp::PreparsedRequest& req,
     LoadNetworkResourceDelegate& delegate) {
@@ -281,15 +290,17 @@ bool NetworkIOAgent::handleRequest(
 
     // @cdp Network.enable support is experimental.
     if (req.method == "Network.enable") {
-      networkHandler.setFrontendChannel(frontendChannel_);
-      networkHandler.enable();
+      networkAgentId_ = networkHandler.enableAgent(frontendChannel_); // [Windows #16263]
       // NOTE: Domain enable/disable responses are sent by HostAgent.
       return false;
     }
 
     // @cdp Network.disable support is experimental.
     if (req.method == "Network.disable") {
-      networkHandler.disable();
+      if (networkAgentId_) {
+        networkHandler.disableAgent(*networkAgentId_); // [Windows #16263]
+        networkAgentId_ = std::nullopt;
+      }
       // NOTE: Domain enable/disable responses are sent by HostAgent.
       return false;
     }

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/NetworkIOAgent.h

@@ -211,6 +211,13 @@ class NetworkIOAgent {
   {
   }
 
+  ~NetworkIOAgent();
+
+  NetworkIOAgent(const NetworkIOAgent &) = delete;
+  NetworkIOAgent &operator=(const NetworkIOAgent &) = delete;
+  NetworkIOAgent(NetworkIOAgent &&) = delete;
+  NetworkIOAgent &operator=(NetworkIOAgent &&) = delete;
+
   /**
    * Handle a CDP request. The response will be sent over the provided
    * \c FrontendChannel synchronously or asynchronously.
@@ -247,6 +254,12 @@ class NetworkIOAgent {
    */
   unsigned long nextStreamId_{0};
 
+  /**
+   * If non-nullopt, indicates that this agent has enabled the Network domain
+   * via NetworkHandler, storing the agent ID for cleanup.
+   */
+  std::optional<size_t> networkAgentId_;
+
   /**
    * Begin loading an HTTP resource, delegating platform-specific
    * implementation, responding to the frontend on headers received or on error.

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/nativemodule/defaults/DefaultTurboModules.cpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DefaultTurboModules.h"
+#include <react/featureflags/ReactNativeFeatureFlags.h>
+#include <react/nativemodule/dom/NativeDOM.h>
+#include <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
+#include <react/nativemodule/idlecallbacks/NativeIdleCallbacks.h>
+#include <react/nativemodule/intersectionobserver/NativeIntersectionObserver.h>
+#include <react/nativemodule/microtasks/NativeMicrotasks.h>
+#include <react/nativemodule/webperformance/NativePerformance.h>
+
+#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
+#include <react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h>
+#endif
+
+namespace facebook::react {
+
+/* static */ std::shared_ptr<TurboModule> DefaultTurboModules::getTurboModule(
+    const std::string& name,
+    const std::shared_ptr<CallInvoker>& jsInvoker) {
+  if (name == NativeReactNativeFeatureFlags::kModuleName) {
+    return std::make_shared<NativeReactNativeFeatureFlags>(jsInvoker);
+  }
+
+  if (name == NativeMicrotasks::kModuleName) {
+    return std::make_shared<NativeMicrotasks>(jsInvoker);
+  }
+
+  if (name == NativeIdleCallbacks::kModuleName) {
+    return std::make_shared<NativeIdleCallbacks>(jsInvoker);
+  }
+
+  if (name == NativeDOM::kModuleName) {
+    return std::make_shared<NativeDOM>(jsInvoker);
+  }
+
+  if (name == NativePerformance::kModuleName) {
+    return std::make_shared<NativePerformance>(jsInvoker);
+  }
+
+  if (ReactNativeFeatureFlags::enableIntersectionObserverByDefault()) {
+    if (name == NativeIntersectionObserver::kModuleName) {
+      return std::make_shared<NativeIntersectionObserver>(jsInvoker);
+    }
+  }
+
+  // [Windows] The C++ MutationObserver native module and the shared C++
+  // Animated backend (AnimatedModule / NativeAnimatedNodesManagerProvider) are
+  // not built on Windows. React Native Windows ships its own Animated
+  // implementation and the corresponding feature flags
+  // (enableMutationObserverByDefault, cxxNativeAnimatedEnabled,
+  // useSharedAnimatedBackend) default to false, so the upstream registrations
+  // are omitted here to avoid pulling their unused backends into the build.
+
+#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
+  if (name == DevToolsRuntimeSettingsModule::kModuleName) {
+    return std::make_shared<DevToolsRuntimeSettingsModule>(jsInvoker);
+  }
+#endif
+
+  return nullptr;
+}
+
+} // namespace facebook::react