react-native-windows 0.74.0-preview.2 → 0.74.0-preview.4

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

@@ -445,11 +445,20 @@ winrt::Windows::UI::Color Theme::PlatformColor(const std::string &platformColor)
   return {0, 0, 0, 0}; // Transparent
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(winrt::hstring platformColor) noexcept {
+winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::InternalPlatformBrush(
+    winrt::hstring platformColor) noexcept {
   return PlatformBrush(winrt::to_string(platformColor));
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(const std::string &platformColor) noexcept {
+#ifdef USE_WINUI3
+winrt::Microsoft::UI::Composition::CompositionBrush Theme::PlatformBrush(winrt::hstring platformColor) noexcept {
+  return winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerBrush(
+      PlatformBrush(winrt::to_string(platformColor)));
+}
+#endif
+
+winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::PlatformBrush(
+    const std::string &platformColor) noexcept {
   if (m_emptyTheme)
     return nullptr;
 
@@ -465,7 +474,8 @@ winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(const st
   return nullptr;
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::Brush(const facebook::react::Color &color) noexcept {
+winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::Brush(
+    const facebook::react::Color &color) noexcept {
   if (m_emptyTheme)
     return nullptr;
 

package/Microsoft.ReactNative/Fabric/Composition/Theme.h

@@ -7,18 +7,21 @@
 #include "Composition.Theme.g.h"
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 #include <react/renderer/graphics/Color.h>
+#include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct Theme : ThemeT<Theme> {
+struct Theme : ThemeT<Theme, Experimental::IInternalTheme> {
   Theme(
       const winrt::Microsoft::ReactNative::ReactContext &reactContext,
       const winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader &customResourceLoader) noexcept;
 
-  // Public APIs
-  winrt::Microsoft::ReactNative::Composition::IBrush PlatformBrush(winrt::hstring platformColor) noexcept;
+// Public APIs
+#ifdef USE_WINUI3
+  winrt::Microsoft::UI::Composition::CompositionBrush PlatformBrush(winrt::hstring platformColor) noexcept;
+#endif
   bool TryGetPlatformColor(winrt::hstring platformColor, winrt::Windows::UI::Color &color) noexcept;
   bool IsEmpty() const noexcept;
 
@@ -29,9 +32,13 @@ struct Theme : ThemeT<Theme> {
   // Internal APIs
   Theme() noexcept;
 
+  winrt::Microsoft::ReactNative::Composition::Experimental::IBrush InternalPlatformBrush(
+      winrt::hstring platformColor) noexcept;
+
   winrt::Windows::UI::Color PlatformColor(const std::string &platformColor) noexcept;
-  winrt::Microsoft::ReactNative::Composition::IBrush PlatformBrush(const std::string &platformColor) noexcept;
-  winrt::Microsoft::ReactNative::Composition::IBrush Brush(const facebook::react::Color &color) noexcept;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IBrush PlatformBrush(
+      const std::string &platformColor) noexcept;
+  winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Brush(const facebook::react::Color &color) noexcept;
   winrt::Windows::UI::Color Color(const facebook::react::Color &color) noexcept;
 
   D2D1::ColorF D2DColor(const facebook::react::Color &color) noexcept;
@@ -59,9 +66,10 @@ struct Theme : ThemeT<Theme> {
   std::unordered_map<std::string, std::pair<bool, winrt::Windows::UI::Color>> m_colorCache;
   winrt::Windows::UI::ViewManagement::UISettings m_uisettings;
   winrt::Windows::UI::ViewManagement::UISettings::ColorValuesChanged_revoker m_colorValuesChangedRevoker;
-  std::unordered_map<std::string, winrt::Microsoft::ReactNative::Composition::IBrush> m_platformColorBrushCache;
-  std::unordered_map<DWORD, winrt::Microsoft::ReactNative::Composition::IBrush> m_colorBrushCache;
-  winrt::Microsoft::ReactNative::Composition::ICompositionContext m_compositionContext;
+  std::unordered_map<std::string, winrt::Microsoft::ReactNative::Composition::Experimental::IBrush>
+      m_platformColorBrushCache;
+  std::unordered_map<DWORD, winrt::Microsoft::ReactNative::Composition::Experimental::IBrush> m_colorBrushCache;
+  winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext m_compositionContext;
   winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader m_customResourceLoader;
   winrt::Microsoft::ReactNative::Composition::ICustomResourceLoader::ResourcesChanged_revoker m_resourceChangedRevoker;
 };

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

@@ -35,15 +35,15 @@ winrt::Windows::UI::Color Theme::PlatformColor(const std::string &) noexcept {
   return {};
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(winrt::hstring) noexcept {
+winrt::Microsoft::UI::Composition::CompositionBrush Theme::PlatformBrush(winrt::hstring) noexcept {
   return nullptr;
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::PlatformBrush(const std::string &) noexcept {
+winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::PlatformBrush(const std::string &) noexcept {
   return nullptr;
 }
 
-winrt::Microsoft::ReactNative::Composition::IBrush Theme::Brush(const facebook::react::Color &) noexcept {
+winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Theme::Brush(const facebook::react::Color &) noexcept {
   return nullptr;
 }
 

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

@@ -14,7 +14,7 @@
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
 UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
-    const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+    const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
     : base_type(
@@ -30,7 +30,7 @@ UnimplementedNativeViewComponentView::UnimplementedNativeViewComponentView(
 }
 
 winrt::Microsoft::ReactNative::ComponentView UnimplementedNativeViewComponentView::Create(
-    const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+    const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   return winrt::make<UnimplementedNativeViewComponentView>(compContext, tag, reactContext);
@@ -65,7 +65,7 @@ void UnimplementedNativeViewComponentView::updateLayoutMetrics(
 
     drawingSurface.HorizontalAlignmentRatio(0.f);
     drawingSurface.VerticalAlignmentRatio(0.f);
-    drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::CompositionStretch::None);
+    drawingSurface.Stretch(winrt::Microsoft::ReactNative::Composition::Experimental::CompositionStretch::None);
     m_labelVisual.Brush(drawingSurface);
     m_labelVisual.Size(surfaceSize);
     m_labelVisual.Offset({

package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.h

@@ -17,7 +17,7 @@ namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct UnimplementedNativeViewComponentView
     : public UnimplementedNativeViewComponentViewT<UnimplementedNativeViewComponentView, ViewComponentView> {
   [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
-      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+      const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
@@ -29,13 +29,13 @@ struct UnimplementedNativeViewComponentView
       override;
 
   UnimplementedNativeViewComponentView(
-      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
+      const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
  private:
   std::shared_ptr<facebook::react::UnimplementedNativeViewProps const> m_props;
-  winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_labelVisual{nullptr};
+  winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual m_labelVisual{nullptr};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h

@@ -63,7 +63,7 @@ struct FabricUIManager final : public std::enable_shared_from_this<FabricUIManag
   void didMountComponentsWithRootTag(facebook::react::SurfaceId surfaceId) noexcept;
 
   winrt::Microsoft::ReactNative::ReactContext m_context;
-  winrt::Microsoft::ReactNative::Composition::ICompositionContext m_compContext;
+  winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext m_compContext;
   std::shared_ptr<facebook::react::Scheduler> m_scheduler;
   std::shared_ptr<facebook::react::SurfaceManager> m_surfaceManager;
   std::mutex m_schedulerMutex; // Protect m_scheduler

package/Microsoft.ReactNative/Fabric/IComponentViewRegistry.h

@@ -22,7 +22,7 @@ struct IComponentViewRegistry {
   virtual ComponentViewDescriptor const &dequeueComponentViewWithComponentHandle(
       facebook::react::ComponentHandle componentHandle,
       facebook::react::Tag tag,
-      const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext) noexcept = 0;
+      const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext) noexcept = 0;
   virtual ComponentViewDescriptor const &componentViewDescriptorWithTag(facebook::react::Tag tag) const noexcept = 0;
   virtual winrt::Microsoft::ReactNative::ComponentView findComponentViewWithTag(
       facebook::react::Tag tag) const noexcept = 0;

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp

@@ -46,7 +46,8 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
   if (compositionContext) {
-    return winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerCompositor(compositionContext);
+    return winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerCompositor(
+        compositionContext);
   }
 #endif
 #ifndef CORE_ABI

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp

@@ -181,9 +181,11 @@ void PropsAnimatedNode::StartAnimations() {
             view.m_element.RotationAxis(m_rotationAxis);
 #ifdef USE_FABRIC
           } else {
-            auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
-                view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
-                    ->Visual());
+            auto visual =
+                winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+                    view.m_componentView
+                        .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
+                        ->Visual());
             visual.RotationAxis(m_rotationAxis);
 #endif
           }
@@ -395,8 +397,8 @@ void PropsAnimatedNode::StartAnimation(
   } else if (view.m_componentView) {
     auto baseComponentView =
         view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
-    auto visual =
-        winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(baseComponentView->Visual());
+    auto visual = winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
+        baseComponentView->Visual());
     if (visual) {
       auto targetProp = animation.Target();
       if (targetProp == L"Rotation") {

package/Microsoft.ReactNative/Theme.idl

@@ -37,12 +37,23 @@ namespace Microsoft.ReactNative.Composition
     event Windows.Foundation.EventHandler<Object> ResourcesChanged;
   };
 
+  namespace Experimental {
+    [webhosthidden]
+    [experimental]
+    interface IInternalTheme {
+      Microsoft.ReactNative.Composition.Experimental.IBrush InternalPlatformBrush(String platformColor);
+    }
+  }
+
   [webhosthidden]
   [experimental]
   runtimeclass Theme {
     Theme(Microsoft.ReactNative.IReactContext reactContext, ICustomResourceLoader resourceLoader);
 
-    Microsoft.ReactNative.Composition.IBrush PlatformBrush(String platformColor);
+#ifdef USE_WINUI3
+    Microsoft.UI.Composition.CompositionBrush PlatformBrush(String platformColor);
+#endif
+
     Boolean TryGetPlatformColor(String platformColor, out Windows.UI.Color color);
     DOC_STRING("An empty theme is used when the final theme is not yet known.  It will generally return transparent colors.")
     Boolean IsEmpty { get; };

package/Microsoft.ReactNative/ViewProps.idl

@@ -8,11 +8,21 @@ import "Theme.idl";
 
 namespace Microsoft.ReactNative {
 
+  namespace Composition.Experimental {
+    [webhosthidden]
+    [experimental]
+    interface IInternalColor {
+      Microsoft.ReactNative.Composition.Experimental.IBrush AsInternalBrush(Microsoft.ReactNative.Composition.Theme theme);
+    }
+  }
+
   [webhosthidden]
   [experimental]
   runtimeclass Color {
     Windows.UI.Color AsWindowsColor(Microsoft.ReactNative.Composition.Theme theme);
-    Microsoft.ReactNative.Composition.IBrush AsBrush(Microsoft.ReactNative.Composition.Theme theme);
+#ifdef USE_WINUI3
+    Microsoft.UI.Composition.CompositionBrush AsBrush(Microsoft.ReactNative.Composition.Theme theme);
+#endif
 
     static Color Black();
     static Color Transparent();

package/Microsoft.ReactNative/packages.lock.json

@@ -24,21 +24,21 @@
           "Microsoft.SourceLink.Common": "1.1.1"
         }
       },
-      "Microsoft.UI.Xaml": {
-        "type": "Direct",
-        "requested": "[2.8.0, )",
-        "resolved": "2.8.0",
-        "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "1.0.1264.42"
-        }
-      },
       "Microsoft.Windows.CppWinRT": {
         "type": "Direct",
         "requested": "[2.0.230706.1, )",
         "resolved": "2.0.230706.1",
         "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
       },
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "1.1.1",
@@ -49,10 +49,10 @@
         "resolved": "1.1.1",
         "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
       },
-      "Microsoft.Web.WebView2": {
+      "Microsoft.Windows.SDK.BuildTools": {
         "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+        "resolved": "10.0.22621.756",
+        "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
       },
       "common": {
         "type": "Project",
@@ -66,8 +66,8 @@
       "folly": {
         "type": "Project",
         "dependencies": {
-          "boost": "[1.76.0, )",
-          "fmt": "[1.0.0, )"
+          "Fmt": "[1.0.0, )",
+          "boost": "[1.76.0, )"
         }
       },
       "reactcommon": {
@@ -79,52 +79,80 @@
       }
     },
     "native,Version=v0.0/win10-arm": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-arm-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-arm64-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-x64": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-x64-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-x86": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     },
     "native,Version=v0.0/win10-x86-aot": {
-      "Microsoft.Web.WebView2": {
-        "type": "Transitive",
-        "resolved": "1.0.1264.42",
-        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      "Microsoft.WindowsAppSDK": {
+        "type": "Direct",
+        "requested": "[1.5.240227000, )",
+        "resolved": "1.5.240227000",
+        "contentHash": "6rESOsREi8534J7IDpNfFYPvxQaSleXKt4A7ZYPeQyckNMQ0o1W0jZ420bJbEMz9Cw/S/8IbpPftLLZ9w/GTCQ==",
+        "dependencies": {
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
+        }
       }
     }
   }

package/Microsoft.ReactNative.Cxx/AutoDraw.h

@@ -3,14 +3,14 @@
 
 #include <winrt/Microsoft.ReactNative.Composition.h>
 
-#include <CompositionSwitcher.interop.h>
+#include <CompositionSwitcher.Experimental.interop.h>
 
 namespace Microsoft::ReactNative::Composition {
 
 class AutoDrawDrawingSurface {
  public:
   AutoDrawDrawingSurface(
-      winrt::Microsoft::ReactNative::Composition::IDrawingSurfaceBrush &drawingSurface,
+      winrt::Microsoft::ReactNative::Composition::Experimental::IDrawingSurfaceBrush &drawingSurface,
       POINT *offset) noexcept {
     drawingSurface.as(m_drawingSurfaceInterop);
     m_drawingSurfaceInterop->BeginDraw(m_d2dDeviceContext.put(), offset);
@@ -31,7 +31,7 @@ class AutoDrawDrawingSurface {
   }
 
  private:
-  winrt::com_ptr<ICompositionDrawingSurfaceInterop> m_drawingSurfaceInterop;
+  winrt::com_ptr<Experimental::ICompositionDrawingSurfaceInterop> m_drawingSurfaceInterop;
   winrt::com_ptr<ID2D1DeviceContext> m_d2dDeviceContext;
 };
 

package/Microsoft.ReactNative.Cxx/{CompositionSwitcher.interop.h → CompositionSwitcher.Experimental.interop.h}

@@ -12,7 +12,7 @@
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Windows.Graphics.DirectX.Direct3D11.h>
 
-namespace Microsoft::ReactNative::Composition {
+namespace Microsoft::ReactNative::Composition::Experimental {
 
 struct __declspec(uuid("941FDD90-ED27-49CE-A1CD-86ECB2D4A0FA")) ICompositionDrawingSurfaceInterop : public IUnknown {
   virtual HRESULT BeginDraw(ID2D1DeviceContext **deviceContextOut, POINT *offset) noexcept = 0;
@@ -31,4 +31,4 @@ struct __declspec(uuid("4742F122-3EE0-48AA-9EA9-44A00147B55F")) ICompositionCont
   virtual void D2DFactory(ID2D1Factory1 **outD2DFactory) noexcept = 0;
 };
 
-} // namespace Microsoft::ReactNative::Composition
+} // namespace Microsoft::ReactNative::Composition::Experimental

package/Microsoft.ReactNative.Cxx/DesktopWindowBridge.h

@@ -13,6 +13,8 @@
 
 #include <winrt/Microsoft.ReactNative.h>
 
+#include "CppWinRTIncludes.h"
+
 namespace winrt::Microsoft::ReactNative {
 
 namespace details {

package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj

@@ -141,24 +141,15 @@
       <Version>$(NETCoreUWPVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(EnableSourceLink)' == 'true'">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-      </ItemGroup>
-    </When>
-  </Choose>
   <!--
     Visual Studio (but not MSBuild) will ignore Conditions applied directly to
     the PackageReference or ItemGroup containing a PackageReference. Both
     respect <Choose> for conditional restoration.
     -->
   <Choose>
-    <When Condition="'$(UseWinUI3)'=='true'">
+    <When Condition="'$(EnableSourceLink)' == 'true'">
       <ItemGroup>
-        <PackageReference Include="Microsoft.WinUI">
-          <Version>$(WinUI3Version)</Version>
-        </PackageReference>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
       </ItemGroup>
     </When>
   </Choose>

package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.props

@@ -17,7 +17,7 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Appx.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Autolink.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Codegen.props" />
-  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\HybridCRT.props" Condition="'$(UseWinUI3)'=='true'"/>
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\HybridCRT.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.Cpp.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\CppAppConsumeCSharpModule.props" />

package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props

@@ -12,18 +12,20 @@
     See https://microsoft.github.io/react-native-windows/docs/win10-compat
   -->
   <PropertyGroup Label="Globals" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
-
-    <WindowsTargetPlatformVersion Condition="'$(UseWinUI3)'=='true' And ('$(WindowsTargetPlatformVersion)'=='' Or '$(WindowsTargetPlatformVersion)'=='10.0.0.0')">10.0.22000.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' Or '$(WindowsTargetPlatformVersion)'=='10.0.0.0'">10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)'=='' Or '$(WindowsTargetPlatformMinVersion)'=='10.0.0.0'">10.0.17763.0</WindowsTargetPlatformMinVersion>
 
-    <WindowsTargetPlatformMinVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(WindowsTargetPlatformMinVersion)', '10.0.17763.0'))">10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <!-- WinAppSDK/Composition projects have higher version requirements. -->
+    <WindowsTargetPlatformVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(WindowsTargetPlatformVersion)', '10.0.22000.0'))">10.0.22000.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(WindowsTargetPlatformMinVersion)', '10.0.18362.0'))">10.0.18362.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Globals" Condition="'$(MSBuildProjectExtension)' == '.csproj' Or '$(MSBuildProjectExtension)' == '.wapproj'">
     <TargetPlatformVersion Condition="'$(TargetPlatformVersion)'==''">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)'==''">10.0.17763.0</TargetPlatformMinVersion>
 
+    <!-- WinAppSDK/Composition projects have higher version requirements. -->
+    <TargetPlatformVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformVersion)', '10.0.22000.0'))">10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformMinVersion)', '10.0.17763.0'))">10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.0-preview.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.0-preview.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>5f10e604924b47b0baa64825d8770be4e3a074b1</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>377d16da702ed9ba7e7e66cc3483fffe72d56d9e</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.0-preview.2",
+  "version": "0.74.0-preview.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,13 +28,13 @@
     "@react-native-community/cli-platform-ios": "13.6.4",
     "@react-native-windows/cli": "0.74.0-preview.2",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.74.77",
-    "@react-native/codegen": "0.74.77",
-    "@react-native/community-cli-plugin": "0.74.77",
-    "@react-native/gradle-plugin": "0.74.77",
-    "@react-native/js-polyfills": "0.74.77",
-    "@react-native/normalize-colors": "0.74.77",
-    "@react-native/virtualized-lists": "0.74.77",
+    "@react-native/assets-registry": "0.74.80",
+    "@react-native/codegen": "0.74.80",
+    "@react-native/community-cli-plugin": "0.74.80",
+    "@react-native/gradle-plugin": "0.74.80",
+    "@react-native/js-polyfills": "0.74.80",
+    "@react-native/normalize-colors": "0.74.80",
+    "@react-native/virtualized-lists": "0.74.80",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@react-native-windows/codegen": "0.74.0-preview.1",
-    "@react-native/metro-config": "0.74.77",
+    "@react-native/metro-config": "0.74.80",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.9",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
@@ -81,7 +81,7 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "18.2.0",
-    "react-native": "0.74.0-rc.6",
+    "react-native": "0.74.0-rc.9",
     "react-native-platform-override": "^1.9.25",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
@@ -89,7 +89,7 @@
   "peerDependencies": {
     "@types/react": "^18.2.6",
     "react": "18.2.0",
-    "react-native": "0.74.0-rc.6"
+    "react-native": "0.74.0-rc.9"
   },
   "beachball": {
     "defaultNpmTag": "preview",