react-native-windows 0.81.26 → 0.81.28

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -10,7 +10,7 @@
     <ProjectName>Microsoft.ReactNative</ProjectName>
     <RootNamespace>Microsoft.ReactNative</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>18.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
@@ -96,7 +96,8 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>/await %(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
+      <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <AdditionalIncludeDirectories>
         $(FmtDir)\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -1108,7 +1108,8 @@ void NativeUIManager::findSubviewIn(
   xaml::FrameworkElement foundElement = nullptr;
 
   for (const auto &elem : hitTestElements) {
-    if (foundElement = elem.try_as<xaml::FrameworkElement>()) {
+    if (const auto candidate = elem.try_as<xaml::FrameworkElement>()) {
+      foundElement = candidate;
       auto tag = GetTag(foundElement);
       if (tag != InvalidTag) {
         foundTag = tag;

package/Microsoft.ReactNative/ReactNativeAppBuilder.idl

@@ -3,6 +3,7 @@ import "ReactNativeHost.idl";
 import "ReactNativeIsland.idl";
 import "ReactInstanceSettings.idl";
 import "IReactPackageProvider.idl";
+import "ReactNativeWindow.idl";
 
 #include "DocString.h"
 
@@ -14,6 +15,8 @@ namespace Microsoft.ReactNative {
         // Properties
         Microsoft.UI.Windowing.AppWindow AppWindow {get;};
 
+        ReactNativeWindow ReactNativeWindow {get;};
+
         ReactNativeHost ReactNativeHost {get;};
 
         ReactViewOptions ReactViewOptions {get;};

package/Microsoft.ReactNative/Utils/LocalBundleReader.cpp

@@ -54,7 +54,29 @@ std::string GetBundleFromEmbeddedResource(const winrt::Windows::Foundation::Uri
   return std::string(start, start + size);
 }
 
-std::future<std::string> LocalBundleReader::LoadBundleAsync(const std::wstring bundleUri) {
+namespace {
+
+std::string BufferToString(const winrt::Windows::Storage::Streams::IBuffer &buffer) {
+  std::string result(buffer.Length(), '\0');
+  if (!result.empty()) {
+    auto reader = winrt::Windows::Storage::Streams::DataReader::FromBuffer(buffer);
+    reader.ReadBytes(winrt::array_view<uint8_t>{
+        reinterpret_cast<uint8_t *>(&result[0]), reinterpret_cast<uint8_t *>(&result[result.length()])});
+  }
+  return result;
+}
+
+winrt::Windows::Storage::Streams::IBuffer BytesToBuffer(const void *data, uint32_t size) {
+  winrt::Windows::Storage::Streams::DataWriter writer;
+  auto bytes = static_cast<const uint8_t *>(data);
+  writer.WriteBytes(winrt::array_view<const uint8_t>(bytes, bytes + size));
+  return writer.DetachBuffer();
+}
+
+} // namespace
+
+winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IBuffer>
+LocalBundleReader::LoadBundleAsync(const std::wstring bundleUri) {
   try {
     co_await winrt::resume_background();
 
@@ -66,41 +88,26 @@ std::future<std::string> LocalBundleReader::LoadBundleAsync(const std::wstring b
       file = co_await winrt::Windows::Storage::StorageFile::GetFileFromApplicationUriAsync(uri);
     } else if (bundleUri.starts_with(L"resource://")) {
       winrt::Windows::Foundation::Uri uri(bundleUri);
-      co_return GetBundleFromEmbeddedResource(uri);
+      auto bytes = GetBundleFromEmbeddedResource(uri);
+      co_return BytesToBuffer(bytes.data(), static_cast<uint32_t>(bytes.size()));
     } else {
       file = co_await winrt::Windows::Storage::StorageFile::GetFileFromPathAsync(bundleUri);
     }
 
-    // Read the buffer manually to avoid a Utf8 -> Utf16 -> Utf8 encoding
-    // roundtrip.
-    auto fileBuffer{co_await winrt::Windows::Storage::FileIO::ReadBufferAsync(file)};
-    auto dataReader{winrt::Windows::Storage::Streams::DataReader::FromBuffer(fileBuffer)};
-
-    // No need to use length + 1, STL guarantees that string storage is null-terminated.
-    std::string script(fileBuffer.Length(), '\0');
-
-    // Construct the array_view to slice into the first fileBuffer.Length bytes.
-    // DataReader.ReadBytes will read as many bytes as are present in the
-    // array_view. The backing string has fileBuffer.Length() + 1 bytes, without
-    // an explicit end it will read 1 byte to many and throw.
-    dataReader.ReadBytes(winrt::array_view<uint8_t>{
-        reinterpret_cast<uint8_t *>(&script[0]), reinterpret_cast<uint8_t *>(&script[script.length()])});
-    dataReader.Close();
-
-    co_return script;
+    co_return co_await winrt::Windows::Storage::FileIO::ReadBufferAsync(file);
   }
   // RuntimeScheduler only handles std::exception or jsi::JSError
-  catch (winrt::hresult_error const &e) {
-    throw std::exception(winrt::to_string(e.message()).c_str());
+  catch (winrt::hresult_error const &) {
+    throw;
   }
 }
 
 std::string LocalBundleReader::LoadBundle(const std::wstring &bundlePath) {
-  return LoadBundleAsync(bundlePath).get();
+  return BufferToString(LoadBundleAsync(bundlePath).get());
 }
 
 StorageFileBigString::StorageFileBigString(const std::wstring &path) {
-  m_futureBuffer = LocalBundleReader::LoadBundleAsync(path);
+  m_pendingLoad = LocalBundleReader::LoadBundleAsync(path);
 }
 
 bool StorageFileBigString::isAscii() const {
@@ -118,8 +125,9 @@ size_t StorageFileBigString::size() const {
 }
 
 void StorageFileBigString::ensure() const {
-  if (m_string.empty()) {
-    m_string = m_futureBuffer.get();
+  if (m_pendingLoad) {
+    m_string = BufferToString(m_pendingLoad.get());
+    m_pendingLoad = nullptr;
   }
 }
 

package/Microsoft.ReactNative/Utils/LocalBundleReader.h

@@ -3,14 +3,16 @@
 
 #pragma once
 #include <cxxreact/JSBigString.h>
-#include <future>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Storage.Streams.h>
 #include <string>
 
 namespace Microsoft::ReactNative {
 
 class LocalBundleReader {
  public:
-  static std::future<std::string> LoadBundleAsync(const std::wstring bundlePath);
+  static winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IBuffer> LoadBundleAsync(
+      const std::wstring bundlePath);
   static std::string LoadBundle(const std::wstring &bundlePath);
 };
 
@@ -24,7 +26,7 @@ class StorageFileBigString : public facebook::react::JSBigString {
   void ensure() const;
 
  private:
-  mutable std::future<std::string> m_futureBuffer;
+  mutable winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IBuffer> m_pendingLoad;
   mutable std::string m_string;
 };
 

package/Microsoft.ReactNative/Utils/PropertyUtils.h

@@ -161,7 +161,7 @@ bool TryUpdateForeground(
     const std::string &propertyName,
     const winrt::Microsoft::ReactNative::JSValue &propertyValue) {
   if (propertyName == "color") {
-    auto uielement = element.try_as<xaml::UIElement>();
+    auto uielement = element.template try_as<xaml::UIElement>();
     if (IsValidColorValue(propertyValue)) {
       const auto brush = BrushFrom(propertyValue);
       element.Foreground(brush);

package/Microsoft.ReactNative/Utils/UwpScriptStore.cpp

@@ -4,7 +4,6 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Storage.FileProperties.h>
 #include <winrt/Windows.Storage.h>
-#include <future>
 #include "Unicode.h"
 
 namespace winrt {
@@ -43,7 +42,8 @@ facebook::jsi::ScriptVersion_t UwpScriptStore::getScriptVersion(const std::strin
   return version;
 }
 
-std::future<facebook::jsi::ScriptVersion_t> UwpScriptStore::getScriptVersionAsync(const std::string &bundleUri) {
+winrt::Windows::Foundation::IAsyncOperation<facebook::jsi::ScriptVersion_t> UwpScriptStore::getScriptVersionAsync(
+    const std::string &bundleUri) {
   co_await winrt::resume_background();
 
   const winrt::hstring fileUrl(Microsoft::Common::Unicode::Utf8ToUtf16("ms-appx:///Bundle/" + bundleUri + ".bundle"));

package/Microsoft.ReactNative/Utils/UwpScriptStore.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <JSI/ScriptStore.h>
-#include <future>
+#include <winrt/Windows.Foundation.h>
 
 namespace Microsoft::ReactNative {
 
@@ -16,7 +16,8 @@ class UwpScriptStore : public facebook::jsi::ScriptStore {
   static facebook::jsi::ScriptVersion_t GetFileVersion(const std::wstring &filePath);
 
  private:
-  std::future<facebook::jsi::ScriptVersion_t> getScriptVersionAsync(const std::string &bundleUri);
+  winrt::Windows::Foundation::IAsyncOperation<facebook::jsi::ScriptVersion_t> getScriptVersionAsync(
+      const std::string &bundleUri);
 };
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/FrameworkElementViewManager.cpp

@@ -250,7 +250,7 @@ bool FrameworkElementViewManager::UpdateProperty(
 
           if (!element.IsLoaded()) {
             element.Loaded([=](auto sender, auto &&) -> auto{
-              ApplyTransformMatrix(sender.as<xaml::UIElement>(), nodeToUpdate, transformMatrix);
+              ApplyTransformMatrix(sender.template as<xaml::UIElement>(), nodeToUpdate, transformMatrix);
             });
           } else {
             ApplyTransformMatrix(element, nodeToUpdate, transformMatrix);

package/Microsoft.ReactNative/Views/ScrollViewManager.cpp

@@ -115,7 +115,7 @@ void ScrollViewShadowNode::createView(const winrt::Microsoft::ReactNative::JSVal
 
   m_scrollViewerViewChangedRevoker = scrollViewer.ViewChanged(
       winrt::auto_revoke, [this, scrollViewUWPImplementation](const auto &sender, const auto & /*args*/) {
-        const auto scrollViewerNotNull{sender.as<winrt::ScrollViewer>()};
+        const auto scrollViewerNotNull{sender.template as<winrt::ScrollViewer>()};
         const auto zoomFactor{scrollViewerNotNull.ZoomFactor()};
         if (m_zoomFactor != zoomFactor) {
           m_zoomFactor = zoomFactor;
@@ -238,7 +238,7 @@ void ScrollViewShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSVal
 void ScrollViewShadowNode::AddHandlers(const winrt::ScrollViewer &scrollViewer) {
   m_scrollViewerViewChangingRevoker =
       scrollViewer.ViewChanging(winrt::auto_revoke, [this](const auto &sender, const auto &args) {
-        const auto scrollViewerNotNull = sender.as<winrt::ScrollViewer>();
+        const auto scrollViewerNotNull = sender.template as<winrt::ScrollViewer>();
 
         // If we are transitioning to inertial scrolling.
         if (m_isScrolling && !m_isScrollingFromInertia && args.IsInertial()) {
@@ -281,7 +281,7 @@ void ScrollViewShadowNode::AddHandlers(const winrt::ScrollViewer &scrollViewer)
           m_SIPEventHandler->TryHide();
         }
 
-        const auto scrollViewer = sender.as<winrt::ScrollViewer>();
+        const auto scrollViewer = sender.template as<winrt::ScrollViewer>();
         EmitScrollEvent(
             scrollViewer,
             m_tag,
@@ -294,7 +294,7 @@ void ScrollViewShadowNode::AddHandlers(const winrt::ScrollViewer &scrollViewer)
 
   m_scrollViewerDirectManipulationCompletedRevoker =
       scrollViewer.DirectManipulationCompleted(winrt::auto_revoke, [this](const auto &sender, const auto &) {
-        const auto scrollViewer = sender.as<winrt::ScrollViewer>();
+        const auto scrollViewer = sender.template as<winrt::ScrollViewer>();
         if (m_isScrollingFromInertia) {
           EmitScrollEvent(
               scrollViewer,
@@ -320,7 +320,7 @@ void ScrollViewShadowNode::AddHandlers(const winrt::ScrollViewer &scrollViewer)
       });
   m_controlLoadedRevoker = scrollViewer.Loaded(winrt::auto_revoke, [this](const auto &sender, const auto &) {
     if (m_changeViewAfterLoaded) {
-      const auto scrollViewer = sender.as<winrt::ScrollViewer>();
+      const auto scrollViewer = sender.template as<winrt::ScrollViewer>();
       scrollViewer.ChangeView(nullptr, nullptr, static_cast<float>(m_zoomFactor));
       m_changeViewAfterLoaded = false;
     }

package/Microsoft.ReactNative/Views/TextViewManager.cpp

@@ -166,7 +166,7 @@ class TextShadowNode final : public ShadowNodeBase {
 
       m_selectionChangedRevoker = xamlView.as<xaml::Controls::TextBlock>().SelectionChanged(
           winrt::auto_revoke, [selectionChanged = this->selectionChanged](const auto &sender, auto &&) {
-            const auto textBlock = sender.as<xaml::Controls::TextBlock>();
+            const auto textBlock = sender.template as<xaml::Controls::TextBlock>();
             *selectionChanged =
                 *selectionChanged || textBlock.SelectionStart().Offset() != textBlock.SelectionEnd().Offset();
           });

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -158,6 +158,22 @@
     </ClCompile>
     <ClCompile Include="$(NodeApiJsiSrcDir)NodeApiJsiRuntime.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <!--
+        Workaround for a Visual Studio 2026 (v145) C++ optimizer bug. With
+        optimizations on, this translation unit is miscompiled such that the
+        pointer-value-scope teardown in NodeApiJsiRuntime hands Hermes a stale
+        napi_value, crashing in hermes!JSProxy::defineOwnProperty (via
+        napi_create_reference) during rapid UI updates - e.g. the
+        e2e-test-app-fabric visitAllPages test. Building this file without
+        optimization (verified equivalent to `#pragma optimize("", off)`)
+        avoids it. We must also opt out of /GL here so the disabled
+        optimization survives link-time code generation. NodeApiJsiRuntime.cpp
+        is externally provided, so the workaround lives here rather than in the
+        source. Scoped to v145+ (the bug does not reproduce on v143); remove
+        when the compiler bug is fixed.
+      -->
+      <Optimization Condition="$(PlatformToolsetVersion)&gt;=145">Disabled</Optimization>
+      <WholeProgramOptimization Condition="$(PlatformToolsetVersion)&gt;=145">false</WholeProgramOptimization>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Condition="'$(BuildMSRNCxxNodeApiJsiLoader)' != 'false'">

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -527,7 +527,8 @@ struct ModuleJsiInitMethodInfo<void (TModule::*)(ReactContext const &, facebook:
     return
         [module = static_cast<ModuleType *>(module), method](
             ReactContext const &reactContext, winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept {
-          (module->*method)(reactContext, GetOrCreateContextRuntime(reactContext, runtimeHandle));
+          if (runtimeHandle)
+            (module->*method)(reactContext, GetOrCreateContextRuntime(reactContext, runtimeHandle));
         };
   }
 };

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

@@ -15,7 +15,7 @@
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>18.0</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DocumentationFile>bin\$(Platform)\$(Configuration)\Microsoft.ReactNative.Managed.XML</DocumentationFile>
@@ -153,8 +153,8 @@
       </ItemGroup>
     </When>
   </Choose>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
-    <VisualStudioVersion>17.0</VisualStudioVersion>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '18.0' ">
+    <VisualStudioVersion>18.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <Target Name="Deploy" />

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
 
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Platforms>x64;x86;ARM64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
 
@@ -30,19 +30,9 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
     <PackageReference Include="RuntimeContracts" Version="0.3.0" />
-
-    <!-- 
-      NuGet decides to pull in packages with issues. There is no seeming way to diagnose why NuGet is pulling in those versions. 
-      Running restore with -Verbosity Detailed and environment variables:
-       * NUGET_RESTORE_MSBUILD_ARGS=/bl:c:\temp\nuget.binlog
-       * NUGET_RESTORE_MSBUILD_VERBOSITY=diag
-      resulted in no mention of version 4.3.0 anywhere until NuGet just starts downloading it.
-      Therefore manually overriding the version so NuGet uses the latest.
-    -->
-     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 
-  <!-- 
+  <!--
     This target is used to ensure the tool is deployed and can be used from source.
     It will return all deployed files so the caller can implement incrementality properly
    -->
@@ -53,7 +43,7 @@
     </ItemGroup>
   </Target>
 
-  <!-- 
+  <!--
     This target returns the location of the deployed executable.
   -->
   <Target Name="GetPublishedToolPath" DependsOnTargets="PublishTool" Returns="@(_PublishedToolExecutable)">
@@ -62,13 +52,13 @@
     </ItemGroup>
   </Target>
 
-  <!-- 
+  <!--
     This is used during the PR build to ensure we have the artifacts published during the build.
   -->
-  <Target 
-    Name="PublishToolDuringBuild" 
-    DependsOnTargets="Publish" 
-    AfterTargets="Build" 
+  <Target
+    Name="PublishToolDuringBuild"
+    DependsOnTargets="Publish"
+    AfterTargets="Build"
     Condition="'$(PublishToolDuringBuild)' == 'true'">
   </Target>
 

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

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

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.26</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.81.28</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>26</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>28</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>e5e21719bbe67d60a8cbef9ddfe7cadb6596f338</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>d58e4482057a5e9e6395793b5f7d4c626cf04046</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.0.0-2511.7001-d7ca19b3</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2604.21001-94aa5e1d</HermesVersion>
     <HermesPackageName Condition="'$(HermesPackageName)' == ''">Microsoft.JavaScript.Hermes</HermesPackageName>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\$(HermesPackageName)\$(HermesVersion)</HermesPackage>

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>
 
   <!--
@@ -138,7 +138,8 @@
       <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>
 

package/PropertySheets/WinUI.props

@@ -2,7 +2,7 @@
 <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
       When this version is updated, be sure to update the default for the enableInternalFeed parameter of /.ado/templates/enable-experimental-winui3.yml
@@ -10,7 +10,7 @@
     <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">1.8.251106002</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.251106002</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/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

@@ -1,4 +1,5 @@
 param(
+    [switch] $SkipLockDeletion
 )
 
 [string] $RepoRoot = Resolve-Path "$PSScriptRoot\..\.."
@@ -6,16 +7,17 @@ param(
 $StartingLocation = Get-Location
 Set-Location -Path $RepoRoot
 
-try
-{
-    # Delete existing lock files
-    $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
-    $existingLockFiles | Foreach-Object {
-        Write-Host Deleting $_.FullName
-        Remove-Item $_.FullName
+try {
+    if (-not $SkipLockDeletion) {
+        # 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') }
+    $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)
 
     # Run all solutions with their defaults
@@ -25,20 +27,12 @@ try
     }
 
     # Re-run solutions that build with UseExperimentalWinUI3
-    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $experimentalSolutions = @("playground-composition.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
-{
+finally {
     Set-Location -Path "$StartingLocation"
 }

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) {