react-native-windows 0.74.45 → 0.74.47

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewProps.cpp

@@ -39,6 +39,26 @@ HostPlatformViewProps::HostPlatformViewProps(
           CoreFeatures::enablePropIteratorSetter
               ? sourceProps.accessibilitySetSize
               : convertRawProp(context, rawProps, "accessibilitySetSize", sourceProps.accessibilitySetSize, 0)),
+      accessibilityLevel(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityLevel
+              : convertRawProp(context, rawProps, "accessibilityLevel", sourceProps.accessibilityLevel, 0)),
+      accessibilityItemType(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityItemType
+              : convertRawProp(context, rawProps, "accessibilityItemType", sourceProps.accessibilityItemType, {})),
+      accessibilityAccessKey(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityAccessKey
+              : convertRawProp(context, rawProps, "accessibilityAccessKey", sourceProps.accessibilityAccessKey, {})),
+      accessibilityDescription(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.accessibilityDescription
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "accessibilityDescription",
+                                                       sourceProps.accessibilityDescription,
+                                                       {})),
       accessibilityLiveRegion(
           CoreFeatures::enablePropIteratorSetter ? sourceProps.accessibilityLiveRegion
                                                  : convertRawProp(
@@ -83,6 +103,10 @@ void HostPlatformViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(focusable);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityPosInSet);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilitySetSize);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLevel);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityItemType);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityAccessKey);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityDescription);
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLiveRegion);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyDownEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(keyUpEvents);

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewProps.h

@@ -27,6 +27,10 @@ class HostPlatformViewProps : public BaseViewProps {
   int accessibilityPosInSet{0};
   int accessibilitySetSize{0};
   std::string accessibilityLiveRegion{"none"};
+  int accessibilityLevel{0};
+  std::optional<std::string> accessibilityItemType{};
+  std::optional<std::string> accessibilityAccessKey{};
+  std::optional<std::string> accessibilityDescription{};
 
   // std::optional<std::string> overflowAnchor{};
   std::optional<std::string> tooltip{};

package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/MouseEvent.h

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <react/renderer/components/view/PointerEvent.h>
+
+namespace facebook::react {
+
+struct MouseEvent : public PointerEvent {
+  MouseEvent(PointerEvent &event) : PointerEvent(event){};
+
+  // We override the type so that it is not recorded as a PointerType,
+  // otherwise PointerEventsProcessor gets confused by the Windows specific MouseEvents
+  EventPayloadType getType() const override {
+    return static_cast<EventPayloadType>(-1);
+  };
+};
+
+} // namespace facebook::react

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -19,7 +19,7 @@ namespace facebook::react {
 void TextLayoutManager::GetTextLayout(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints,
+    Size size,
     winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
   if (attributedStringBox.getValue().isEmpty())
     return;
@@ -43,10 +43,7 @@ void TextLayoutManager::GetTextLayout(
           static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
       style,
       DWRITE_FONT_STRETCH_NORMAL,
-      (outerFragment.textAttributes.allowFontScaling.value_or(true) &&
-       !std::isnan(outerFragment.textAttributes.fontSizeMultiplier))
-          ? (outerFragment.textAttributes.fontSizeMultiplier * outerFragment.textAttributes.fontSize)
-          : outerFragment.textAttributes.fontSize,
+      outerFragment.textAttributes.fontSize,
       L"",
       spTextFormat.put()));
 
@@ -95,11 +92,44 @@ void TextLayoutManager::GetTextLayout(
       str.c_str(), // The string to be laid out and formatted.
       static_cast<UINT32>(str.size()), // The length of the string.
       spTextFormat.get(), // The text format to apply to the string (contains font information, etc).
-      layoutConstraints.maximumSize.width, // The width of the layout box.
-      layoutConstraints.maximumSize.height, // The height of the layout box.
+      size.width, // The width of the layout box.
+      size.height, // The height of the layout box.
       spTextLayout.put() // The IDWriteTextLayout interface pointer.
       ));
 
+  // Apply max width constraint and ellipsis trimming to ensure consistency with rendering
+  DWRITE_TEXT_METRICS metrics;
+  winrt::check_hresult(spTextLayout->GetMetrics(&metrics));
+
+  if (metrics.width > size.width) {
+    spTextLayout->SetMaxWidth(size.width);
+  }
+
+  // Apply DWRITE_TRIMMING for ellipsizeMode
+  DWRITE_TRIMMING trimming = {};
+  winrt::com_ptr<IDWriteInlineObject> ellipsisSign;
+
+  switch (paragraphAttributes.ellipsizeMode) {
+    case facebook::react::EllipsizeMode::Tail:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER;
+      break;
+    case facebook::react::EllipsizeMode::Clip:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE;
+      break;
+    default:
+      trimming.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER; // Default to tail behavior
+      break;
+  }
+
+  // Use DWriteFactory to create the ellipsis trimming sign
+  if (trimming.granularity != DWRITE_TRIMMING_GRANULARITY_NONE) {
+    auto dwriteFactory = Microsoft::ReactNative::DWriteFactory();
+    HRESULT hr = dwriteFactory->CreateEllipsisTrimmingSign(spTextLayout.get(), ellipsisSign.put());
+    if (SUCCEEDED(hr)) {
+      spTextLayout->SetTrimming(&trimming, ellipsisSign.get());
+    }
+  }
+
   unsigned int position = 0;
   unsigned int length = 0;
   for (const auto &fragment : fragments) {
@@ -121,11 +151,7 @@ void TextLayoutManager::GetTextLayout(
             attributes.fontWeight.value_or(static_cast<facebook::react::FontWeight>(DWRITE_FONT_WEIGHT_REGULAR))),
         range));
     winrt::check_hresult(spTextLayout->SetFontStyle(fragmentStyle, range));
