react-native-windows 0.74.46 → 0.74.48

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.48</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>46</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>48</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>146c018d53245bc3292b3ff1def8a0f3c065ccf8</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>ddef61e5c9244a04e1c34529f89bde30491ec53f</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -6,7 +6,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.1.23</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2511.7001-d7ca19b3</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsi/jsi/test/testlib.cpp

@@ -1173,7 +1173,7 @@ TEST_P(JSITest, DecoratorTest) {
 
   class CountRuntime final : public WithRuntimeDecorator<Count> {
    public:
-    explicit CountRuntime(std::unique_ptr<Runtime> rt)
+    explicit CountRuntime(std::shared_ptr<Runtime> rt)
         : WithRuntimeDecorator<Count>(*rt, count_),
           rt_(std::move(rt)),
           count_(kInit) {}
@@ -1183,7 +1183,7 @@ TEST_P(JSITest, DecoratorTest) {
     }
 
    private:
-    std::unique_ptr<Runtime> rt_;
+    std::shared_ptr<Runtime> rt_;
     Count count_;
   };
 
@@ -1222,7 +1222,7 @@ TEST_P(JSITest, MultiDecoratorTest) {
   class MultiRuntime final
       : public WithRuntimeDecorator<std::tuple<Inc, Nest>> {
    public:
-    explicit MultiRuntime(std::unique_ptr<Runtime> rt)
+    explicit MultiRuntime(std::shared_ptr<Runtime> rt)
         : WithRuntimeDecorator<std::tuple<Inc, Nest>>(*rt, tuple_),
           rt_(std::move(rt)) {}
 
@@ -1234,7 +1234,7 @@ TEST_P(JSITest, MultiDecoratorTest) {
     }
 
    private:
-    std::unique_ptr<Runtime> rt_;
+    std::shared_ptr<Runtime> rt_;
     std::tuple<Inc, Nest> tuple_;
   };
 

package/ReactCommon/cgmanifest.json

@@ -6,7 +6,7 @@
                 "Type": "git",
                 "Git": {
                   "RepositoryUrl": "https://github.com/microsoft/node-api-jsi",
-                  "CommitHash": "83cfef428a97627c9185c73da097e42742de56eb"
+                  "CommitHash": "21b47f08b762b21b1d4d970940ab23f59f43249c"
                 }
             },
             "DevelopmentDependency": false

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -8,13 +8,35 @@ Set-Location -Path $RepoRoot
 
 try
 {
-    $packagesSolutions = Get-ChildItem -File -Recurse -Path packages *.sln | Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') }
-    $vnextSolutions = Get-ChildItem -File -Path vnext *.sln
+    # Delete existing lock files
+    $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
+    $existingLockFiles | Foreach-Object {
+        Write-Host Deleting $_.FullName
+        Remove-Item $_.FullName
+    }
+
+    $packagesSolutions = (Get-ChildItem -File -Recurse -Path $RepoRoot\packages -Filter *.sln )| Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') }
+    $vnextSolutions = (Get-ChildItem -File -Path $RepoRoot\vnext -Filter *.sln)
 
-    $($packagesSolutions; $vnextSolutions) | Foreach {
-        Write-Host Restoring $_.FullName
+    # Run all solutions with their defaults
+    $($packagesSolutions; $vnextSolutions) | Foreach-Object {
+        Write-Host Restoring $_.FullName with defaults
         & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
     }
+
+    # Re-run solutions that build with UseExperimentalWinUI3
+    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $experimentalSolutions -contains $_.Name } | Foreach-Object {
+        Write-Host Restoring $_.FullName with UseExperimentalWinUI3=true
+        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseExperimentalWinUI3=true $_.FullName
+    }
+
+    # Re-run solutions that build with Chakra
+    $chakraSolutions = @("ReactUWPTestApp.sln", "integrationtest.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $chakraSolutions -contains $_.Name } | Foreach-Object {
+        Write-Host Restoring $_.FullName with UseHermes=false
+        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseHermes=false $_.FullName
+    }
 }
 finally
 {

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">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.46",
+  "version": "0.74.48",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "13.6.9",
     "@react-native-community/cli-platform-android": "13.6.9",
     "@react-native-community/cli-platform-ios": "13.6.9",
-    "@react-native-windows/cli": "0.74.11",
+    "@react-native-windows/cli": "0.74.12",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.74.89",
     "@react-native/codegen": "0.74.89",
@@ -77,7 +77,7 @@
     "@types/react": "^18.2.6",
     "eslint": "^8.19.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "flow-bin": "^0.217.2",
+    "flow-bin": "^0.228.0",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",

package/fmt/packages.lock.json

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "dependencies": {
-    "native,Version=v0.0": {},
-    "native,Version=v0.0/win10-arm": {},
-    "native,Version=v0.0/win10-arm-aot": {},
-    "native,Version=v0.0/win10-arm64-aot": {},
-    "native,Version=v0.0/win10-x64": {},
-    "native,Version=v0.0/win10-x64-aot": {},
-    "native,Version=v0.0/win10-x86": {},
-    "native,Version=v0.0/win10-x86-aot": {}
-  }
-}