react-native-windows 0.81.22 → 0.81.25

package/Common/Common.vcxproj

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}</ProjectGuid>
-    <ProjectName>Common</ProjectName>
+    <ProjectGuid Condition="'$(ReactTargetWin32)' != 'true'">{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}</ProjectGuid>
+    <ProjectName Condition="'$(ReactTargetWin32)' != 'true'">Common</ProjectName>
     <Keyword>StaticLibrary</Keyword>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <AppContainerApplication Condition="'$(ReactTargetWin32)' != 'true'">true</AppContainerApplication>
+    <ApplicationType Condition="'$(ReactTargetWin32)' != 'true'">Windows Store</ApplicationType>
+    <ApplicationTypeRevision Condition="'$(ReactTargetWin32)' != 'true'">10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
@@ -56,6 +56,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" Condition="'$(ReactTargetWin32)' == 'true'" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>

package/Common/Common.win32.vcxproj

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{07B21646-07A1-4C53-9D5C-FE7C8C9FA5C6}</ProjectGuid>
+    <ProjectName>Common.win32</ProjectName>
+    <Keyword>StaticLibrary</Keyword>
+    <ReactTargetWin32>true</ReactTargetWin32>
+    <NuGetLockFilePath>.\packages.lock.win32.json</NuGetLockFilePath>
+  </PropertyGroup>
+  <Import Project="Common.vcxproj" />
+</Project>

package/Common/packages.lock.win32.json

@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "dependencies": {
+    "native,Version=v0.0": {
+      "boost": {
+        "type": "Direct",
+        "requested": "[1.84.0, )",
+        "resolved": "1.84.0",
+        "contentHash": "4el2YP3cNJDVFPdzOso+LxGvdWP2rHxML4siq8VdonNypW2m4q503tHfCj6vK0L1UfxioE2hpFGb4ITEua73tg=="
+      },
+      "Microsoft.Windows.CppWinRT": {
+        "type": "Direct",
+        "requested": "[2.0.230706.1, )",
+        "resolved": "2.0.230706.1",
+        "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
+      }
+    },
+    "native,Version=v0.0/win": {},
+    "native,Version=v0.0/win-arm64": {},
+    "native,Version=v0.0/win-x64": {},
+    "native,Version=v0.0/win-x86": {}
+  }
+}

package/Folly/Folly.vcxproj

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{a990658c-ce31-4bcc-976f-0fc6b1af693d}</ProjectGuid>
+    <ProjectGuid Condition="'$(ReactTargetWin32)' != 'true'">{a990658c-ce31-4bcc-976f-0fc6b1af693d}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
-    <ProjectName>Folly</ProjectName>
+    <ProjectName Condition="'$(ReactTargetWin32)' != 'true'">Folly</ProjectName>
     <RootNamespace>Folly</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType Condition="'$(ReactTargetWin32)' != 'true'">Windows Store</ApplicationType>
+    <ApplicationTypeRevision Condition="'$(ReactTargetWin32)' != 'true'">10.0</ApplicationTypeRevision>
+    <AppContainerApplication Condition="'$(ReactTargetWin32)' != 'true'">true</AppContainerApplication>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
@@ -259,6 +259,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" Condition="'$(ReactTargetWin32)' == 'true'" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -268,6 +269,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FastFloatDir)\include;$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -372,7 +374,10 @@
     <Message Importance="High" Text="Applying temporary patches to folly." />
     <Copy DestinationFiles="@(TemporaryFollyPatchFiles->'$(FollyDir)folly\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(TemporaryFollyPatchFiles)" />
   </Target>
-  <ItemGroup>
-    <ProjectReference Include="..\fmt\fmt.vcxproj" Project="{14b93DC8-FD93-4A6D-81CB-8BC96644501C}" />
+  <ItemGroup Condition="'$(ReactTargetWin32)' != 'true'">
+    <ProjectReference Include="..\fmt\fmt.vcxproj" Project="{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ReactTargetWin32)' == 'true'">
+    <ProjectReference Include="..\fmt\fmt.win32.vcxproj" Project="{4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}" />
   </ItemGroup>
 </Project>

