react-native-windows 0.84.0-preview.7 → 0.84.0

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/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.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>
@@ -150,8 +150,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>
 
@@ -31,8 +31,8 @@
     <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. 
+    <!--
+      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
@@ -42,7 +42,7 @@
      <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 +53,7 @@
     </ItemGroup>
   </Target>
 
-  <!-- 
+  <!--
     This target returns the location of the deployed executable.
   -->
   <Target Name="GetPublishedToolPath" DependsOnTargets="PublishTool" Returns="@(_PublishedToolExecutable)">
@@ -62,13 +62,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.84.0-preview.7</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.84.0</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>4c8074d47d675aee1d2110c5b92e9e349bfa1abb</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>691d92a59015db74e72c316204564f7a9d8d7680</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-2604.21001-94aa5e1d</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2605.6002-2279da22 </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>
 
   <!--
@@ -136,7 +136,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)'==''">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/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/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/rnw-dependencies.ps1

@@ -8,7 +8,7 @@ param(
     [string]$Check = [CheckId]::All,
 
     [Parameter(ValueFromRemainingArguments)]
-    [ValidateSet('appDev', 'rnwDev', 'buildLab', 'vs2022', 'clone')]
+    [ValidateSet('appDev', 'rnwDev', 'buildLab', 'vs2026', 'clone')]
     [String[]]$Tags = @('appDev'),
     [switch]$Enterprise = $false
 )
