react-native-windows 0.69.3 → 0.69.6

package/Microsoft.ReactNative/IReactNotificationService.cpp

@@ -8,77 +8,183 @@
 namespace winrt::Microsoft::ReactNative::implementation {
 
 //=============================================================================
-// ReactNotificationSubscription implementation
+// IReactNotificationSubscription implementation
 //=============================================================================
 
-ReactNotificationSubscription::ReactNotificationSubscription(
-    IReactNotificationSubscription const &parentSubscription,
-    weak_ref<ReactNotificationService> &&notificationService,
-    IReactPropertyName const &notificationName,
-    IReactDispatcher const &dispatcher) noexcept
-    : m_parentSubscription{parentSubscription},
-      m_notificationService{std::move(notificationService)},
-      m_notificationName{notificationName},
-      m_dispatcher{dispatcher} {}
-
-ReactNotificationSubscription::ReactNotificationSubscription(
-    weak_ref<ReactNotificationService> &&notificationService,
-    IReactPropertyName const &notificationName,
-    IReactDispatcher const &dispatcher,
-    ReactNotificationHandler const &handler) noexcept
-    : m_notificationService{std::move(notificationService)},
-      m_notificationName{notificationName},
-      m_dispatcher{dispatcher},
-      m_handler{handler} {}
-
-ReactNotificationSubscription::~ReactNotificationSubscription() noexcept {
-  Unsubscribe();
-}
+// Common interface to share functionality between ReactNotificationSubscription and ReactNotificationSubscriptionView
+MSO_GUID(IReactNotificationSubscriptionPrivate, "09437980-3508-4690-930c-7c310e205e6b")
+struct IReactNotificationSubscriptionPrivate : ::IUnknown {
+  virtual void SetParent(IReactNotificationSubscription const &parentSubscription) noexcept = 0;
+  virtual void CallHandler(
+      Windows::Foundation::IInspectable const &sender,
+      Windows::Foundation::IInspectable const &data) noexcept = 0;
+};
+
+// The Notification subscription class.
+// Instances of this class are stored in the "child" notification services.
+struct ReactNotificationSubscription
+    : implements<ReactNotificationSubscription, IReactNotificationSubscription, IReactNotificationSubscriptionPrivate> {
+  ReactNotificationSubscription(
+      Mso::RefCountedPtr<std::mutex> const &mutex,
+      weak_ref<ReactNotificationService> &&notificationService,
+      IReactPropertyName const &notificationName,
+      IReactDispatcher const &dispatcher,
+      ReactNotificationHandler const &handler) noexcept
+      : m_mutex{mutex},
+        m_notificationService{std::move(notificationService)},
+        m_notificationName{notificationName},
+        m_dispatcher{dispatcher},
+        m_handler{handler} {}
+
+  ~ReactNotificationSubscription() noexcept {
+    Unsubscribe();
+  }
 
-IReactNotificationService ReactNotificationSubscription::NotificationService() const noexcept {
-  return m_notificationService.get().as<IReactNotificationService>();
-}
+ public: // IReactNotificationSubscription implementation
+  IReactNotificationService NotificationService() const noexcept {
+    return m_notificationService.get().as<IReactNotificationService>();
+  }
 
-IReactPropertyName ReactNotificationSubscription::NotificationName() const noexcept {
-  return m_notificationName;
-}
+  IReactPropertyName NotificationName() const noexcept {
+    return m_notificationName;
+  }
 
-IReactDispatcher ReactNotificationSubscription::Dispatcher() const noexcept {
-  return m_dispatcher;
-}
+  IReactDispatcher Dispatcher() const noexcept {
+    return m_dispatcher;
+  }
 
-bool ReactNotificationSubscription::IsSubscribed() const noexcept {
-  return m_isSubscribed;
-}
+  bool IsSubscribed() const noexcept {
+    return GetHandler() != nullptr;
+  }
 
-void ReactNotificationSubscription::Unsubscribe() noexcept {
-  if (m_parentSubscription) {
-    m_parentSubscription.Unsubscribe();
+  void Unsubscribe() noexcept {
+    if (m_parentSubscription) {
+      m_parentSubscription.Unsubscribe();
+    }
+
+    bool isSubscribed{false};
+    {
+      std::scoped_lock lock{*m_mutex};
+      if (m_handler) {
+        isSubscribed = true;
+        // Remove handler to free any objects captured by it.
+        m_handler = nullptr;
+      }
+    }
+
+    if (isSubscribed) {
+      if (auto notificationService = m_notificationService.get()) {
+        notificationService->Unsubscribe(*this);
+      }
+    }
+  }
+
+ public: // IReactNotificationSubscriptionPrivate implementation
+  void SetParent(IReactNotificationSubscription const &parentSubscription) noexcept override {
+    m_parentSubscription = parentSubscription;
   }
 
-  if (m_isSubscribed.exchange(false)) {
-    if (auto notificationService = m_notificationService.get()) {
-      notificationService->Unsubscribe(*this);
+  void CallHandler(IInspectable const &sender, IInspectable const &data) noexcept override {
+    auto args = make<ReactNotificationArgs>(*this, data);
+    if (auto handler = GetHandler()) {
+      if (m_dispatcher) {
+        m_dispatcher.Post([thisPtr = get_strong(), sender, args]() noexcept {
+          if (auto handler = thisPtr->GetHandler()) {
+            handler(sender, args);
+          }
+        });
+      } else {
+        handler(sender, args);
+      }
     }
   }
-}
 
-void ReactNotificationSubscription::CallHandler(
-    IInspectable const &sender,
-    IReactNotificationArgs const &args) noexcept {
-  VerifyElseCrashSz(!m_parentSubscription, "CallHandler must not be called on the child subscription.");
-  if (IsSubscribed()) {
-    if (m_dispatcher) {
-      m_dispatcher.Post([thisPtr = get_strong(), sender, args]() noexcept {
-        if (thisPtr->IsSubscribed()) {
-          thisPtr->m_handler(sender, args);
-        }
-      });
+ private:
+  ReactNotificationHandler GetHandler() const noexcept {
+    std::scoped_lock lock{*m_mutex};
+    return m_handler;
+  }
+
+ private:
+  Mso::RefCountedPtr<std::mutex> m_mutex;
+  IReactNotificationSubscription m_parentSubscription{nullptr};
+  const weak_ref<ReactNotificationService> m_notificationService{nullptr};
+  const IReactPropertyName m_notificationName{nullptr};
+  const IReactDispatcher m_dispatcher{nullptr};
+  ReactNotificationHandler m_handler{nullptr};
+};
+
+// The notification subscription view to wrap up child notification service.
+// Instances of this class are stored in the parent notification services.
+struct ReactNotificationSubscriptionView : implements<
+                                               ReactNotificationSubscriptionView,
+                                               IReactNotificationSubscription,
+                                               IReactNotificationSubscriptionPrivate> {
+  ReactNotificationSubscriptionView(
+      weak_ref<ReactNotificationService> &&notificationService,
+      IReactNotificationSubscription const &childSubscription) noexcept
+      : m_notificationService{std::move(notificationService)}, m_childSubscription{weak_ref(childSubscription)} {
+    childSubscription.as<IReactNotificationSubscriptionPrivate>()->SetParent(*this);
+  }
+
+  ~ReactNotificationSubscriptionView() noexcept {
+    Unsubscribe();
+  }
+
+ public: // IReactNotificationSubscription implementation
+  IReactNotificationService NotificationService() const noexcept {
+    return m_notificationService.get().as<IReactNotificationService>();
+  }
+
+  IReactPropertyName NotificationName() const noexcept {
+    if (auto childSubscription = m_childSubscription.get()) {
+      return childSubscription.NotificationName();
     } else {
-      m_handler(sender, args);
+      return IReactPropertyName{nullptr};
     }
   }
-}
+
+  IReactDispatcher Dispatcher() const noexcept {
+    if (auto childSubscription = m_childSubscription.get()) {
+      return childSubscription.Dispatcher();
+    } else {
+      return IReactDispatcher{nullptr};
+    }
+  }
+
+  bool IsSubscribed() const noexcept {
+    return m_isSubscribed;
+  }
+
+  void Unsubscribe() noexcept {
+    if (m_parentSubscription) {
+      m_parentSubscription.Unsubscribe();
+    }
+
+    if (m_isSubscribed.exchange(false)) {
+      if (auto notificationService = m_notificationService.get()) {
+        notificationService->Unsubscribe(*this);
+      }
+    }
+  }
+
+ public: // IReactNotificationSubscriptionPrivate implementation
+  void SetParent(IReactNotificationSubscription const &parentSubscription) noexcept override {
+    m_parentSubscription = parentSubscription;
+  }
+
+  void CallHandler(IInspectable const &sender, IInspectable const &data) noexcept override {
+    if (auto childSubscription = m_childSubscription.get()) {
+      childSubscription.as<IReactNotificationSubscriptionPrivate>()->CallHandler(sender, data);
+    }
+  }
+
+ private:
+  IReactNotificationSubscription m_parentSubscription{nullptr};
+  const weak_ref<IReactNotificationSubscription> m_childSubscription{nullptr};
+  const weak_ref<ReactNotificationService> m_notificationService{nullptr};
+  std::atomic_bool m_isSubscribed{true};
+};
 
 //=============================================================================
 // ReactNotificationService implementation
@@ -99,7 +205,7 @@ void ReactNotificationService::ModifySubscriptions(
   // Get the current snapshot under the lock
   SubscriptionSnapshotPtr currentSnapshotPtr;
   {
-    std::scoped_lock lock{m_mutex};
+    std::scoped_lock lock{*m_mutex};
     auto it = m_subscriptions.find(notificationName);
     if (it != m_subscriptions.end()) {
       currentSnapshotPtr = it->second;
@@ -113,7 +219,7 @@ void ReactNotificationService::ModifySubscriptions(
 
     // Try to set the new snapshot under the lock
     SubscriptionSnapshotPtr snapshotPtr;
-    std::scoped_lock lock{m_mutex};
+    std::scoped_lock lock{*m_mutex};
     auto it = m_subscriptions.find(notificationName);
     if (it != m_subscriptions.end()) {
       snapshotPtr = it->second;
@@ -146,20 +252,42 @@ IReactNotificationSubscription ReactNotificationService::Subscribe(
     IReactPropertyName const &notificationName,
     IReactDispatcher const &dispatcher,
     ReactNotificationHandler const &handler) noexcept {
-  // Make sure that parent notification service also subscribes to this notification.
-  auto parentSubscription = m_parentNotificationService
-      ? m_parentNotificationService.Subscribe(notificationName, dispatcher, handler)
-      : IReactNotificationSubscription{nullptr};
-  auto subscription = parentSubscription
-      ? make<ReactNotificationSubscription>(parentSubscription, get_weak(), notificationName, dispatcher)
-      : make<ReactNotificationSubscription>(get_weak(), notificationName, dispatcher, handler);
+  VerifyElseCrashSz(notificationName, "notificationName must be not null");
+  VerifyElseCrashSz(handler, "handler must be not null");
+
+  IReactNotificationSubscription subscription =
+      make<ReactNotificationSubscription>(m_mutex, get_weak(), notificationName, dispatcher, handler);
+  AddSubscription(notificationName, subscription);
+  AddSubscriptionToParent(notificationName, subscription);
+  return subscription;
+}
+
+void ReactNotificationService::AddSubscription(
+    IReactPropertyName const &notificationName,
+    IReactNotificationSubscription const &subscription) noexcept {
   ModifySubscriptions(
       notificationName, [&subscription](std::vector<IReactNotificationSubscription> const &snapshot) noexcept {
         auto newSnapshot = std::vector<IReactNotificationSubscription>(snapshot);
         newSnapshot.push_back(subscription);
         return newSnapshot;
       });
-  return subscription;
+}
+
+void ReactNotificationService::AddSubscriptionToParent(
+    IReactPropertyName const &notificationName,
+    IReactNotificationSubscription const &subscription) noexcept {
+  if (m_parentNotificationService) {
+    get_self<ReactNotificationService>(m_parentNotificationService)
+        ->AddSubscriptionFromChild(notificationName, subscription);
+  }
+}
+
+void ReactNotificationService::AddSubscriptionFromChild(
+    IReactPropertyName const &notificationName,
+    IReactNotificationSubscription const &childSubscription) noexcept {
+  auto subscription = make<ReactNotificationSubscriptionView>(get_weak(), childSubscription);
+  AddSubscription(notificationName, subscription);
+  AddSubscriptionToParent(notificationName, subscription);
 }
 
 void ReactNotificationService::Unsubscribe(IReactNotificationSubscription const &subscription) noexcept {
@@ -180,7 +308,7 @@ void ReactNotificationService::UnsubscribeAll() noexcept {
   // The subscription will call the parent Unsubscribe on its own.
   decltype(m_subscriptions) subscriptions;
   {
-    std::scoped_lock lock{m_mutex};
+    std::scoped_lock lock{*m_mutex};
     subscriptions = std::move(m_subscriptions);
   }
 
@@ -203,7 +331,7 @@ void ReactNotificationService::SendNotification(
     SubscriptionSnapshotPtr currentSnapshotPtr;
 
     {
-      std::scoped_lock lock{m_mutex};
+      std::scoped_lock lock{*m_mutex};
       auto it = m_subscriptions.find(notificationName);
       if (it != m_subscriptions.end()) {
         currentSnapshotPtr = it->second;
@@ -213,8 +341,7 @@ void ReactNotificationService::SendNotification(
     // Call notification handlers outside of lock.
     if (currentSnapshotPtr) {
       for (auto &subscription : *currentSnapshotPtr) {
-        auto args = make<ReactNotificationArgs>(subscription, data);
-        get_self<ReactNotificationSubscription>(subscription)->CallHandler(sender, args);
+        subscription.as<IReactNotificationSubscriptionPrivate>()->CallHandler(sender, data);
       }
     }
   }

package/Microsoft.ReactNative/IReactNotificationService.h

@@ -91,9 +91,19 @@ struct ReactNotificationService : implements<ReactNotificationService, IReactNot
       IReactPropertyName const &notificationName,
       Mso::FunctorRef<SubscriptionSnapshot(SubscriptionSnapshot const &)> const &modifySnapshot);
 
+  void AddSubscription(
+      IReactPropertyName const &notificationName,
+      IReactNotificationSubscription const &subscription) noexcept;
+  void AddSubscriptionToParent(
+      IReactPropertyName const &notificationName,
+      IReactNotificationSubscription const &subscription) noexcept;
+  void AddSubscriptionFromChild(
+      IReactPropertyName const &notificationName,
+      IReactNotificationSubscription const &childSubscription) noexcept;
+
  private:
   const IReactNotificationService m_parentNotificationService;
-  std::mutex m_mutex;
+  Mso::RefCountedPtr<std::mutex> m_mutex{Mso::Make_RefCounted<std::mutex>()};
   std::unordered_map<IReactPropertyName, SubscriptionSnapshotPtr> m_subscriptions;
 };
 
@@ -103,35 +113,6 @@ struct ReactNotificationServiceHelper {
   static IReactNotificationService CreateNotificationService() noexcept;
 };
 
-struct ReactNotificationSubscription : implements<ReactNotificationSubscription, IReactNotificationSubscription> {
-  ReactNotificationSubscription(
-      IReactNotificationSubscription const &parentSubscription,
-      weak_ref<ReactNotificationService> &&notificationService,
-      IReactPropertyName const &notificationName,
-      IReactDispatcher const &dispatcher) noexcept;
-  ReactNotificationSubscription(
-      weak_ref<ReactNotificationService> &&notificationService,
-      IReactPropertyName const &notificationName,
-      IReactDispatcher const &dispatcher,
-      ReactNotificationHandler const &handler) noexcept;
-  ~ReactNotificationSubscription() noexcept;
-
-  IReactNotificationService NotificationService() const noexcept;
-  IReactPropertyName NotificationName() const noexcept;
-  IReactDispatcher Dispatcher() const noexcept;
-  bool IsSubscribed() const noexcept;
-  void Unsubscribe() noexcept;
-  void CallHandler(IInspectable const &sender, IReactNotificationArgs const &args) noexcept;
-
- private:
-  const IReactNotificationSubscription m_parentSubscription{nullptr};
-  const weak_ref<ReactNotificationService> m_notificationService;
-  const IReactPropertyName m_notificationName;
-  const IReactDispatcher m_dispatcher;
-  const ReactNotificationHandler m_handler;
-  std::atomic_bool m_isSubscribed{true};
-};
-
 } // namespace winrt::Microsoft::ReactNative::implementation
 
 namespace winrt::Microsoft::ReactNative::factory_implementation {

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -725,7 +725,7 @@
     <PackageReference Include="boost" Version="1.76.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" />
     <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
-    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
   </ItemGroup>
   <Choose>

package/Microsoft.ReactNative/Utils/ValueUtils.cpp

@@ -118,17 +118,22 @@ struct BrushCache {
       return RegisterBrush(resourceName, brush);
     }
 
-    winrt::IInspectable resource{winrt::Application::Current().Resources().Lookup(winrt::box_value(resourceName))};
-
-    if (auto brush = resource.try_as<xaml::Media::Brush>()) {
-      return RegisterBrush(resourceName, brush);
-    } else if (auto color = resource.try_as<winrt::Windows::UI::Color>()) {
-      auto brush = xaml::Media::SolidColorBrush(color.value());
-      return RegisterBrush(resourceName, brush);
+    const auto appResources{winrt::Application::Current().Resources()};
+    const auto boxedResourceName{winrt::box_value(resourceName)};
+    if (appResources.HasKey(boxedResourceName)) {
+      winrt::IInspectable resource{appResources.Lookup(boxedResourceName)};
+
+      if (auto brush = resource.try_as<xaml::Media::Brush>()) {
+        return RegisterBrush(resourceName, brush);
+      } else if (auto color = resource.try_as<winrt::Windows::UI::Color>()) {
+        auto brush = xaml::Media::SolidColorBrush(color.value());
+        return RegisterBrush(resourceName, brush);
+      }
     }
 
     assert(false && "Resource is not a Color or Brush");
-    return nullptr;
+    return xaml::Media::SolidColorBrush(winrt::Colors::Transparent());
+    ;
   }
 
   xaml::Media::Brush RegisterBrush(winrt::hstring resourceName, const xaml::Media::Brush &brush) {

package/Microsoft.ReactNative/Views/Image/ImageViewManager.cpp

@@ -143,7 +143,7 @@ bool ImageViewManager::UpdateProperty(
   } else if (propertyName == "tintColor") {
     const auto isValidColorValue = IsValidColorValue(propertyValue);
     if (isValidColorValue || propertyValue.IsNull()) {
-      const auto color = isValidColorValue ? ColorFrom(propertyValue) : winrt::Colors::Transparent();
+      const auto color = isValidColorValue ? SolidColorBrushFrom(propertyValue).Color() : winrt::Colors::Transparent();
       reactImage->TintColor(color);
     }
     // Override default accessibility behavior

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
   Copyright (c) Microsoft Corporation.
   Licensed under the MIT License.
 
@@ -16,12 +16,12 @@
 
   <ItemGroup>
     <!-- WinUI package name and version are set by WinUI.props -->
-    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
     <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" Condition="$(UseHermes)" />
   </ItemGroup>
 
-  <Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets" 
+  <Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"
           Condition="'$(ReactNativeCodeGenEnabled)' == 'true' and '$(UseExperimentalNuget)' != 'true'" />
 
    <!-- The props file for bundling is not set up to be just defaults, it assumes to be run at the end of the project. -->
@@ -31,17 +31,17 @@
   <Import Project="$(ProjectDir)\AutolinkedNativeModules.g.targets"
           Condition="Exists('$(ProjectDir)\AutolinkedNativeModules.g.targets')" />
 
-  <Import Project="$(AppxPackageRecipe)"  
+  <Import Project="$(AppxPackageRecipe)"
           Condition="Exists('$(AppxPackageRecipe)') And '$(DeployLayout)'=='true'" />
   <Target Name="Deploy" Condition="'$(DeployLayout)'=='true'">
-    <Error Condition="!Exists('$(AppxPackageRecipe)')" 
+    <Error Condition="!Exists('$(AppxPackageRecipe)')"
            Text="You must first build the project before deploying it. Did not find: $(AppxPackageRecipe)" />
-    <Copy SourceFiles="%(AppxPackagedFile.Identity)" 
+    <Copy SourceFiles="%(AppxPackagedFile.Identity)"
           DestinationFiles="$(MSBuildProjectDirectory)\$(OutputPath)Appx\%(AppxPackagedFile.PackagePath)" />
-    <Copy SourceFiles="%(AppXManifest.Identity)" 
-          DestinationFiles="$(MSBuildProjectDirectory)\$(OutputPath)Appx\%(AppxManifest.PackagePath)" 
+    <Copy SourceFiles="%(AppXManifest.Identity)"
+          DestinationFiles="$(MSBuildProjectDirectory)\$(OutputPath)Appx\%(AppxManifest.PackagePath)"
           Condition="'%(AppxManifest.SubType)'!='Designer'"/>
-    <Exec Command="powershell -NonInteractive -NoProfile -Command Add-AppxPackage -Register $(MSBuildProjectDirectory)\$(OutputPath)Appx\AppxManifest.xml" 
+    <Exec Command="powershell -NonInteractive -NoProfile -Command Add-AppxPackage -Register $(MSBuildProjectDirectory)\$(OutputPath)Appx\AppxManifest.xml"
           ContinueOnError="false" />
   </Target>
 

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpLib.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
   Copyright (c) Microsoft Corporation.
   Licensed under the MIT License.
 
@@ -16,12 +16,12 @@
 
   <ItemGroup>
     <!-- WinUI package name and version are set by WinUI.props -->
-    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
   </ItemGroup>
 
   <Target Name="Deploy" />
 
-  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets" 
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"
           Condition="'$(ReactNativeCodeGenEnabled)' == 'true' and '$(UseExperimentalNuget)' != 'true'" />
 
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\RequireSolution.targets" />

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
   Copyright (c) Microsoft Corporation.
   Licensed under the MIT License.
 
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <!-- WinUI package name and version are set by WinUI.props -->
-    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
     <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" Condition="$(UseHermes)" />
   </ItemGroup>

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppLib.targets

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
   Copyright (c) Microsoft Corporation.
   Licensed under the MIT License.
 
@@ -16,13 +16,13 @@
 
   <ItemGroup>
     <!-- WinUI package name and version are set by WinUI.props -->
-    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" />
+    <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
   </ItemGroup>
 
   <Target Name="Deploy" />
 
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\RequireSolution.targets" />
-  
+
   <ItemDefinitionGroup>
     <Reference>
         <Private Condition="'$(ConfigurationType)' != 'Application'">false</Private>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.69.3</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>3</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>6</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.69.3",
+  "version": "0.69.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "^8.0.0",
     "@react-native-community/cli-platform-android": "^8.0.0",
     "@react-native-community/cli-platform-ios": "^8.0.0",
-    "@react-native-windows/cli": "0.69.1",
+    "@react-native-windows/cli": "0.69.2",
     "@react-native-windows/virtualized-list": "0.69.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",

package/stubs/double-conversion/double-conversion.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <glog/logging.h>
+#include <charconv>
 #include <sstream>
 
 static inline void nyi() {
@@ -127,19 +128,27 @@ class StringToDoubleConverter {
     // nyi();
   }
 
-  double StringToDouble(const char *s, int l, int *consumed) {
-    size_t idx = 0;
-    std::string str(s, l);
-    double d = std::stod(str.c_str(), &idx);
-    *consumed = static_cast<int>(idx);
+  double StringToDouble(const char *buf, int length, int *consumed) {
+    double d{};
+    auto ret = std::from_chars(buf, buf + length, d);
+    if (ret.ec == std::errc{}) {
+      *consumed = static_cast<int>(ret.ptr - buf);
+    } else {
+      *consumed = 0;
+      assert(false && "Conversion to double failed");
+    }
     return d;
   }
 
   float StringToFloat(const char *buf, int length, int *consumed) {
-    size_t idx = 0;
-    std::string str(buf, length);
-    float f = std::stof(str, &idx);
-    *consumed = static_cast<int>(idx);
+    float f{};
+    auto ret = std::from_chars(buf, buf + length, f);
+    if (ret.ec == std::errc{}) {
+      *consumed = static_cast<int>(ret.ptr - buf);
+    } else {
+      *consumed = 0;
+      assert(false && "Conversion to float failed");
+    }
     return f;
   }
 };