-    winrt::check_hresult(spTextLayout->SetFontSize(
-        (attributes.allowFontScaling.value_or(true) && !std::isnan(attributes.fontSizeMultiplier))
-            ? (attributes.fontSizeMultiplier * attributes.fontSize)
-            : attributes.fontSize,
-        range));
+    winrt::check_hresult(spTextLayout->SetFontSize(attributes.fontSize, range));
 
     if (!isnan(attributes.letterSpacing)) {
       winrt::check_hresult(
@@ -136,6 +162,18 @@ void TextLayoutManager::GetTextLayout(
   }
 }
 
+void TextLayoutManager::GetTextLayout(
+    AttributedStringBox attributedStringBox,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints,
+    winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept {
+  if (attributedStringBox.getValue().isEmpty())
+    return;
+
+  GetTextLayout(attributedStringBox, paragraphAttributes, layoutConstraints.maximumSize, spTextLayout);
+}
+
+// measure entire text (inluding attachments)
 TextMeasurement TextLayoutManager::measure(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
@@ -198,25 +236,6 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
   return {};
 }
 
-LinesMeasurements TextLayoutManager::measureLines(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    Size size) const {
-  assert(false);
-  return {};
-}
-
-std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
-    AttributedString attributedString,
-    ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
-  return nullptr;
-}
-
-void *TextLayoutManager::getNativeTextLayoutManager() const {
-  return (void *)this;
-}
-
 Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTransform> const &transform) {
   if (transform) {
     switch (transform.value()) {
@@ -232,10 +251,92 @@ Microsoft::ReactNative::TextTransform ConvertTextTransform(std::optional<TextTra
         break;
     }
   }
-
   return Microsoft::ReactNative::TextTransform::Undefined;
 }
 
+LinesMeasurements TextLayoutManager::measureLines(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    Size size) const {
+  LinesMeasurements lineMeasurements{};
+
+  winrt::com_ptr<IDWriteTextLayout> spTextLayout;
+
+  GetTextLayout(AttributedStringBox(attributedString), paragraphAttributes, size, spTextLayout);
+
+  if (spTextLayout) {
+    std::vector<DWRITE_LINE_METRICS> lineMetrics;
+    uint32_t actualLineCount;
+    spTextLayout->GetLineMetrics(nullptr, 0, &actualLineCount);
+    lineMetrics.resize(static_cast<size_t>(actualLineCount));
+    winrt::check_hresult(spTextLayout->GetLineMetrics(lineMetrics.data(), actualLineCount, &actualLineCount));
+    uint32_t startRange = 0;
+    const auto count = (paragraphAttributes.maximumNumberOfLines > 0)
+        ? std::min(static_cast<uint32_t>(paragraphAttributes.maximumNumberOfLines), actualLineCount)
+        : actualLineCount;
+    for (uint32_t i = 0; i < count; ++i) {
+      UINT32 actualHitTestCount = 0;
+      spTextLayout->HitTestTextRange(
+          startRange,
+          lineMetrics[i].length,
+          0, // x
+          0, // y
+          NULL,
+          0, // metrics count
+          &actualHitTestCount);
+
+      // Allocate enough room to return all hit-test metrics.
+      std::vector<DWRITE_HIT_TEST_METRICS> hitTestMetrics(actualHitTestCount);
+      spTextLayout->HitTestTextRange(
+          startRange,
+          lineMetrics[i].length,
+          0, // x
+          0, // y
+          &hitTestMetrics[0],
+          static_cast<UINT32>(hitTestMetrics.size()),
+          &actualHitTestCount);
+
+      float width = 0;
+      for (auto tm : hitTestMetrics) {
+        width += tm.width;
+      }
+
+      std::string str;
+      for (const auto &fragment : attributedString.getFragments()) {
+        str = str +
+            winrt::to_string(Microsoft::ReactNative::TransformableText::TransformText(
+                winrt::hstring{Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string)},
+                ConvertTextTransform(fragment.textAttributes.textTransform)));
+      }
+
+      lineMeasurements.emplace_back(LineMeasurement(
+          str.substr(startRange, lineMetrics[i].length),
+          {{hitTestMetrics[0].left, hitTestMetrics[0].top}, // origin
+           {width, lineMetrics[i].height}},
+          0.0f, // TODO descender
+          0.0f, // TODO: capHeight
+          0.0f, // TODO ascender
+          0.0f // TODO: xHeight
+          ));
+
+      startRange += lineMetrics[i].length;
+    }
+  }
+
+  return lineMeasurements;
+}
+
+std::shared_ptr<void> TextLayoutManager::getHostTextStorage(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  return nullptr;
+}
+
+void *TextLayoutManager::getNativeTextLayoutManager() const {
+  return (void *)this;
+}
+
 winrt::hstring TextLayoutManager::GetTransformedText(AttributedStringBox const &attributedStringBox) {
   winrt::hstring result{};
   for (const auto &fragment : attributedStringBox.getValue().getFragments()) {

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -74,10 +74,22 @@ class TextLayoutManager {
       LayoutConstraints layoutConstraints,
       winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
 
+  static void GetTextLayoutByAdjustingFontSizeToFit(
+      AttributedStringBox attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      LayoutConstraints layoutConstraints,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout,
+      TextMeasurement::Attachments &attachments) noexcept;
+
 #pragma endregion
 
  private:
   static winrt::hstring GetTransformedText(AttributedStringBox const &attributedStringBox);
+  static void GetTextLayout(
+      AttributedStringBox attributedString,
+      ParagraphAttributes paragraphAttributes,
+      Size size,
+      winrt::com_ptr<IDWriteTextLayout> &spTextLayout) noexcept;
 
   ContextContainer::Shared m_contextContainer;
 #pragma warning(push)

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -123,9 +123,6 @@
     <ClCompile Include="Modules\NativeUIManager.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Modules\TimingModule.cpp">
-      <Filter>Modules</Filter>
-    </ClCompile>
     <ClCompile Include="Views\Image\ImageViewManager.cpp">
       <Filter>Views\Image</Filter>
     </ClCompile>
@@ -292,6 +289,7 @@
     <ClCompile Include="Views\FrameworkElementTransferProperties.cpp" />
     <ClCompile Include="Views\ReactViewInstance.cpp" />
     <ClCompile Include="Utils\KeyboardUtils.cpp" />
+    <ClCompile Include="Views\DebuggingOverlayViewManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ABICxxModule.h" />

package/Microsoft.ReactNative.Cxx/JSValue.cpp

@@ -278,7 +278,7 @@ JSValue const &JSValueObject::operator[](std::string_view propertyName) const no
     return it->second;
   }
 
-  return JSValue::Null;
+  return JSValue::NullRef();
 }
 
 bool JSValueObject::Equals(JSValueObject const &other) const noexcept {
@@ -434,6 +434,22 @@ void JSValueArray::WriteTo(IJSValueWriter const &writer) const noexcept {
 /*static*/ JSValue const JSValue::EmptyArray{JSValueArray{}};
 /*static*/ JSValue const JSValue::EmptyString{std::string{}};
 
+const JSValue &JSValue::NullRef() noexcept {
+  return JSValue::Null;
+}
+
+const JSValue &JSValue::EmptyObjectRef() noexcept {
+  return JSValue::EmptyObject;
+}
+
+const JSValue &JSValue::EmptyArrayRef() noexcept {
+  return JSValue::EmptyArray;
+}
+
+const JSValue &JSValue::EmptyStringRef() noexcept {
+  return JSValue::EmptyString;
+}
+
 #pragma warning(push)
 #pragma warning(disable : 26495) // False positive for union member not initialized
 JSValue::JSValue(JSValue &&other) noexcept : m_type{other.m_type} {
@@ -739,7 +755,7 @@ JSValue const *JSValue::TryGetObjectProperty(std::string_view propertyName) cons
 
 JSValue const &JSValue::GetObjectProperty(std::string_view propertyName) const noexcept {
   auto result = TryGetObjectProperty(propertyName);
-  return result ? *result : Null;
+  return result ? *result : NullRef();
 }
 
 size_t JSValue::ItemCount() const noexcept {
@@ -752,7 +768,7 @@ JSValue const *JSValue::TryGetArrayItem(JSValueArray::size_type index) const noe
 
 JSValue const &JSValue::GetArrayItem(JSValueArray::size_type index) const noexcept {
   auto result = TryGetArrayItem(index);
-  return result ? *result : Null;
+  return result ? *result : NullRef();
 }
 
 bool JSValue::Equals(JSValue const &other) const noexcept {

package/Microsoft.ReactNative.Cxx/JSValue.h

@@ -181,17 +181,25 @@ bool operator!=(JSValueArray const &left, JSValueArray const &right) noexcept;
 //! For copy operations the explicit Copy() method must be used.
 //! Note that the move operations are not thread safe.
 struct JSValue {
-  //! JSValue with JSValueType::Null.
+  //! JSValue with JSValueType::Null. - Maybe removed in future version - replaced with NullRef
   static JSValue const Null;
+  //! JSValue with JSValueType::Null.
+  static const JSValue &NullRef() noexcept;
 
-  //! JSValue with empty object.
+  //! JSValue with empty object. - Maybe removed in future version - replaced with EmptyObjectRef
   static JSValue const EmptyObject;
+  //! JSValue with empty object.
+  static const JSValue &EmptyObjectRef() noexcept;
 
-  //! JSValue with empty array.
+  //! JSValue with empty array. - Maybe removed in future version - replaced with EmptyArrayRef
   static JSValue const EmptyArray;
+  //! JSValue with empty array.
+  static const JSValue &EmptyArrayRef() noexcept;
 
-  //! JSValue with empty string.
+  //! JSValue with empty string. - Maybe removed in future version - replaced with EmptyStringRef
   static JSValue const EmptyString;
+  //! JSValue with empty string.
+  static const JSValue &EmptyStringRef() noexcept;
 
   //! Create a Null JSValue.
   JSValue() noexcept;
@@ -654,11 +662,11 @@ inline double const *JSValue::TryGetDouble() const noexcept {
 }
 
 inline JSValueObject const &JSValue::AsObject() const noexcept {
-  return (m_type == JSValueType::Object) ? m_object : EmptyObject.m_object;
+  return (m_type == JSValueType::Object) ? m_object : EmptyObjectRef().m_object;
 }
 
 inline JSValueArray const &JSValue::AsArray() const noexcept {
-  return (m_type == JSValueType::Array) ? m_array : EmptyArray.m_array;
+  return (m_type == JSValueType::Array) ? m_array : EmptyArrayRef().m_array;
 }
 
 inline int8_t JSValue::AsInt8() const noexcept {
@@ -860,7 +868,7 @@ inline const JSValueArray &JSValue::Array() const noexcept {
 }
 
 inline const std::string &JSValue::String() const noexcept {
-  return (m_type == JSValueType::String) ? m_string : EmptyString.m_string;
+  return (m_type == JSValueType::String) ? m_string : EmptyStringRef().m_string;
 }
 
 inline bool JSValue::Boolean() const noexcept {

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>x64;x86;ARM64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
 

package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Debug.pubxml

@@ -6,7 +6,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>$(OutDir)publish</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Release.pubxml

@@ -6,7 +6,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>$(OutDir)publish</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

package/Microsoft.ReactNative.Managed.CodeGen/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Humanizer": {
         "type": "Direct",
         "requested": "[2.14.1, )",
@@ -1507,7 +1507,7 @@
         }
       }
     },
-    "net6.0/win-x64": {
+    "net8.0/win-x64": {
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -2350,7 +2350,7 @@
         }
       }
     },
-    "net6.0/win-x86": {
+    "net8.0/win-x86": {
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",

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

@@ -12,20 +12,20 @@
     See https://microsoft.github.io/react-native-windows/docs/win10-compat
   -->
   <PropertyGroup Label="Globals" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' Or '$(WindowsTargetPlatformVersion)'=='10.0.0.0'">10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' Or '$(WindowsTargetPlatformVersion)'=='10.0.0.0'">10.0.22621.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion Condition="'$(WindowsTargetPlatformMinVersion)'=='' Or '$(WindowsTargetPlatformMinVersion)'=='10.0.0.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>
+    <WindowsTargetPlatformVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(WindowsTargetPlatformVersion)', '10.0.22621.0'))">10.0.22621.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>
+    <TargetPlatformVersion Condition="'$(TargetPlatformVersion)'==''">10.0.22621.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>
+    <TargetPlatformVersion Condition="'$(UseWinUI3)'=='true' And $([MSBuild]::VersionLessThan('$(TargetPlatformVersion)', '110.0.22621.0'))">10.0.22621.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.45</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.47</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>45</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>47</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>2bdaa5c1f325505be2d0ee9c8f4347594b480d18</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>919860a4f95c8a8b29bfa079475e5c76208c011d</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Scripts/Tfs/Start-TestServers.ps1

@@ -16,7 +16,8 @@ Write-Host "Starting packager"
 
 Set-Location -Path "$PSScriptRoot\..\.."
 
-Start-Process npm	-PassThru `
+$npmCmd = (Get-Command npm.cmd -ErrorAction Stop).Source
+Start-Process $npmCmd	-PassThru `
 				-NoNewWindow `
 				-WorkingDirectory "$PSScriptRoot\..\.." `
 				-ArgumentList "run start" `