package/Folly/Folly.win32.vcxproj

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}</ProjectGuid>
+    <ProjectName>Folly.win32</ProjectName>
+    <Keyword>StaticLibrary</Keyword>
+    <ReactTargetWin32>true</ReactTargetWin32>
+    <NuGetLockFilePath>.\packages.lock.win32.json</NuGetLockFilePath>
+  </PropertyGroup>
+  <Import Project="Folly.vcxproj" />
+</Project>

package/Folly/packages.lock.win32.json

@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "dependencies": {
+    "native,Version=v0.0": {
+      "boost": {
+        "type": "Direct",
+        "requested": "[1.84.0, )",
+        "resolved": "1.84.0",
+        "contentHash": "4el2YP3cNJDVFPdzOso+LxGvdWP2rHxML4siq8VdonNypW2m4q503tHfCj6vK0L1UfxioE2hpFGb4ITEua73tg=="
+      },
+      "fmt.win32": {
+        "type": "Project"
+      }
+    },
+    "native,Version=v0.0/win": {},
+    "native,Version=v0.0/win-arm64": {},
+    "native,Version=v0.0/win-x64": {},
+    "native,Version=v0.0/win-x86": {}
+  }
+}

package/Microsoft.ReactNative/CallInvoker.cpp

@@ -19,13 +19,23 @@ CallInvoker::CallInvoker(
     : m_callInvoker(callInvoker), m_context(&reactContext) {}
 
 void CallInvoker::InvokeAsync(CallFunc func) noexcept {
-  m_callInvoker->invokeAsync(
-      [reactContext = m_context, func](facebook::jsi::Runtime & /*runtime*/) { func(reactContext->JsiRuntime()); });
+  m_callInvoker->invokeAsync([reactContext = m_context, func](facebook::jsi::Runtime & /*runtime*/) {
+    auto runtime = reactContext->JsiRuntime();
+    if (!runtime)
+      return;
+
+    func(runtime);
+  });
 }
 
 void CallInvoker::InvokeSync(CallFunc func) noexcept {
-  m_callInvoker->invokeSync(
-      [reactContext = m_context, func](facebook::jsi::Runtime & /*runtime*/) { func(reactContext->JsiRuntime()); });
+  m_callInvoker->invokeSync([reactContext = m_context, func](facebook::jsi::Runtime & /*runtime*/) {
+    auto runtime = reactContext->JsiRuntime();
+    if (!runtime)
+      return;
+
+    func(runtime);
+  });
 }
 
 winrt::Microsoft::ReactNative::CallInvoker CallInvoker::FromProperties(

package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp

@@ -149,11 +149,13 @@ facebook::react::SharedViewEventEmitter ParagraphComponentView::eventEmitterAtPo
       uint32_t textPosition = metrics.textPosition;
 
       for (auto fragment : m_attributedStringBox.getValue().getFragments()) {
-        if (textPosition < fragment.string.length()) {
+        uint32_t utf16Length =
+            static_cast<uint32_t>(::Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string).length());
+        if (textPosition < utf16Length) {
           return std::static_pointer_cast<const facebook::react::ViewEventEmitter>(
               fragment.parentShadowView.eventEmitter);
         }
-        textPosition -= static_cast<uint32_t>(fragment.string.length());
+        textPosition -= utf16Length;
       }
     }
   }
@@ -206,10 +208,12 @@ bool ParagraphComponentView::IsTextSelectableAtPoint(facebook::react::Point pt)
 
       // Finds which fragment contains this text position
       for (auto fragment : m_attributedStringBox.getValue().getFragments()) {
-        if (textPosition < fragment.string.length()) {
+        uint32_t utf16Length =
+            static_cast<uint32_t>(::Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string).length());
+        if (textPosition < utf16Length) {
           return true;
         }
-        textPosition -= static_cast<uint32_t>(fragment.string.length());
+        textPosition -= utf16Length;
       }
     }
   }