@@ -94,7 +94,6 @@ $vsComponents = @('Microsoft.Component.MSBuild',
     $vcToolsComponent,
     'Microsoft.VisualStudio.ComponentGroup.UWP.Support',
     'Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core',
-    '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.
@@ -113,12 +112,12 @@ $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";
+$vsver = "18.6.1";
 
 # The exact .NET SDK version to check for
-$dotnetver = "8.0";
+$dotnetver = "10.0";
 # Version name of the winget package
-$wingetDotNetVer = "8";
+$wingetDotNetVer = "10";
 
 $v = [System.Environment]::OSVersion.Version;
 if ($env:Agent_BuildDirectory) {
@@ -242,9 +241,9 @@ function InstallVS {
 
         if ($Enterprise) {
             # The CI machines need the enterprise version of VS as that is what is hardcoded in all the scripts
-            WinGetInstall Microsoft.VisualStudio.2022.Enterprise
+            WinGetInstall Microsoft.VisualStudio.Enterprise
         } else {
-            WinGetInstall Microsoft.VisualStudio.2022.Community
+            WinGetInstall Microsoft.VisualStudio.Community
         }
 
         $vsWhere = Get-VSWhere;
@@ -458,8 +457,8 @@ $requirements = @(
     },
     @{
         Id=[CheckId]::VSUWP;
-        Name = "Visual Studio 2022 (>= $vsver) & req. components";
-        Tags = @('appDev', 'vs2022');
+        Name = "Visual Studio 2026 (>= $vsver) & req. components";
+        Tags = @('appDev', 'vs2026');
         Valid = { CheckVS; }
         Install = { InstallVS };
         HasVerboseOutput = $true;
@@ -491,7 +490,7 @@ $requirements = @(
             $downloadPath = "$env:TEMP\WindowsApplicationDriver.msi"
             Write-Verbose "Downloading WinAppDriver from $url";
             Invoke-WebRequest -UseBasicParsing $url -OutFile $downloadPath
-            
+
             # SDL Compliance: Verify signature (Work Item 58386093)
             $signature = Get-AuthenticodeSignature $downloadPath
             if ($signature.Status -ne "Valid") {
@@ -499,10 +498,10 @@ $requirements = @(
                 throw "WinAppDriver signature verification failed"
             }
             if ($signature.SignerCertificate.Subject -notlike "*Microsoft*") {
-                Remove-Item $downloadPath -ErrorAction SilentlyContinue  
+                Remove-Item $downloadPath -ErrorAction SilentlyContinue
                 throw "WinAppDriver not signed by Microsoft"
             }
-            
+
             & $downloadPath /q
             Remove-Item $downloadPath -ErrorAction SilentlyContinue
         };
@@ -600,7 +599,7 @@ function WinGetInstall {
         Write-Verbose "Executing `winget install `"$wingetPackage`"";
         & winget install "$wingetPackage" --accept-source-agreements --accept-package-agreements
     }
-    
+
     # Refresh PATH environment variable to pick up newly installed tools
     $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
  }
@@ -693,12 +692,12 @@ foreach ($req in $filteredRequirements)
                     try {
                         $validAfterInstall = Invoke-Command $req.Valid;
                     } catch { }
-                    
+
                     if ($validAfterInstall) {
                         $Installed++;
                         continue; # go to the next item
                     }
-                    
+
                     if ($LASTEXITCODE -ne 0) {
                         throw "Last exit code was non-zero: $LASTEXITCODE - $outputFromInstall";
                     }
@@ -737,4 +736,4 @@ if ($NeedsRerun -ne 0) {
     $Tags | Out-File $MarkerFile;
     if (!$ShellInvocation) { Read-Host 'Press Enter to exit' }
     exit 0;
-}
+}

package/Shared/DevSupportManager.cpp

@@ -33,7 +33,6 @@
 #include <cxxreact/MessageQueueThread.h>
 #pragma warning(pop)
 
-#include <future>
 #include <mutex>
 
 #include <AppModel.h>
@@ -47,61 +46,59 @@ using namespace facebook::react;
 
 namespace Microsoft::ReactNative {
 
-std::future<std::pair<std::string, bool>> GetJavaScriptFromServerAsync(const std::string &url) {
-  winrt::Windows::Web::Http::Filters::HttpBaseProtocolFilter filter;
-  filter.CacheControl().ReadBehavior(winrt::Windows::Web::Http::Filters::HttpCacheReadBehavior::NoCache);
-  winrt::Windows::Web::Http::HttpClient httpClient(filter);
-  winrt::Windows::Foundation::Uri uri(Microsoft::Common::Unicode::Utf8ToUtf16(url));
+winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IBuffer> GetJavaScriptFromServerAsync(
+    const std::string &url) {
+  try {
+    winrt::Windows::Web::Http::Filters::HttpBaseProtocolFilter filter;
+    filter.CacheControl().ReadBehavior(winrt::Windows::Web::Http::Filters::HttpCacheReadBehavior::NoCache);
+    winrt::Windows::Web::Http::HttpClient httpClient(filter);
+    winrt::Windows::Foundation::Uri uri(Microsoft::Common::Unicode::Utf8ToUtf16(url));
 
-  co_await winrt::resume_background();
+    co_await winrt::resume_background();
 
-  winrt::Windows::Web::Http::HttpRequestMessage request(winrt::Windows::Web::Http::HttpMethod::Get(), uri);
-  auto asyncRequest = httpClient.SendRequestAsync(request);
+    winrt::Windows::Web::Http::HttpRequestMessage request(winrt::Windows::Web::Http::HttpMethod::Get(), uri);
+    auto asyncRequest = httpClient.SendRequestAsync(request);
 #ifdef DEFAULT_CPPWINRT_EXCEPTIONS
-  try {
     winrt::Windows::Web::Http::HttpResponseMessage response = co_await asyncRequest;
-  } catch (winrt::hresult_error const &e) {
-    co_return std::make_pair(
-        Microsoft::Common::Unicode::Utf16ToUtf8(e.message().c_str(), e.message().size()).c_str(), false);
-  }
 #else
-  co_await lessthrow_await_adapter<winrt::Windows::Foundation::IAsyncOperationWithProgress<
-      winrt::Windows::Web::Http::HttpResponseMessage,
-      winrt::Windows::Web::Http::HttpProgress>>{asyncRequest};
-
-  HRESULT hr = asyncRequest.ErrorCode();
-  if (FAILED(hr)) {
-    std::string error;
-    if (hr == WININET_E_CANNOT_CONNECT) {
-      error = fmt::format("A connection with the server {} could not be established.\n\nIs the packager running?", url);
-    } else {
-      error = fmt::format("Error 0x{:x} downloading {}.", static_cast<int>(asyncRequest.ErrorCode()), url);
+    co_await lessthrow_await_adapter<winrt::Windows::Foundation::IAsyncOperationWithProgress<
+        winrt::Windows::Web::Http::HttpResponseMessage,
+        winrt::Windows::Web::Http::HttpProgress>>{asyncRequest};
+
+    HRESULT hr = asyncRequest.ErrorCode();
+    if (FAILED(hr)) {
+      std::string error;
+      if (hr == WININET_E_CANNOT_CONNECT) {
+        error =
+            fmt::format("A connection with the server {} could not be established.\n\nIs the packager running?", url);
+      } else {
+        error = fmt::format("Error 0x{:x} downloading {}.", static_cast<int>(asyncRequest.ErrorCode()), url);
+      }
+      throw winrt::hresult_error(E_FAIL, winrt::to_hstring(error));
     }
-    co_return std::make_pair(error, false);
-  }
 
-  winrt::Windows::Web::Http::HttpResponseMessage response = asyncRequest.GetResults();
+    winrt::Windows::Web::Http::HttpResponseMessage response = asyncRequest.GetResults();
 #endif
 
-  winrt::Windows::Storage::Streams::IBuffer buffer = co_await response.Content().ReadAsBufferAsync();
-  auto reader = winrt::Windows::Storage::Streams::DataReader::FromBuffer(buffer);
-
-  reader.UnicodeEncoding(winrt::Windows::Storage::Streams::UnicodeEncoding::Utf8);
-  uint32_t len = reader.UnconsumedBufferLength();
-  std::string result;
-  if (len > 0 || response.IsSuccessStatusCode()) {
-    std::string data;
-    data.resize(len);
-    auto buf = reinterpret_cast<uint8_t *>(data.data());
-    static_assert(
-        sizeof(buf[0]) == sizeof(data[0]), "perf optimization relies on uint8_t and char being the same size");
-    reader.ReadBytes(winrt::array_view(buf, buf + len));
-    result = std::move(data);
-  } else {
-    result = fmt::format("HTTP Error {} downloading {}.", static_cast<int>(response.StatusCode()), url);
-  }
+    winrt::Windows::Storage::Streams::IBuffer buffer = co_await response.Content().ReadAsBufferAsync();
+
+    if (!response.IsSuccessStatusCode()) {
+      std::string error;
+      if (buffer.Length() > 0) {
+        auto reader = winrt::Windows::Storage::Streams::DataReader::FromBuffer(buffer);
+        error.resize(buffer.Length());
+        auto buf = reinterpret_cast<uint8_t *>(error.data());
+        reader.ReadBytes(winrt::array_view(buf, buf + buffer.Length()));
+      } else {
+        error = fmt::format("HTTP Error {} downloading {}.", static_cast<int>(response.StatusCode()), url);
+      }
+      throw winrt::hresult_error(E_FAIL, winrt::to_hstring(error));
+    }
 
-  co_return std::make_pair(std::move(result), response.IsSuccessStatusCode());
+    co_return buffer;
+  } catch (winrt::hresult_error const &) {
+    throw;
+  }
 }
 
 void LaunchDevTools(const facebook::react::DevSettings &settings) {
@@ -185,7 +182,8 @@ std::string GetPackageName(const std::string &bundleAppId) {
   return packageName;
 }
 
-std::future<winrt::Windows::Web::Http::HttpStatusCode> PollForLiveReload(const std::string &url) {
+winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Web::Http::HttpStatusCode> PollForLiveReload(
+    const std::string &url) {
   winrt::Windows::Web::Http::HttpClient httpClient;
   winrt::Windows::Foundation::Uri uri(Microsoft::Common::Unicode::Utf8ToUtf16(url));
   httpClient.DefaultRequestHeaders().Connection().TryParseAdd(L"keep-alive");
@@ -299,7 +297,16 @@ std::pair<std::string, bool> GetJavaScriptFromServer(
       inlineSourceMap,
       hermesBytecodeVersion);
   try {
-    return GetJavaScriptFromServerAsync(bundleUrl).get();
+    auto buffer = GetJavaScriptFromServerAsync(bundleUrl).get();
+    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 std::make_pair(std::move(result), true);
+  } catch (std::exception const &e) {
+    return std::make_pair(std::string{"Error: "} + e.what(), false);
   } catch (winrt::hresult_error const &e) {
     return std::make_pair(
         "Error: " + Microsoft::Common::Unicode::Utf16ToUtf8(e.message().c_str(), e.message().size()), false);

package/Shared/DevSupportManager.h

@@ -10,7 +10,6 @@
 #include <winrt/Windows.Networking.Sockets.h>
 #include <atomic>
 #include <functional>
-#include <future>
 #include <memory>
 #include <string>
 

package/Shared/Modules/IWebSocketModuleContentHandler.h

@@ -18,11 +18,26 @@ namespace Microsoft::React {
 struct IWebSocketModuleContentHandler {
   virtual ~IWebSocketModuleContentHandler() noexcept {}
 
+  /// Returns true if this handler should process messages for the given socket.
+  virtual bool CanHandleSocket(int64_t socketId) noexcept = 0;
+
   virtual void ProcessMessage(std::string &&message, winrt::Microsoft::ReactNative::JSValueObject &params) noexcept = 0;
 
   virtual void ProcessMessage(
       std::vector<uint8_t> &&message,
       winrt::Microsoft::ReactNative::JSValueObject &params) noexcept = 0;
+
+  /// Check CanHandleSocket() then ProcessMessage() in one call.
+  /// Returns true if the message was handled.
+  virtual bool TryProcessMessage(
+      int64_t socketId,
+      std::string &&message,
+      winrt::Microsoft::ReactNative::JSValueObject &params) noexcept = 0;
+
+  virtual bool TryProcessMessage(
+      int64_t socketId,
+      std::vector<uint8_t> &&message,
+      winrt::Microsoft::ReactNative::JSValueObject &params) noexcept = 0;
 };
 
 } // namespace Microsoft::React