react-native-windows 0.83.0 → 0.83.3

package/PropertySheets/NuGet.LockFile.props

@@ -8,9 +8,17 @@
        -->
 
   <PropertyGroup>
-    <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">true</RestoreLockedMode>
+    <!-- Locked vs. force-evaluate is decided centrally in the repo-root Directory.Build.props (force-evaluate locally, locked in CI); don't force locked mode on here or it conflicts with force-evaluate (NU1512). -->
+    <RestoreLockedMode Condition="'$(RestoreLockedMode)'==''">false</RestoreLockedMode>
+
+    <!-- RnwNewArchOnly is for projects that always build with RnwNewArch so they don't add .newarch to the filename. -->
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(SolutionName)'=='ReactWindows-Desktop'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.CppApp.props'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.Package.props'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'==''">false</RnwNewArchOnly>
 
     <NuGetLockFileName>packages</NuGetLockFileName>
+    <NuGetLockFileName Condition="'$(RnwNewArch)'=='true' AND '$(RnwNewArchOnly)'=='false'">$(NuGetLockFileName).newarch</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseExperimentalWinUI3)'=='true'">$(NuGetLockFileName).experimentalwinui3</NuGetLockFileName>
     <NuGetLockFilePath>.\$(NuGetLockFileName).lock.json</NuGetLockFilePath>
   </PropertyGroup>

package/PropertySheets/React.Cpp.props

@@ -43,8 +43,8 @@
 
   <PropertyGroup Label="ExternalDependencies">
     <!-- Google Test Adapter -->
-    <!-- Property sheets in the adapter's NuGet doesn't consider PlatformToolset=v143 -->
-    <Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>false</Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>
+    <!-- If ApplicationType is set, adapter include paths won't be set for MSVC 14.0 (v140) or later -->
+    <Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>true</Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>
   </PropertyGroup>
 
   <!--
@@ -136,15 +136,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ShowIncludes Condition="'$(ShowIncludes)'=='true'">true</ShowIncludes>
-      <AdditionalOptions>/utf-8 %(AdditionalOptions) /await</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <SpectreMitigation>Spectre</SpectreMitigation>
 
       <!-- Add include directories expected by React Native C++ code and headers -->
       <AdditionalIncludeDirectories>
-        $(FollyDir);
-        $(FmtDir)include;
-        $(FastFloatDir)include;
+        $(ExternalDir)folly;
+        $(ExternalDir)fmt\include;
+        $(ExternalDir)fast-float\include;
         $(ReactNativeDir)\ReactCommon;
         $(ReactNativeDir)\ReactCommon\callinvoker;
         $(ReactNativeDir)\ReactCommon\jsi;

package/PropertySheets/WinUI.props

@@ -2,15 +2,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="WinUI3 versioning">
 
-    <!-- 
+    <!--
       Internal versions are typically only located at: https://microsoft.visualstudio.com/DefaultCollection/ProjectReunion/_artifacts/feed/Project.Reunion.nuget.internal/NuGet/Microsoft.WindowsAppSDK/versions
-      For local testing of internal versions, modify WinUI3ExperimentalVersion, and comment out the additional nuget source in NuGet.Config
+      For local testing of internal versions, set WinUI3ExperimentalVersion and run
+      vnext\Scripts\EnableInternalWinAppSDKFeed.ps1 to add the internal source and its package mapping.
       When this version is updated, be sure to update the default for the enableInternalFeed parameter of /.ado/templates/enable-experimental-winui3.yml
     -->
     <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">2.0.0-experimental3</WinUI3ExperimentalVersion>
     <!-- This value is also used by the CLI, see /packages/@react-native-windows/cli/.../autolinkWindows.ts -->
     <WinUI3Version Condition="'$(WinUI3Version)'=='' AND '$(UseExperimentalWinUI3)'=='true'">$(WinUI3ExperimentalVersion)</WinUI3Version>
-    <WinUI3Version Condition="'$(WinUI3Version)'==''">1.8.260209005</WinUI3Version>
+    <WinUI3Version Condition="'$(WinUI3Version)'==''">1.8.260508005</WinUI3Version>
     <!-- This is needed to prevent build errors with WinAppSDK >= 1.7 trying to double build WindowsAppRuntimeAutoInitializer.cpp -->
     <WindowsAppSdkAutoInitialize Condition="'$(WindowsAppSdkAutoInitialize)'=='' And $([MSBuild]::VersionGreaterThan('$(WinUI3Version)', '1.7.0'))">false</WindowsAppSdkAutoInitialize>
   </PropertyGroup>

