react-native-windows 0.74.46 → 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.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.46</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.47</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>46</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>47</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>146c018d53245bc3292b3ff1def8a0f3c065ccf8</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" `

package/Scripts/rnw-dependencies.ps1

@@ -1,3 +1,4 @@
+
 # Troubleshoot RNW dependencies
 param(
     [switch]$Install = $false,
@@ -65,32 +66,31 @@ $vsComponents = @('Microsoft.Component.MSBuild',
     'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
     'Microsoft.VisualStudio.ComponentGroup.UWP.Support',
     'Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core',
-    'Microsoft.VisualStudio.Component.Windows10SDK.19041');
+    'Microsoft.VisualStudio.Component.Windows10SDK.19041',
+    'Microsoft.VisualStudio.Component.Windows11SDK.22621');
 
 # UWP.VC is not needed to build the projects with msbuild, but the VS IDE requires it.
 if (!($tagsToInclude.Contains('buildLab'))) {
     $vsComponents += 'Microsoft.VisualStudio.ComponentGroup.UWP.VC';
 }
 
-# Windows11SDK is only needed for the more experimental composition projects using newer WinAppSDK versions
-if ($tagsToInclude.Contains('rnwDev')) {
-    $vsComponents += 'Microsoft.VisualStudio.Component.Windows11SDK.22000';
-}
-
 $vsWorkloads = @('Microsoft.VisualStudio.Workload.ManagedDesktop',
     'Microsoft.VisualStudio.Workload.NativeDesktop',
     'Microsoft.VisualStudio.Workload.Universal');
 
 $vsAll = ($vsComponents + $vsWorkloads);
 
+# The minimum winget version to check for
+$wingetver = "1.7.11261";
+
 # The minimum VS version to check for
 # Note: For install to work, whatever min version you specify here must be met by the current package available on winget.
 $vsver = "17.11.0";
 
 # The exact .NET SDK version to check for
-$dotnetver = "6.0";
+$dotnetver = "8.0";
 # Version name of the winget package
-$wingetDotNetVer = "6";
+$wingetDotNetVer = "8";
 
 $v = [System.Environment]::OSVersion.Version;
 if ($env:Agent_BuildDirectory) {
@@ -127,7 +127,7 @@ function Get-VSPathPropertyForEachInstall {
         [String[]]$paths = ($output | Where-Object { (Test-Path $_) });
         return $paths;
     }
-    
+
     return $null;
 }
 