package/Microsoft.ReactNative/Fabric/Composition/TextDrawing.cpp

@@ -66,7 +66,7 @@ void RenderText(
   unsigned int position = 0;
   unsigned int length = 0;
   for (auto fragment : attributedString.getFragments()) {
-    length = static_cast<UINT32>(fragment.string.length());
+    length = static_cast<UINT32>(::Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string).length());
     DWRITE_TEXT_RANGE range = {position, length};
     if (fragment.textAttributes.foregroundColor &&
             (fragment.textAttributes.foregroundColor != textAttributes.foregroundColor) ||

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

@@ -262,7 +262,7 @@ void WindowsTextLayoutManager::GetTextLayout(
       attachments.push_back(attachment);
       position += 1;
     } else {
-      unsigned int length = static_cast<UINT32>(fragment.string.length());
+      unsigned int length = static_cast<UINT32>(Microsoft::Common::Unicode::Utf8ToUtf16(fragment.string).length());
       DWRITE_TEXT_RANGE range = {position, length};
       TextAttributes attributes = fragment.textAttributes;
       DWRITE_FONT_STYLE fragmentStyle = DWRITE_FONT_STYLE_NORMAL;

package/Microsoft.ReactNative/Utils/IcuUtils.cpp

@@ -3,10 +3,57 @@
 
 #include "pch.h"
 #include "IcuUtils.h"
+
+#include <cwctype>
+
+#include <winrt/Windows.Data.Text.h>
+#include <winrt/Windows.Foundation.Collections.h>
+
 #include <icu.h>
 
 namespace Microsoft::ReactNative::IcuUtils {
 
+namespace {
+
+// icu.dll ships in Windows 10 1903+. Desktop.DLL delay-loads it so that the
+// react-native-win32.dll can still load on older Windows versions (e.g. 1809).
+// Probe once per process to decide whether ICU calls are safe.
+bool IsIcuDllAvailable() noexcept {
+  static const bool s_available = []() noexcept {
+    const HMODULE hIcu = ::LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+    return hIcu != nullptr;
+  }();
+  return s_available;
+}
+
+std::vector<std::pair<int32_t, int32_t>> ComputeBoundariesWithWinrt(const wchar_t *text, int32_t length) noexcept {
+  std::vector<std::pair<int32_t, int32_t>> boundaries;
+  try {
+    winrt::Windows::Data::Text::WordsSegmenter segmenter{L""};
+    const winrt::hstring src{text, static_cast<uint32_t>(length)};
+    for (const auto &token : segmenter.GetTokens(src)) {
+      const auto seg = token.SourceTextSegment();
+      const int32_t start = static_cast<int32_t>(seg.StartPosition);
+      const int32_t end = start + static_cast<int32_t>(seg.Length);
+      boundaries.emplace_back(start, end);
+    }
+  } catch (const winrt::hresult_error &) {
+    boundaries.clear();
+  }
+  return boundaries;
+}
+
+bool IsAlphanumericFallback(UChar32 codePoint) noexcept {
+  // Treat supplementary-plane code points as non-alphanumeric in the fallback;
+  // this matches the degraded behavior expected when ICU is unavailable.
+  if (codePoint < 0 || codePoint > 0xFFFF) {
+    return false;
+  }
+  return std::iswalnum(static_cast<wint_t>(codePoint)) != 0;
+}
+
+} // namespace
+
 void UBreakIteratorDeleter::operator()(void *ptr) const noexcept {
   if (ptr) {
     ubrk_close(static_cast<UBreakIterator *>(ptr));
@@ -14,46 +61,69 @@ void UBreakIteratorDeleter::operator()(void *ptr) const noexcept {
 }
 
 WordBreakIterator::WordBreakIterator(const wchar_t *text, int32_t length) noexcept : m_length(length) {
-  UErrorCode status = U_ZERO_ERROR;
-  auto *iter = ubrk_open(UBRK_WORD, nullptr, reinterpret_cast<const UChar *>(text), length, &status);
-  if (U_SUCCESS(status)) {
-    m_breakIterator.reset(static_cast<void *>(iter));
+  if (!text || length <= 0) {
+    return;
+  }
+
+  if (IsIcuDllAvailable()) {
+    UErrorCode status = U_ZERO_ERROR;
+    auto *iter = ubrk_open(UBRK_WORD, nullptr, reinterpret_cast<const UChar *>(text), length, &status);
+    if (U_SUCCESS(status)) {
+      m_breakIterator.reset(static_cast<void *>(iter));
+    }
+    return;
   }
+
+  m_winrtBoundaries = ComputeBoundariesWithWinrt(text, length);
 }
 
 bool WordBreakIterator::IsValid() const noexcept {
-  return m_breakIterator != nullptr;
+  return m_breakIterator != nullptr || !m_winrtBoundaries.empty();
 }
 
 bool WordBreakIterator::GetWordBoundaries(int32_t position, int32_t &outStart, int32_t &outEnd) const noexcept {
-  if (!m_breakIterator || position < 0 || position >= m_length) {
+  if (position < 0 || position >= m_length) {
     return false;
   }
 
-  auto *iter = static_cast<UBreakIterator *>(m_breakIterator.get());
+  if (m_breakIterator) {
+    auto *iter = static_cast<UBreakIterator *>(m_breakIterator.get());
 
-  int32_t start = ubrk_preceding(iter, position + 1);
-  if (start == UBRK_DONE) {
-    start = 0;
-  }
+    int32_t start = ubrk_preceding(iter, position + 1);
+    if (start == UBRK_DONE) {
+      start = 0;
+    }
 
-  int32_t end = ubrk_following(iter, position);
-  if (end == UBRK_DONE) {
-    end = m_length;
-  }
+    int32_t end = ubrk_following(iter, position);
+    if (end == UBRK_DONE) {
+      end = m_length;
+    }
 
-  int32_t ruleStatus = ubrk_getRuleStatus(iter);
-  if (ruleStatus == UBRK_WORD_NONE) {
-    return false;
+    int32_t ruleStatus = ubrk_getRuleStatus(iter);
+    if (ruleStatus == UBRK_WORD_NONE) {
+      return false;
+    }
+
+    outStart = start;
+    outEnd = end;
+    return true;
   }
 
-  outStart = start;
-  outEnd = end;
-  return true;
+  for (const auto &[start, end] : m_winrtBoundaries) {
+    if (position >= start && position < end) {
+      outStart = start;
+      outEnd = end;
+      return true;
+    }
+  }
+  return false;
 }
 
 bool IsAlphanumeric(UChar32 codePoint) noexcept {
-  return u_isalnum(codePoint) != 0;
+  if (IsIcuDllAvailable()) {
+    return u_isalnum(codePoint) != 0;
+  }
+  return IsAlphanumericFallback(codePoint);
 }
 
 UChar32 GetCodePointAt(const wchar_t *str, int32_t length, int32_t pos) noexcept {

package/Microsoft.ReactNative/Utils/IcuUtils.h

@@ -5,6 +5,8 @@
 
 #include <cstdint>
 #include <memory>
+#include <utility>
+#include <vector>
 
 // ICU utilities wrapped in a namespace to avoid UChar naming conflicts with Folly's FBString.
 // Folly has a template parameter named 'UChar' which conflicts with ICU's global UChar typedef.
@@ -31,6 +33,9 @@ class WordBreakIterator {
 
  private:
   std::unique_ptr<void, UBreakIteratorDeleter> m_breakIterator{nullptr};
+  // Populated when icu.dll is unavailable (Windows < 1903); produced by
+  // Windows.Data.Text.WordsSegmenter, sorted as [start, end) ranges.
+  std::vector<std::pair<int32_t, int32_t>> m_winrtBoundaries;
   int32_t m_length = 0;
 };
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.22</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.81.25</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>22</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>25</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>aaa05f5c3491ec4f2d62cb630b7ae51cd6a0f750</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>add8cef8a9c2f2487a2838e0f8660018435e59c2</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/HybridCRT.props

@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!--
+  Hybrid CRT: Uses static C++ runtime with dynamic Universal CRT to avoid VCRUNTIME140[d].dll and MSVCP140[d].dll dependency.
+  See: https://github.com/microsoft/WindowsAppSDK/blob/main/docs/Coding-Guidelines/HybridCRT.md
+-->
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-		<ClCompile>
-			<!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-		</ClCompile>
-		<Link>
-			<!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
            lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
            supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
            than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-			<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-			<AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-		</Link>
-	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-		<ClCompile>
-			<!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-		</ClCompile>
-		<Link>
-			<!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
            lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
            supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
            than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-			<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-			<AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-		</Link>
-	</ItemDefinitionGroup>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
 
 </Project>

package/PropertySheets/Warnings.props

@@ -65,8 +65,11 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <!-- /permissive- by default to enforce standards conformance, unless ENABLEPermissive has been set -->
-      <AdditionalOptions Condition="'$(ENABLEPermissive)' == ''">/permissive- %(AdditionalOptions)</AdditionalOptions>
+      <!-- /permissive- by default to enforce standards conformance, unless ENABLEPermissive has been set.
+           Set via ConformanceMode rather than AdditionalOptions so MSBuild's cl task handles it
+           structurally; passing /permissive- through AdditionalOptions embeds the raw flag in .obj
+           metadata, which the LTCG p2 back-end in newer VS 2022 toolsets rejects with C1007. -->
+      <ConformanceMode Condition="'$(ENABLEPermissive)' == ''">true</ConformanceMode>
       <DisableSpecificWarnings>$(OfficePreDisabledWarnings);$(ExtraWarningsToDisable);$(DisableSpecificWarnings)</DisableSpecificWarnings>
       
       <!-- SDL REQUIREMENT: Treat warnings as errors -->

package/ReactCommon/ReactCommon.vcxproj

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</ProjectGuid>
+    <ProjectGuid Condition="'$(ReactTargetWin32)' != 'true'">{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
-    <ProjectName>ReactCommon</ProjectName>
+    <ProjectName Condition="'$(ReactTargetWin32)' != 'true'">ReactCommon</ProjectName>
     <RootNamespace>ReactCommon</RootNamespace>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <AppContainerApplication Condition="'$(ReactTargetWin32)' != 'true'">true</AppContainerApplication>
+    <ApplicationType Condition="'$(ReactTargetWin32)' != 'true'">Windows Store</ApplicationType>
+    <ApplicationTypeRevision Condition="'$(ReactTargetWin32)' != 'true'">10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
@@ -57,6 +57,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" Condition="'$(ReactTargetWin32)' == 'true'" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -66,6 +67,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>
@@ -243,11 +245,16 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(ReactTargetWin32)' != 'true'">
     <ProjectReference Include="..\Folly\Folly.vcxproj">
       <Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup Condition="'$(ReactTargetWin32)' == 'true'">
+    <ProjectReference Include="..\Folly\Folly.win32.vcxproj">
+      <Project>{BFF1EAC8-4C70-4A55-9A88-3810052E8FBA}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />

package/ReactCommon/ReactCommon.win32.vcxproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5CB3C038-4A3C-4F09-A36B-66DB8EC650F5}</ProjectGuid>
+    <ProjectName>ReactCommon.win32</ProjectName>
+    <Keyword>StaticLibrary</Keyword>
+    <ReactTargetWin32>true</ReactTargetWin32>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NuGetLockFilePath>.\packages.lock.win32.json</NuGetLockFilePath>
+  </PropertyGroup>
+  <Import Project="ReactCommon.vcxproj" />
+</Project>

package/ReactCommon/packages.lock.win32.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "dependencies": {
+    "native,Version=v0.0": {
+      "boost": {
+        "type": "Direct",
+        "requested": "[1.84.0, )",
+        "resolved": "1.84.0",
+        "contentHash": "4el2YP3cNJDVFPdzOso+LxGvdWP2rHxML4siq8VdonNypW2m4q503tHfCj6vK0L1UfxioE2hpFGb4ITEua73tg=="
+      },
+      "Microsoft.Windows.CppWinRT": {
+        "type": "Direct",
+        "requested": "[2.0.230706.1, )",
+        "resolved": "2.0.230706.1",
+        "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
+      },
+      "fmt.win32": {
+        "type": "Project"
+      },
+      "folly.win32": {
+        "type": "Project",
+        "dependencies": {
+          "boost": "[1.84.0, )",
+          "fmt.win32": "[1.0.0, )"
+        }
+      }
+    },
+    "native,Version=v0.0/win": {},
+    "native,Version=v0.0/win-arm64": {},
+    "native,Version=v0.0/win-x64": {},
+    "native,Version=v0.0/win-x86": {}
+  }
+}

package/fmt/fmt.vcxproj

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{14b93dc8-fd93-4a6d-81cb-8bc96644501c}</ProjectGuid>
+    <ProjectGuid Condition="'$(ReactTargetWin32)' != 'true'">{14b93dc8-fd93-4a6d-81cb-8bc96644501c}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
-    <ProjectName>fmt</ProjectName>
+    <ProjectName Condition="'$(ReactTargetWin32)' != 'true'">fmt</ProjectName>
     <RootNamespace>fmt</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <AppContainerApplication Condition="'$(ReactTargetWin32)' != 'true'">true</AppContainerApplication>
+    <ApplicationType Condition="'$(ReactTargetWin32)' != 'true'">Windows Store</ApplicationType>
+    <ApplicationTypeRevision Condition="'$(ReactTargetWin32)' != 'true'">10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
@@ -80,6 +80,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ReactNativeWindowsDir)PropertySheets\HybridCRT.props" Condition="'$(ReactTargetWin32)' == 'true'" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -89,6 +90,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/fmt/fmt.win32.vcxproj

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4A98E8E8-F0B2-4F45-8A0E-9F4C7A81A239}</ProjectGuid>
+    <ProjectName>fmt.win32</ProjectName>
+    <Keyword>StaticLibrary</Keyword>
+    <ReactTargetWin32>true</ReactTargetWin32>
+  </PropertyGroup>
+  <Import Project="fmt.vcxproj" />
+</Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.81.22",
+  "version": "0.81.25",
   "license": "MIT",
   "repository": {
     "type": "git",

package/templates/cpp-app/windows/MyApp/MyApp.cpp

@@ -40,18 +40,21 @@ _Use_decl_annotations_ int CALLBACK WinMain(HINSTANCE instance, HINSTANCE, PSTR
   // Register any native modules defined within this app project
   settings.PackageProviders().Append(winrt::make<CompReactPackageProvider>());
 
-#if BUNDLE
-  // Load the JS bundle from a file (not Metro):
+    // When loading the JS bundle from a file (not Metro):
   // Set the path (on disk) where the .bundle file is located
   settings.BundleRootPath(std::wstring(L"file://").append(appDirectory).append(L"\\Bundle\\").c_str());
+
   // Set the name of the bundle file (without the .bundle extension)
   settings.JavaScriptBundleFile(L"index.windows");
-  // Disable hot reload
+
+  // JS Entry file to use when loading from Metro:
+  settings.DebugBundlePath(L"index");
+
+#if BUNDLE
+  // Disable hot reload - bundle will be loaded from prebuilt bundle file.
   settings.UseFastRefresh(false);
 #else
-  // Load the JS bundle from Metro
-  settings.JavaScriptBundleFile(L"index");
-  // Enable hot reload
+  // Enable hot reload - load the JS bundle from Metro
   settings.UseFastRefresh(true);
 #endif
 #if _DEBUG