package/ReactCommon/ReactCommon.vcxproj

@@ -233,11 +233,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Folly\Folly.vcxproj">
-      <Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />

package/Scripts/ConfigureYarnPackageAgeGate.ps1

@@ -0,0 +1,25 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+$ErrorActionPreference = 'Stop'
+
+& yarn config set npmMinimalAgeGate 8d
+if ($LASTEXITCODE -ne 0) {
+    throw 'Failed to configure the Yarn package age gate.'
+}
+
+$yarnConfigPath = Join-Path (Get-Location) '.yarnrc.yml'
+if (Select-String -LiteralPath $yarnConfigPath -Pattern '^npmPreapprovedPackages:' -Quiet) {
+    throw 'The generated project already defines Yarn package preapprovals.'
+}
+
+@(
+    '',
+    'npmPreapprovedPackages:',
+    '  - "react-native-windows"',
+    '  - "@react-native-windows/*"',
+    '  - "@rnw-scripts/*"',
+    '  - "@office-iss/*"',
+    '  - "react-native"',
+    '  - "@react-native/*"'
+) | Add-Content -LiteralPath $yarnConfigPath -Encoding utf8NoBOM

package/Scripts/EnableInternalWinAppSDKFeed.ps1

@@ -9,11 +9,18 @@ Set-Location -Path $RepoRoot
 try
 {
     [xml] $nugetConfig = Get-Content "NuGet.Config"
-    $newFeed = $nugetConfig.configuration.packageSources.add.clone()
-    $newFeed.key = "Project.Reunion.nuget.internal";
-    $newFeed.value = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json";
-    $nugetConfig.configuration.packageSources.AppendChild($newFeed)
-    $nugetConfig.Save("NuGet.Config")
+    $feedKey = "Project.Reunion.nuget.internal"
+    $newFeed = $nugetConfig.CreateElement("add")
+    $newFeed.SetAttribute("key", $feedKey)
+    $newFeed.SetAttribute("value", "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json")
+    [void] $nugetConfig.configuration.packageSources.AppendChild($newFeed)
+    $mapping = $nugetConfig.CreateElement("packageSource")
+    $mapping.SetAttribute("key", $feedKey)
+    $pattern = $nugetConfig.CreateElement("package")
+    $pattern.SetAttribute("pattern", "*")
+    [void] $mapping.AppendChild($pattern)
+    [void] $nugetConfig.configuration.packageSourceMapping.AppendChild($mapping)
+    $nugetConfig.Save("$RepoRoot\NuGet.Config")
 }
 finally
 {

package/Scripts/JustMyXaml.ps1

@@ -1,4 +1,4 @@
-# This script enables or disables VS 2022's JustMyXaml feature
+# This script enables or disables VS 2026's JustMyXaml feature
 [CmdletBinding()]
 param([bool]$Enable)
 
@@ -7,14 +7,14 @@ if (!([bool](([System.Security.Principal.WindowsIdentity]::GetCurrent()).groups
 }
 
 $instanceId = & "$(${env:ProgramFiles(x86)})\Microsoft Visual Studio\Installer\vswhere.exe" -property instanceId
-$hiveFile = "$($env:LocalAppData)\Microsoft\VisualStudio\17.0_$instanceId\privateregistry.bin"
-& reg.exe load HKLM\VS2022_HIVE $hiveFile | Out-Null
-New-PSDrive -Name VS2022 -PSProvider Registry -Root HKLM\VS2022_HIVE  -ErrorAction Stop | Out-Null
-$currentValue = (Get-ItemProperty VS2022:\Software\Microsoft\VisualStudio\17.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml).EnableXamlVisualDiagnosticsJustMyXaml
+$hiveFile = "$($env:LocalAppData)\Microsoft\VisualStudio\18.0_$instanceId\privateregistry.bin"
+& reg.exe load HKLM\VS2026_HIVE $hiveFile | Out-Null
+New-PSDrive -Name VS2026 -PSProvider Registry -Root HKLM\VS2026_HIVE  -ErrorAction Stop | Out-Null
+$currentValue = (Get-ItemProperty VS2026:\Software\Microsoft\VisualStudio\18.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml).EnableXamlVisualDiagnosticsJustMyXaml
 if ($currentValue -eq 0) { $currentValue = $false; } else { $currentValue = $true; }
 Write-Host "Current value: $currentValue"
 if ($Enable) { $newValue = 1; } else { $newValue = 0; }
-Set-ItemProperty VS2022:\Software\Microsoft\VisualStudio\17.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml -Value $newValue -Type DWord
+Set-ItemProperty VS2026:\Software\Microsoft\VisualStudio\18.0_$instanceId\Debugger -Name EnableXamlVisualDiagnosticsJustMyXaml -Value $newValue -Type DWord
 Write-Host "New value: $Enable"
-Remove-PSDrive -Name VS2022
-& reg.exe unload HKLM\VS2022_HIVE | Out-Null
+Remove-PSDrive -Name VS2026
+& reg.exe unload HKLM\VS2026_HIVE | Out-Null

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -7,7 +7,33 @@ param(
 $StartingLocation = Get-Location
 Set-Location -Path $RepoRoot
 
+$failedRestores = [System.Collections.Generic.List[string]]::new()
+
+function Restore-Solution([string] $solution, [string[]] $extraArgs) {
+    Write-Host "Restoring $solution $($extraArgs -join ' ')"
+    & msbuild /t:Restore /p:RestoreForceEvaluate=true @extraArgs $solution
+    if ($LASTEXITCODE -ne 0) {
+        $failedRestores.Add(("$solution $($extraArgs -join ' ')").Trim())
+    }
+}
+
 try {
+    # Some node_modules packages ship a NuGet.Config that re-adds the public nuget.org feed. That
+    # bypasses the approved source policy and trips corporate network blocks on api.nuget.org.
+    # Strip any nuget.org source so restore uses the approved sources and mappings in the root NuGet.Config.
+    Get-ChildItem -File -Recurse -Path $RepoRoot -Filter NuGet.Config -ErrorAction SilentlyContinue |
+        Where-Object { $_.FullName -match '\\node_modules\\' } | ForEach-Object {
+            $configPath = $_.FullName
+            try { [xml]$doc = Get-Content -LiteralPath $configPath -Raw } catch { return }
+            $sources = $doc.SelectSingleNode('/configuration/packageSources')
+            if (-not $sources) { return }
+            $badSources = @($sources.SelectNodes('add') | Where-Object { $_.GetAttribute('value') -match 'nuget\.org' })
+            if ($badSources.Count -eq 0) { return }
+            $badSources | ForEach-Object { [void]$sources.RemoveChild($_) }
+            $doc.Save($configPath)
+            Write-Host "Removed nuget.org feed from $configPath"
+        }
+
     if (-not $SkipLockDeletion) {
         # Delete existing lock files
         $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
@@ -22,17 +48,88 @@ try {
 
     # Run all solutions with their defaults
     $($packagesSolutions; $vnextSolutions) | Foreach-Object {
-        Write-Host Restoring $_.FullName with defaults
-        & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
+        Restore-Solution $_.FullName @()
     }
 
     # Re-run solutions that build with UseExperimentalWinUI3
-    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $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
+        Restore-Solution $_.FullName @('/p:UseExperimentalWinUI3=true')
+    }
+
+    # Re-run solutions that build with Chakra (UseHermes=false)
+    $chakraSolutions = @("ReactUWPTestApp.sln", "integrationtest.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $chakraSolutions -contains $_.Name } | Foreach-Object {
+        Restore-Solution $_.FullName @('/p:UseHermes=false')
+    }
+
+    # These tracked legacy architecture locks intentionally use WinUI3. Restoring the projects with
+    # their defaults would switch them to WinUI2 and downgrade the transitive WebView2 dependency.
+    $paperWinUI3Projects = @(
+        "packages\@react-native-windows\automation-channel\windows\AutomationChannel\AutomationChannel.vcxproj",
+        "packages\sample-custom-component\windows\SampleCustomComponent\SampleCustomComponent.vcxproj",
+        "vnext\Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.CsWinRT.csproj",
+        "vnext\Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj",
+        "vnext\Microsoft.ReactNative.IntegrationTests\Microsoft.ReactNative.IntegrationTests.vcxproj",
+        "vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj"
+    )
+    $paperWinUI3Projects | Foreach-Object {
+        Restore-Solution (Join-Path $RepoRoot $_) @(
+            "/p:SolutionDir=$RepoRoot\",
+            '/p:RnwNewArch=false',
+            '/p:ForcePaperUseWinUI3=true'
+        )
+    }
+
+    $experimentalPaperWinUI3Projects = @(
+        "packages\sample-custom-component\windows\SampleCustomComponent\SampleCustomComponent.vcxproj",
+        "vnext\Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.CsWinRT.csproj",
+        "vnext\Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj",
+        "vnext\Microsoft.ReactNative.IntegrationTests\Microsoft.ReactNative.IntegrationTests.vcxproj",
+        "vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj"
+    )
+    $experimentalPaperWinUI3Projects | Foreach-Object {
+        Restore-Solution (Join-Path $RepoRoot $_) @(
+            "/p:SolutionDir=$RepoRoot\",
+            '/p:RnwNewArch=false',
+            '/p:ForcePaperUseWinUI3=true',
+            '/p:UseExperimentalWinUI3=true'
+        )
     }
 }
 finally {
     Set-Location -Path "$StartingLocation"
-}
+}
+
+# Restore failures used to be ignored (msbuild's exit code was never checked), so a broken run
+# looked successful while leaving lock files deleted. Fail loudly on both failure modes.
+if ($failedRestores.Count -gt 0) {
+    Write-Host ''
+    Write-Host "ERROR: NuGet restore returned a non-zero exit code for $($failedRestores.Count) solution pass(es):" -ForegroundColor Red
+    $failedRestores | ForEach-Object { Write-Host "    $_" -ForegroundColor Red }
+}
+
+# A committed lock that was deleted but never came back means a surviving project failed or was skipped
+# during restore. Ignore locks whose owning project is being removed in the same working tree.
+$missingTrackedLocks = @(git -C $RepoRoot ls-files -- '*.lock.json' | Where-Object {
+    $lockPath = Join-Path $RepoRoot $_
+    if (Test-Path $lockPath) { return $false }
+
+    $projectDirectory = Split-Path -Parent $lockPath
+    return @(Get-ChildItem -LiteralPath $projectDirectory -File -ErrorAction SilentlyContinue |
+        Where-Object { $_.Extension -in '.vcxproj', '.csproj', '.wapproj' }).Count -gt 0
+})
+if ($missingTrackedLocks.Count -gt 0) {
+    Write-Host ''
+    Write-Host "ERROR: $($missingTrackedLocks.Count) committed lock file(s) were deleted but not regenerated:" -ForegroundColor Red
+    $missingTrackedLocks | ForEach-Object { Write-Host "    $_" -ForegroundColor Red }
+}
+
+if ($failedRestores.Count -gt 0 -or $missingTrackedLocks.Count -gt 0) {
+    Write-Host ''
+    Write-Host 'Lock file regeneration is INCOMPLETE - do not commit. Fix the errors above and re-run.' -ForegroundColor Red
+    exit 1
+}
+
+Write-Host ''
+Write-Host 'All solutions restored and every committed lock file was regenerated.' -ForegroundColor Green

package/Scripts/RunRnwInitWindows.js

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+'use strict';
+
+const path = require('path');
+const {createRequire} = require('module');
+
+async function main() {
+  const template = process.argv[2];
+  if (!template) {
+    throw new Error('A React Native Windows template is required.');
+  }
+
+  const projectRequire = createRequire(path.join(process.cwd(), 'package.json'));
+  const communityCli = projectRequire('@react-native-community/cli');
+  const rnwCli = projectRequire('@react-native-windows/cli');
+  const initCommand = rnwCli.commands.find(
+    command => command.name === 'init-windows',
+  );
+
+  if (!initCommand) {
+    throw new Error('The installed React Native Windows CLI has no init-windows command.');
+  }
+
+  const config = await communityCli.loadConfigAsync({});
+  await initCommand.func([], config, {
+    template,
+    overwrite: true,
+    logging: true,
+  });
+}
+
+main().catch(error => {
+  console.error(error);
+  process.exitCode = 1;
+});

package/Scripts/Tfs/Layout-Desktop-Headers.ps1

@@ -10,36 +10,10 @@ param(
 )
 
 [xml]$props = gc $PSScriptRoot\..\..\Directory.Build.props
-[string] $FollyVersion = $props.Project.PropertyGroup.FollyVersion;
-$FollyVersion = $FollyVersion.Trim() # The extracted FollyVersion contains a space at the end that isn't actually present, issue #6216
-$FollyRoot = "$SourceRoot\node_modules\.folly";
-$FollyOverrideRoot = "$ReactWindowsRoot\Folly\TEMP_UntilFollyUpdate";
+# Folly source is committed in vnext/external/folly/ - no download needed
+$FollyRoot = "$ReactWindowsRoot\external\folly";
 
-[string] $FmtVersion = $props.Project.PropertyGroup.FmtVersion;
-$FmtVersion = $FmtVersion.Trim() # The extracted FmtVersion contains a space at the end that isn't actually present, issue #6216
-$FmtRoot = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}";
-
-# Download Folly if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FollyRoot)) {
-	Write-Host "Downloading Folly $FollyVersion"
-	$FollyZip = "$SourceRoot\node_modules\.folly\folly-${FollyVersion}.zip"
-	$FollyDest = "$SourceRoot\node_modules\.folly"
-
-	New-Item $FollyRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/facebook/folly/archive/v$FollyVersion.zip" -OutFile $FollyZip
-	Expand-Archive -LiteralPath $FollyZip -DestinationPath $FollyRoot
-}
-
-# Download Fmt if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FmtRoot)) {
-	Write-Host "Downloading Fmt $FmtVersion"
-	$FmtZip = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}.zip"
-	$FmtDest = "$SourceRoot\node_modules\.fmt"
-
-	New-Item $FmtRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/fmtlib/fmt/archive/refs/tags/$FmtVersion.zip" -OutFile $FmtZip
-	Expand-Archive -LiteralPath $FmtZip -DestinationPath $FmtDest
-}
+$FmtRoot = "$ReactWindowsRoot\external\fmt";
 
 Write-Host "Source root: [$SourceRoot]"
 Write-Host "Destination root: [$TargetRoot]"