@@ -187,26 +187,26 @@ function GetVSChannelAndProduct {
     param(
         [string]$VsWhere
     )
-    
+
     if ($VsWhere) {
         $channelId = & $VsWhere -version $vsver -property channelId;
         $productId = & $VsWhere -version $vsver -property productId;
-        
+
         # Channel/product not found, check one more time for pre-release
         if (($channelId -eq $null) -or ($productId -eq $null)) {
             $channelId = & $VsWhere -version $vsver -property channelId -prerelease;
             $productId = & $VsWhere -version $vsver -property productId -prerelease;
         }
-        
+
         return $channelId, $productId;
     }
-    
+
     return $null, $null;
 }
 
 function InstallVS {
     $vsWhere = Get-VSWhere;
-    
+
     $channelId, $productId = GetVSChannelAndProduct -VsWhere $vsWhere
 
     if (($vsWhere -eq $null) -or ($channelId -eq $null) -or ($productId -eq $null)) {
@@ -223,7 +223,7 @@ function InstallVS {
 
         $channelId, $productId = GetVSChannelAndProduct -VsWhere $vsWhere
     }
-    
+
     # Final check before attempting install
     if (($vsWhere -eq $null) -or ($channelId -eq $null) -or ($productId -eq $null)) {
         throw "Unable to find or install a compatible version of Visual Studio >= ($vsver).";
@@ -240,8 +240,9 @@ function CheckNode {
     try {
         $nodeVersion = (Get-Command node -ErrorAction Stop).Version;
         Write-Verbose "Node version found: $nodeVersion";
-        $v = $nodeVersion.Major;
-        return ($v -ge 18) -and (($v % 2) -eq 0);
+        $major = $nodeVersion.Major;
+        $minor = $nodeVersion.Minor;
+        return ($major -gt 22) -or (($major -eq 22) -and ($minor -ge 14));
     } catch { Write-Debug $_ }
 
     Write-Verbose "Node not found.";
@@ -331,7 +332,7 @@ function InstallCppWinRT_VSIX {
     $url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/CppWinRTTeam/vsextensions/cppwinrt101804264/2.0.210304.5/vspackage";
     Write-Verbose "Downloading CppWinRT VSIX from $url";
     Invoke-WebRequest -UseBasicParsing $url -OutFile $env:TEMP\Microsoft.Windows.CppWinRT.vsix;
-    
+
     $vsWhere = Get-VSWhere;
     if ($vsWhere -eq $null) {
         return;
@@ -437,10 +438,10 @@ $requirements = @(
     },
     @{
         Id=[CheckId]::Node;
-        Name = 'Node.js (LTS, >= 18.0)';
+        Name = 'Node.js (LTS, >= 22.0)';
         Tags = @('appDev');
         Valid = { CheckNode; }
-        Install = { WinGetInstall OpenJS.NodeJS.LTS "18.16.1" };
+        Install = { WinGetInstall OpenJS.NodeJS.LTS "22.14.0" };
         HasVerboseOutput = $true;
     },
     @{
@@ -517,18 +518,30 @@ $requirements = @(
     }
 );
 
+function InstallWinGet {
+    Write-Verbose "Updating WinGet version...";
+    Invoke-WebRequest -Uri https://aka.ms/getwinget -OutFile "$env:TEMP\winget.msixbundle";
+    Add-AppPackage -ForceApplicationShutdown $env:TEMP\winget.msixbundle;
+    Remove-Item $env:TEMP\winget.msixbundle;
+}
+
 function EnsureWinGetForInstall {
     Write-Verbose "Checking for WinGet...";
     try {
         # Check if winget.exe is in PATH
         if (Get-Command "winget.exe" -CommandType Application -ErrorAction Ignore) {
             Write-Verbose "WinGet found in PATH.";
-            return;
+            Write-Verbose "Validating WinGet version...";
+            $wingetverfound = & winget -v;
+            if ([System.Version]$wingetverfound.Substring(1) -ge [System.Version]$wingetver ){
+                Write-Verbose "WinGet version found: $wingetverfound";
+                return;
+            }
         }
+        InstallWinGet;
+        $installedwingetver = & winget -v;
+        Write-Verbose "WinGet version installed: $installedwingetver";
     } catch { Write-Debug $_ }
-
-    Write-Host "WinGet is required to install dependencies. See https://learn.microsoft.com/en-us/windows/package-manager/winget/ for more information.";
-    throw "WinGet needed to install.";
 }
 
 function WinGetInstall {
@@ -546,7 +559,7 @@ function WinGetInstall {
         & winget install "$wingetPackage" --accept-source-agreements --accept-package-agreements
     }
  }
- 
+
 function IsElevated {
     return [bool](([System.Security.Principal.WindowsIdentity]::GetCurrent()).groups -match "S-1-5-32-544");
 }

package/Shared/Shared.vcxitems

@@ -64,6 +64,12 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextProvider.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextRangeProvider.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl</DependentUpon>

package/Shared/Shared.vcxitems.filters

@@ -215,6 +215,12 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionDynamicAutomationProvider.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextProvider.cpp">
+      <Filter>Source Files\Fabric\Composition</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextRangeProvider.cpp">
+      <Filter>Source Files\Fabric\Composition</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
@@ -325,6 +331,8 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiEventEmitter.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\TooltipService.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\BorderPrimitive.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextProvider.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextRangeProvider.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">