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

package/Shared/Networking/WinRTWebSocketResource.h

@@ -9,15 +9,9 @@
 #include <winrt/Windows.Storage.Streams.h>
 #include "IWebSocketResource.h"
 
-// Standard Library
-#include <future>
-#include <mutex>
-#include <queue>
-
 namespace Microsoft::React::Networking {
 
-class WinRTWebSocketResource2 : public IWebSocketResource,
-                                public std::enable_shared_from_this<WinRTWebSocketResource2> {
+class WinRTWebSocketResource : public IWebSocketResource, public std::enable_shared_from_this<WinRTWebSocketResource> {
   ///
   // See https://devblogs.microsoft.com/oldnewthing/20250328-00/?p=111016
   ///
@@ -27,8 +21,12 @@ class WinRTWebSocketResource2 : public IWebSocketResource,
     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;
 
@@ -140,126 +138,16 @@ class WinRTWebSocketResource2 : public IWebSocketResource,
   winrt::Windows::Foundation::IAsyncAction PerformWrite(std::string &&message, bool isBinary) noexcept;
   winrt::fire_and_forget PerformClose() noexcept;
 
-  WinRTWebSocketResource2(
-      winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
-      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
-
- public:
-  WinRTWebSocketResource2(
-      winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
-      winrt::Windows::Storage::Streams::IDataWriter &&writer,
-      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions,
-      Mso::DispatchQueue callingQueue);
-
-  WinRTWebSocketResource2(
-      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
-
-  ~WinRTWebSocketResource2() noexcept override;
-
-#pragma region IWebSocketResource
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::Connect" />
-  /// </summary>
-  void Connect(std::string &&url, const Protocols &protocols, const Options &options) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::Ping" />
-  /// </summary>
-  void Ping() noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::Send" />
-  /// </summary>
-  void Send(std::string &&message) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SendBinary" />
-  /// </summary>
-  void SendBinary(std::string &&base64String) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::Close" />
-  /// </summary>
-  void Close(CloseCode code, const std::string &reason) noexcept override;
-
-  ReadyState GetReadyState() const noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnConnect" />
-  /// </summary>
-  void SetOnConnect(std::function<void()> &&handler) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnPing" />
-  /// </summary>
-  void SetOnPing(std::function<void()> &&handler) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnSend" />
-  /// </summary>
-  void SetOnSend(std::function<void(std::size_t)> &&handler) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnMessage" />
-  /// </summary>
-  void SetOnMessage(std::function<void(std::size_t, const std::string &, bool isBinary)> &&handler) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnClose" />
-  /// </summary>
-  void SetOnClose(std::function<void(CloseCode, const std::string &)> &&handler) noexcept override;
-
-  /// <summary>
-  /// <see cref="IWebSocketResource::SetOnError" />
-  /// </summary>
-  void SetOnError(std::function<void(Error &&)> &&handler) noexcept override;
-
-#pragma endregion IWebSocketResource
-};
-
-class WinRTWebSocketResource : public IWebSocketResource, public std::enable_shared_from_this<WinRTWebSocketResource> {
-  winrt::Windows::Networking::Sockets::IMessageWebSocket m_socket;
-  // TODO: Use or remove.
-  winrt::Windows::Networking::Sockets::IMessageWebSocket::MessageReceived_revoker m_revoker;
-  winrt::Windows::Storage::Streams::IDataWriter m_writer;
-
-  Mso::DispatchQueue m_dispatchQueue;
-  Mso::ManualResetEvent m_closePerformed;
-  std::atomic_bool m_connectRequested;
-  std::promise<void> m_connectPerformedPromise;
-  winrt::handle m_connectPerformed{
-      CreateEvent(/*attributes*/ nullptr, /*manual reset*/ true, /*state*/ false, /*name*/ nullptr)};
-  ReadyState m_readyState{ReadyState::Connecting};
-
-  CloseCode m_closeCode{CloseCode::Normal};
-  std::string m_closeReason;
-  std::queue<std::pair<std::string, bool>> m_writeQueue;
-  std::mutex m_writeQueueMutex;
-
-  std::function<void()> m_connectHandler;
-  std::function<void()> m_pingHandler;
-  std::function<void(std::size_t)> m_writeHandler;
-  std::function<void(std::size_t, const std::string &, bool)> m_readHandler;
-  std::function<void(CloseCode, const std::string &)> m_closeHandler;
-  std::function<void(Error &&)> m_errorHandler;
-
   WinRTWebSocketResource(
       winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
       std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
 
-  winrt::Windows::Foundation::IAsyncAction PerformConnect(winrt::Windows::Foundation::Uri &&uri) noexcept;
-  winrt::fire_and_forget PerformPing() noexcept;
-  winrt::fire_and_forget PerformWrite(std::string &&message, bool isBinary) noexcept;
-  winrt::fire_and_forget PerformClose() noexcept;
-
-  void Synchronize() noexcept;
-
  public:
   WinRTWebSocketResource(
       winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
       winrt::Windows::Storage::Streams::IDataWriter &&writer,
-      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
+      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions,
+      Mso::DispatchQueue callingQueue);
 
   WinRTWebSocketResource(
       std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);

package/Shared/Shared.vcxitems

@@ -29,11 +29,6 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionContextHelper_emptyimpl.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactCompositionViewComponentBuilder.cpp">
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl</DependentUpon>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl</DependentUpon>
@@ -63,11 +58,6 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService_emptyimpl.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\FocusManager.cpp">
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -100,11 +90,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\Theme.cpp">
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\Theme_emptyimpl.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
-      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\TextDrawing.cpp"/>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\TooltipService.cpp"/>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\UiaHelpers.cpp"/>
@@ -185,6 +170,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp">
       <ExcludedFromBuild Condition="'$(UseV8)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)WebSocketResourceFactory.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\codegen\react\components\rnwcore\EventEmitters.h" />
@@ -231,6 +217,8 @@
       <DependentUpon>$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.idl</DependentUpon>
     </ClInclude>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\CallInvoker.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\CxxReactUWP\JSBigString.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Utils\KeyboardUtils.cpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\SchedulerSettings.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeWin32App.h">
       <DependentUpon>$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeAppBuilder.idl</DependentUpon>
@@ -370,13 +358,46 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils\CppWinrtLessExceptions.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils\WinRTConversions.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AccessibilityInfoModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AlertModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AdditionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimatedPlatformConfig.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\CalculatedAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DecayAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DiffClampAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DivisionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\EventAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\FrameAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\InterpolationAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\ModulusAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\MultiplicationAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\NativeAnimatedModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\NativeAnimatedNodeManager.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\PropsAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\SpringAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\StyleAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\SubtractionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\TrackingAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\TransformAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\ValueAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppearanceModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppStateModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppThemeModuleUwp.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ClipboardModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\DeviceInfoModule.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\DevSettingsModule.cpp" />
-    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ReactRootViewTagGenerator.cpp" />
-    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\PlatformConstantsWinModule.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ExceptionsManager.cpp" />
-    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Timing.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\I18nManagerModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ImageViewManagerModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\LinkingManagerModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\LogBoxModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\PlatformConstantsWinModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ReactRootViewTagGenerator.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\SampleTurboModule.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\SourceCode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Timing.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost\AsyncActionQueue.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost\CrashManager.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost\JSBundle_Win32.cpp" />
@@ -425,6 +446,8 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\RuntimeTargetNetwork.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\RuntimeTargetDebuggerSessionObserver.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\RuntimeTargetConsole.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\RuntimeTargetGlobalStateObserver.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\RuntimeTargetTracingStateObserver.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\ConsoleMessage.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\NetworkIOAgent.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\PerfMonitorV2.cpp" />
@@ -486,7 +509,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\RawTextProps.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\TextShadowNode.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\RawTextShadowNode.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\ParagraphComponentDescriptor.cpp" DisableSpecificWarnings="5028;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\AccessibilityProps.cpp" DisableSpecificWarnings="4715;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\PointerEvent.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\BaseTouch.cpp" />
@@ -568,6 +590,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\threading\TaskDispatchThread.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\DesktopWindowMessage.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\HttpSettings.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueReader.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\IJSValueWriter.idl" />
@@ -587,25 +610,25 @@
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\RedBoxHandler.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Timer.idl" />
   </ItemGroup>
-  <ItemGroup Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'">
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ComponentView.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeWindow.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactPackageBuilderFabric.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl" />
-    <Midl Condition="('$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true') AND '$(SupportWinUI3Islands)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\XamlApplication.idl" />
+  <ItemGroup>
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ComponentView.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeWindow.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactPackageBuilderFabric.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl" />
+    <Midl Condition="'$(SupportWinUI3Islands)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\XamlApplication.idl" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
@@ -621,6 +644,8 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <!-- External (vendored) third-party library sources -->
+  <Import Project="$(ExternalDir)External.vcxitems" />
   <ItemGroup Condition="'$(SupportWinUI3Islands)' == 'true'">
     <ApplicationDefinition Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\App.xaml" />
   </ItemGroup>

package/Shared/Shared.vcxitems.filters

@@ -163,6 +163,42 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\oscompat\OSCompatWindows.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\NetworkHandler.cpp" />
     <ClCompile Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AccessibilityInfoModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AlertModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppearanceModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppStateModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\AppThemeModuleUwp.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ClipboardModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\DeviceInfoModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\I18nManagerModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\LinkingManagerModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\LogBoxModule.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\CxxReactUWP\JSBigString.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Utils\KeyboardUtils.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AdditionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimatedPlatformConfig.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\AnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\CalculatedAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DecayAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DiffClampAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\DivisionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\EventAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\FrameAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\InterpolationAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\ModulusAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\MultiplicationAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\NativeAnimatedModule.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\NativeAnimatedNodeManager.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\PropsAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\SpringAnimationDriver.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\StyleAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\SubtractionAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\TrackingAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\TransformAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\Animated\ValueAnimatedNode.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ImageViewManagerModule.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)WebSocketResourceFactory.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\codegen\react\components\rnwcore\EventEmitters.h" />
@@ -297,6 +333,24 @@
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeHost.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\RedBoxHandler.idl" />
     <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Timer.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ComponentView.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionComponentView.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\FocusManager.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeWindow.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactPackageBuilderFabric.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
+    <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl" />
+    <Midl Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\DesktopWindowMessage.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp" />

package/Shared/Utils.cpp

@@ -4,14 +4,6 @@
 #include "Utils.h"
 #include <regex>
 
-#include <AppModelHelpers.h>
-#include <DesktopWindowBridge.h>
-#include <ShlObj.h>
-#include <Shlwapi.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Storage.h>
-
-#include <cstdarg>
 #include <sstream>
 
 using std::string;
@@ -44,86 +36,6 @@ std::string FormatString(const char *format, ...) {
   return result;
 }
 
-namespace {
-IAsyncOperation<winrt::hstring> getPackagedApplicationDataPath(const wchar_t *childFolder) {
-  auto localFolder = winrt::Windows::Storage::ApplicationData::Current().LocalFolder();
-  if (!childFolder) {
-    co_return localFolder.Path();
-  } else {
-    auto subfolder = co_await localFolder.CreateFolderAsync(
-        childFolder, winrt::Windows::Storage::CreationCollisionOption::OpenIfExists);
-    co_return subfolder.Path();
-  }
-}
-
-IAsyncOperation<winrt::hstring> getUnPackagedApplicationDataPath(const wchar_t *childFolder) {
-  wchar_t *pwzAppDataPath = NULL;
-  if (CALL_INDIRECT(
-          L"shell32.dll",
-          SHGetKnownFolderPath,
-          FOLDERID_AppDataProgramData,
-          KF_FLAG_CREATE,
-          static_cast<HANDLE>(NULL),
-          &pwzAppDataPath) != S_OK)
-    std::abort();
-
-  winrt::hstring appDataPath(pwzAppDataPath);
-  CoTaskMemFree(pwzAppDataPath);
-
-  if (!childFolder) {
-    co_return appDataPath;
-  } else {
-    std::wostringstream os;
-    os << appDataPath.c_str() << "\\" << childFolder;
-    auto childFolderPath = os.str();
-    if (!CreateDirectoryW(childFolderPath.c_str(), NULL) && GetLastError() != ERROR_ALREADY_EXISTS)
-      std::abort();
-    co_return winrt::hstring(childFolderPath);
-  }
-}
-} // namespace
-
-IAsyncOperation<winrt::hstring> getApplicationDataPath(const wchar_t *childFolder) {
-  if (Microsoft::ReactNative::HasPackageIdentity()) {
-    co_return co_await getPackagedApplicationDataPath(childFolder);
-  } else {
-    co_return co_await getUnPackagedApplicationDataPath(childFolder);
-  }
-}
-
-Url::Url(string &&source) {
-  //                           ( 1 )              ( 2 )   ( 3 (4) )   ( 5 )    ( 6 (7) )
-  std::regex expression("(http|https|ws|wss)://([^:/\\?]+)(:(\\d+))?(/[^\\?]*)?(\\?(.*))?$");
-  //                          scheme              host       port      path      query
-  constexpr int schemeIdx = 1;
-  constexpr int hostIdx = 2;
-  constexpr int portIdx = 4;
-  constexpr int pathIdx = 5;
-  constexpr int queryIdx = 7;
-
-  std::cmatch match;
-  if (std::regex_match(source.c_str(), match, expression)) {
-    this->scheme = string(match[schemeIdx].first, match[schemeIdx].second);
-    this->host = string(match[hostIdx].first, match[hostIdx].second);
-    this->port = string(match[portIdx].first, match[portIdx].second);
-    this->path = string(match[pathIdx].first, match[pathIdx].second);
-
-    if (1 > path.length() || '/' != path.at(0))
-      path.insert(0, "/");
-
-    this->queryString = string(match[queryIdx].first, match[queryIdx].second);
-  } else {
-    throw std::exception("Could not parse URL.");
-  }
-}
-
-string Url::Target() {
-  if (1 > queryString.length())
-    return path;
-  else
-    return path.append("?").append(queryString);
-}
-
 } // namespace Microsoft::React
 
 // Folly/folly/SafeAssert.cpp brings in a bunch of file APIs that we otherwise

package/Shared/Utils.h

@@ -8,20 +8,6 @@
 
 namespace Microsoft::React {
 
-struct Url {
-  std::string scheme;
-  std::string host;
-  std::string port;
-  std::string path;
-  std::string queryString;
-
-  Url(std::string &&urlString);
-
-  std::string Target();
-};
-
-winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> getApplicationDataPath(const wchar_t *childfolder);
-
 // string formatting
 std::string FormatString(_Printf_format_string_ const char *format, ...);
 

package/Shared/WebSocketResourceFactory.cpp

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#include <CppRuntimeOptions.h>
+#include <Networking/WinRTWebSocketResource.h>
+
+using std::shared_ptr;
+using std::string;
+using winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult;
+
+namespace Microsoft::React::Networking {
+#pragma region IWebSocketResource static members
+
+/*static*/
+shared_ptr<IWebSocketResource> IWebSocketResource::Make() {
+  std::vector<ChainValidationResult> certExceptions;
+  if (GetRuntimeOptionBool("WebSocket.AcceptSelfSigned")) {
+    certExceptions.emplace_back(ChainValidationResult::Untrusted);
+    certExceptions.emplace_back(ChainValidationResult::InvalidName);
+  }
+
+  return std::make_shared<WinRTWebSocketResource>(std::move(certExceptions));
+}
+
+#pragma endregion IWebSocketResource static members
+} // namespace Microsoft::React::Networking

package/Shared/tracing/fbsystrace.h

@@ -12,6 +12,7 @@
 #include <type_traits>
 #include <unordered_map>
 
+#define TRACE_TAG_REACT 0
 #define TRACE_TAG_REACT_CXX_BRIDGE 1 << 10
 #define TRACE_TAG_REACT_APPS 1 << 11