@@ -70,13 +44,6 @@ Get-ChildItem -Path $FollyRoot -Name -Recurse -Include $patterns | ForEach-Objec
 	-Force
 }
 
-# Folly overrides
-Get-ChildItem -Path $FollyOverrideRoot -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
-	-Path        $FollyOverrideRoot\$_ `
-	-Destination (New-Item -ItemType Directory $TargetRoot\inc\folly\folly-$FollyVersion\folly\$(Split-Path $_) -Force) `
-	-Force
-}
-
 # Fmt headers
 Get-ChildItem -Path $FmtRoot\include -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
 	-Path        $FmtRoot\include\$_ `
@@ -115,4 +82,4 @@ Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | Fo
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
 
 # Natvis files
-Copy-Item -Force -Path $ReactWindowsRoot\Folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)
+Copy-Item -Force -Path $ReactWindowsRoot\external\folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)

package/Scripts/UnitTest.ps1

@@ -23,7 +23,9 @@ param (
 			"ReactCommon.UnitTests\ReactCommon.UnitTests.exe")
 	),
 
-	[System.IO.FileInfo] $VsTest = "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
+	[System.IO.FileInfo] $VsTest =
+		"$(& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath)\" +
+		"Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
 )
 
 if ($Include.Count) {

package/Scripts/UpdateNightlyDependencies.ps1

@@ -0,0 +1,47 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string] $PackageJsonPath,
+
+    [Parameter(Mandatory = $true)]
+    [string] $ReactNativeVersion,
+
+    [Parameter(Mandatory = $true)]
+    [string] $ReactNativeCliVersion
+)
+
+$ErrorActionPreference = 'Stop'
+
+$packageJson = Get-Content -LiteralPath $PackageJsonPath -Raw | ConvertFrom-Json
+$dependencySections = @(
+    'dependencies',
+    'devDependencies',
+    'optionalDependencies',
+    'peerDependencies',
+    'resolutions'
+)
+
+foreach ($sectionName in $dependencySections) {
+    $section = $packageJson.PSObject.Properties[$sectionName]
+    if ($null -eq $section) {
+        continue
+    }
+
+    foreach ($dependency in $section.Value.PSObject.Properties) {
+        $name = $dependency.Name
+        if ($name -eq 'react-native' -and $dependency.Value -notmatch '\*') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -eq '@react-native/new-app-screen') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -match '^@react-native/.+-(config|preset)$') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -match '^@react-native-community/cli(?:-platform-(?:ios|android))?$') {
+            $dependency.Value = $ReactNativeCliVersion
+        }
+    }
+}
+
+$packageJson | ConvertTo-Json -Depth 100 | Set-Content -LiteralPath $PackageJsonPath -Encoding utf8NoBOM

package/Scripts/creaternwapp.cmd

@@ -72,6 +72,9 @@ if not "%part%"=="" (
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting npm to use verdaccio at http://localhost:4873
+  set NPM_CONFIG_REGISTRY=http://localhost:4873
+  set YARN_NPM_REGISTRY_SERVER=http://localhost:4873
+  set YARN_UNSAFE_HTTP_WHITELIST=localhost
   call npm config set registry http://localhost:4873
 )
 
@@ -103,7 +106,7 @@ if "%R_VERSION%"=="" (
   for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% devDependencies.react') do @set R_VERSION=%%a
 )
 
-@echo creaternwapp.cmd Determining concrete versions for react@%R_VERSION%, react-native@%RN_VERSION%, @react-native-community/cli@%RNCLI_VERSION%, and react-native-windows@%RNW_VERSION% 
+@echo creaternwapp.cmd Determining concrete versions for react@%R_VERSION%, react-native@%RN_VERSION%, @react-native-community/cli@%RNCLI_VERSION%, and react-native-windows@%RNW_VERSION%
 for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% version') do @set RNW_VERSION=%%a
 for /f "delims=" %%a in ('npm show react-native@%RN_VERSION% version') do @set RN_VERSION=%%a
 for /f "delims=" %%a in ('npm show @react-native-community/cli@%RNCLI_VERSION% version') do @set RNCLI_VERSION=%%a
@@ -132,29 +135,37 @@ pushd "%APP_NAME%"
 
 if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   @echo creaternwapp.cmd Fixing react-native nightly issues
-  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/new-app-screen"": "".*""', '""@react-native/new-app-screen"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  call pwsh.exe -NoProfile -File "%RNW_ROOT%\vnext\Scripts\UpdateNightlyDependencies.ps1" -PackageJsonPath package.json -ReactNativeVersion "%RN_VERSION%" -ReactNativeCliVersion "%RNCLI_VERSION%"
+  if errorlevel 1 goto :failure
 )
 
 @echo creaternwapp.cmd: Calling yarn install
 call yarn install
+if errorlevel 1 goto :failure
 
 @echo creaternwapp.cmd: Creating commit to save current state
-if not exist ".git\" call git init .
+if not exist ".git\" (
+  call git init .
+  if errorlevel 1 goto :failure
+)
+call git config user.name "React-Native-Windows Bot"
+if errorlevel 1 goto :failure
+call git config user.email "53619745+rnbot@users.noreply.github.com"
+if errorlevel 1 goto :failure
 call git add .
+if errorlevel 1 goto :failure
 call git commit -m "npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true"
+if errorlevel 1 goto :failure
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting yarn to use verdaccio at http://localhost:4873
-  call yarn config set registry http://localhost:4873
   call yarn config set npmRegistryServer http://localhost:4873
   call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
 )
 
 @echo creaternwapp.cmd: Adding RNW dependency to app
 call yarn add react-native-windows@%RNW_VERSION%
+if errorlevel 1 goto :failure
 
 if %LINK_RNW% equ 1 (
   @echo creaternwapp.cmd: Linking RNW dependency to local repo
@@ -170,18 +181,30 @@ if %LINK_RNW% equ 1 (
 
 @echo creaternwapp.cmd: Calling yarn install
 call yarn install
+if errorlevel 1 goto :failure
 
 @echo creaternwapp.cmd: Creating commit to save current state
 call git add .
+if errorlevel 1 goto :failure
 call git commit -m "add rnw dependency"
+if errorlevel 1 goto :failure
+
+@echo creaternwapp.cmd Running init-windows with the project-installed React Native CLI
+call node "%RNW_ROOT%\vnext\Scripts\RunRnwInitWindows.js" "%RNW_TEMPLATE_TYPE%"
 
-@echo creaternwapp.cmd Running init-windows with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
-call npx --yes @react-native-community/cli@%RNCLI_VERSION% init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
+if %ERRORLEVEL% neq 0 (
+  @echo creaternwapp.cmd: Unable to initialize Windows project
+  goto :failure
+)
 
 @echo creaternwapp.cmd Done, see new %RNW_TEMPLATE_TYPE% project in %CD% with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
+set EXIT_CODE=0
+goto :done
 
-popd
+:failure
+set EXIT_CODE=%ERRORLEVEL%
 
-endlocal
+:done
+popd
 
-exit /b %ERRORLEVEL%
+endlocal & exit /b %EXIT_CODE%