react-native-windows 0.73.11 → 0.74.0-preview.2

package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/enums/ExperimentalFeature.h

@@ -17,25 +17,19 @@ namespace facebook::yoga {
 
 enum class ExperimentalFeature : uint8_t {
   WebFlexBasis = YGExperimentalFeatureWebFlexBasis,
-  AbsolutePercentageAgainstPaddingEdge = YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge,
   CallMeasureCallbackOnAllNodes = YGExperimentalFeatureCallMeasureCallbackOnAllNodes, // Used just for NetUI - Keep at end of list
 };
 
 template <>
-constexpr inline int32_t ordinalCount<ExperimentalFeature>() {
-  return 3; // This should be +1 from core due to CallMeasureCallbackOnAllNodes
-} 
-
-template <>
-constexpr inline int32_t bitCount<ExperimentalFeature>() {
-  return 2; // Depending on the number of ExperimentalFeature's this will either match core, or be core+1
-} 
+constexpr int32_t ordinalCount<ExperimentalFeature>() {
+  return 2;
+}
 
-constexpr inline ExperimentalFeature scopedEnum(YGExperimentalFeature unscoped) {
+constexpr ExperimentalFeature scopedEnum(YGExperimentalFeature unscoped) {
   return static_cast<ExperimentalFeature>(unscoped);
 }
 
-constexpr inline YGExperimentalFeature unscopedEnum(ExperimentalFeature scoped) {
+constexpr YGExperimentalFeature unscopedEnum(ExperimentalFeature scoped) {
   return static_cast<YGExperimentalFeature>(scoped);
 }
 

package/ReactCommon/cgmanifest.json

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

package/Scripts/EnableInternalWinAppSDKFeed.ps1

@@ -0,0 +1,21 @@
+param(
+)
+
+[string] $RepoRoot = Resolve-Path "$PSScriptRoot\..\.."
+
+$StartingLocation = Get-Location
+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")
+}
+finally
+{
+    Set-Location -Path "$StartingLocation"
+}

package/Scripts/IntegrationTests.ps1

@@ -30,16 +30,15 @@ param (
 
 	[switch] $NoRun,
 
-	[switch] $UseNodeWsServer,
-
 	[switch] $List,
 
-	[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",
 
 	[System.IO.DirectoryInfo] $ReactNativeLocation = "$($PSScriptRoot | Split-Path)",
 
-	[System.IO.FileInfo] $NodePath = (Get-Command node.exe).Definition,
+	[System.IO.FileInfo] $DotNetPath = (Get-Command dotnet.exe).Definition,
 
 	[System.IO.FileInfo] $NpmPath = (Get-Command npm.cmd).Definition
 )
@@ -59,9 +58,7 @@ if ($List) {
 # Ensure test services are online.
 if (! $NoServers) {
 	$packager = Find-Packager
-	if ($UseNodeWsServer.IsPresent) {
-		$wsServer = Find-WebSocketServer
-	}
+	$webSite = Find-TestWebsiteServer
 	$notFound = $false
 
 	if (!$packager) {
@@ -72,17 +69,26 @@ if (! $NoServers) {
 		Write-Host 'Found Packager.'
 	}
 
-	if (!$wsServer -and $UseNodeWsServer.IsPresent) {
-		Write-Warning 'WebSocket server not found. Attempting to start...'
-		Start-WebSocketServer -ReactNativeLocation $ReactNativeLocation -NodePath $NodePath
+	if (!$webSite) {
+		Start-Process `
+			-FilePath $DotNetPath `
+			-PassThru `
+			-ArgumentList `
+				run,
+				--project,
+				$ReactNativeLocation\TestWebSite\Microsoft.ReactNative.Test.Website.csproj
+
 		$notFound = $true
-	} elseif ($UseNodeWsServer.IsPresent) {
-		Write-Host 'Found WebSocket server.'
+	} else {
+		Write-Host 'Found Test Website Server'
 	}
 
 	if ($Preload -and $notFound) {
 		Start-Sleep -Seconds $Delay
 
+		# Ensure test website responds to default HTTP GET request.
+		Invoke-WebRequest -Uri 'http://localhost:5555'
+
 		# Preload the RNTesterApp integration bundle for better performance in integration tests.
 		Invoke-WebRequest -UseBasicParsing -Uri "http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=windows&dev=true" | Out-Null
 	}
@@ -92,8 +98,9 @@ if ($NoRun) {
 	Exit
 }
 
+$filter = ''
 if ($Include.Count) {
-	$filter = "(FullyQualifiedName~" + ($Include -join ')&(FullyQualifiedName~') + ")"
+	$filter += "(FullyQualifiedName~" + ($Include -join ')&(FullyQualifiedName~') + ")"
 }
 
 if ($Exclude.Count) {
@@ -101,4 +108,8 @@ if ($Exclude.Count) {
 }
 
 # Run Integration Test assemblies.
-& $VsTest $Assemblies --InIsolation --Platform:$Platform ('', "--TestCaseFilter:$filter")[$filter.Length -gt 0]
+if ($filter.Length -gt 0) {
+	& $VsTest $Assemblies --InIsolation --Platform:$Platform "--TestCaseFilter:$filter"
+} else {
+	& $VsTest $Assemblies --InIsolation --Platform:$Platform
+}

package/Scripts/Microsoft.ReactNative.targets

@@ -19,10 +19,4 @@
 
   </ItemGroup>
 
-  <ItemDefinitionGroup Condition="'$(UseRNCoreApp)'=='true'">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\..\lib\$(Native-Platform)\Microsoft.ReactNative.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
 </Project>

package/Scripts/OfficeReact.Win32.nuspec

@@ -46,11 +46,10 @@
     <file src="$nugetroot$\inc\stubs\**\*.*" target="inc" />
 
     <file src="$nugetroot$\inc\Shared\AbiSafe.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\Composition\AutoDraw.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\Composition\CompositionSwitcher.interop.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\DevSettings.h" target="inc"/>
     <file src="$nugetroot$\inc\ReactWin32\INativeUIManagerLegacy.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\InstanceManager.h" target="inc"/>
+    <file src="$nugetroot$\inc\Shared\IDevSupportManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IRedBoxHandler.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\JSBigAbiString.h" target="inc"/>

package/Scripts/TestServers.ps1

@@ -61,24 +61,6 @@ function Start-Packager {
 	return Start-Npm -WorkingDirectory $ReactNativeLocation -NoNewWindow:$NoNewWindow -NpmPath $NpmPath
 }
 
-function Start-WebSocketServer {
-	param (
-		[Parameter(Mandatory=$true)]
-		[ValidateScript({Test-Path $_})]
-		[string] $ReactNativeLocation,
-
-		[switch] $NoNewWindow,
-
-		[Parameter(Mandatory=$true)]
-		[ValidateScript({Test-Path $_})]
-		[string] $NodePath
-	)
-
-	return Start-Node	-ScriptPath $ReactNativeLocation\IntegrationTests\websocket_integration_test_server.js `
-						-NoNewWindow:$NoNewWindow `
-						-NodePath $NodePath
-}
-
 function Find-Packager {
 	try {
 		return Get-Process -Id (Get-NetTCPConnection -ErrorAction Ignore -LocalPort 8081).OwningProcess
@@ -88,23 +70,15 @@ function Find-Packager {
 	}
 }
 
-function Find-WebSocketServer {
+function Find-TestWebsiteServer {
 	try {
-		return Get-Process -Id (Get-NetTCPConnection -ErrorAction Ignore -LocalPort 5555).OwningProcess
+		return Get-Process -id (Get-NetTCPConnection -ErrorAction Ignore -LocalPort 5555).OwningProcess
 	}
 	catch {
 		return $null
 	}
 }
 
-function Stop-WebSocketServer {
-	$proc = Find-WebSocketServer
-
-	if ($proc) {
-		Stop-Process $proc
-	}
-}
-
 function Stop-Packager {
 	$proc = Find-Packager
 

package/Scripts/Tfs/Start-TestServers.ps1

@@ -9,9 +9,7 @@ param (
 
 	[switch] $Preload,
 
-	[int] $SleepSeconds = 10,
-
-	[switch] $UseNodeWsServer
+	[int] $SleepSeconds = 10
 )
 
 Write-Host "Starting packager"
@@ -26,17 +24,6 @@ Start-Process npm	-PassThru `
 
 Write-Host 'Started packager'
 
-if ($UseNodeWsServer.IsPresent) {
-	Write-Host 'Starting WebSocket server'
-
-	Start-Process	-PassThru `
-					-FilePath (Get-Command node.exe).Definition `
-					-ArgumentList "${SourcesDirectory}\IntegrationTests\websocket_integration_test_server.js" `
-					-OutVariable wsProc
-	
-	Write-Host 'Started WebSocket server'
-}
-
 if ($Preload) {
 	Write-Host 'Preloading bundles'
 
@@ -50,10 +37,3 @@ if ($Preload) {
 
 # Use the environment variables input below to pass secret variables to this script.
 Write-Host "##vso[task.setvariable variable=PackagerId;]$($packagerProc.Id)"
-
-if ($UseNodeWsServer.IsPresent) {
-	Write-Host "##vso[task.setvariable variable=WebSocketServerId;]$($wsProc.Id)"
-	return ($packagerProc, $wsProc)
-} else {
-	return ($packagerProc)
-}

package/Scripts/Tfs/Stop-TestServers.ps1

@@ -4,14 +4,9 @@
 # Stop-TestServers.ps1
 #
 param (
-	$WebSocketServerId = $env:WebSocketServerId,
 	$PackagerId = $env:PackagerId
 )
 
-Write-Host 'Stopping WebSocket server'
-Stop-Process -Id $WebSocketServerId
-Write-Host 'Stopped WebSocket server'
-
 Write-Host 'Stopping packager'
 Stop-Process -Id $PackagerId
 Write-Host 'Stopped packager'

package/Scripts/rnw-dependencies.ps1

@@ -22,8 +22,6 @@ if ($ShellInvocation) {
 enum CheckId {
     All
     AzureFunctions
-    Choco
-    Chrome
     DeveloperMode
     DotNetCore
     FreeSpace
@@ -74,6 +72,11 @@ if (!($tagsToInclude.Contains('buildLab'))) {
     $vsComponents += 'Microsoft.VisualStudio.ComponentGroup.UWP.VC';
 }
 
+# Windows11SDK is only needed for the more experimental composition projects using newer WinAppSDK versions
+if ($tagsToInclude.Contains('rnwDev')) {
+    $vsComponents += 'Microsoft.VisualStudio.Component.Windows11SDK.22000';
+}
+
 $vsWorkloads = @('Microsoft.VisualStudio.Workload.ManagedDesktop',
     'Microsoft.VisualStudio.Workload.NativeDesktop',
     'Microsoft.VisualStudio.Workload.Universal');
@@ -81,12 +84,13 @@ $vsWorkloads = @('Microsoft.VisualStudio.Workload.ManagedDesktop',
 $vsAll = ($vsComponents + $vsWorkloads);
 
 # 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 choco.
-# I.E. Do NOT specify a Preview version here because choco doesn't have VS Preview packages.
-$vsver = "17.3";
+# Note: For install to work, whatever min version you specify here must be met by the current package available on winget.
+$vsver = "17.9";
 
 # The exact .NET SDK version to check for
 $dotnetver = "6.0";
+# Version name of the winget package
+$wingetDotNetVer = "6";
 
 $v = [System.Environment]::OSVersion.Version;
 if ($env:Agent_BuildDirectory) {
@@ -184,7 +188,7 @@ function GetVSChannelAndProduct {
         [string]$VsWhere
     )
     
-    if ($VsWhere -ne $null) {
+    if ($VsWhere) {
         $channelId = & $VsWhere -version $vsver -property channelId;
         $productId = & $VsWhere -version $vsver -property productId;
         
@@ -208,13 +212,11 @@ function InstallVS {
     if (($vsWhere -eq $null) -or ($channelId -eq $null) -or ($productId -eq $null)) {
         # No VSWhere / VS_Installer, try to install
 
-        EnsureChocoForInstall;
-        
         if ($Enterprise) {
             # The CI machines need the enterprise version of VS as that is what is hardcoded in all the scripts
-            ChocoInstall visualstudio2022enterprise;
+            WinGetInstall Microsoft.VisualStudio.2022.Enterprise
         } else {
-            ChocoInstall visualstudio2022community;
+            WinGetInstall Microsoft.VisualStudio.2022.Community
         }
 
         $vsWhere = Get-VSWhere;
@@ -423,8 +425,7 @@ $requirements = @(
         Name = 'Git';
         Tags = @('rnwDev');
         Valid = { try { (Get-Command git.exe -ErrorAction Stop) -ne $null } catch { $false }; }
-        Install = { ChocoInstall git };
-        InstallsWithChoco = $true;
+        Install = { WinGetInstall Microsoft.Git };
     },
     @{
         Id=[CheckId]::VSUWP;
@@ -439,8 +440,7 @@ $requirements = @(
         Name = 'Node.js (LTS, >= 18.0)';
         Tags = @('appDev');
         Valid = { CheckNode; }
-        Install = { ChocoInstall nodejs-lts };
-        InstallsWithChoco = $true;
+        Install = { WinGetInstall OpenJS.NodeJS.LTS "18.16.1" };
         HasVerboseOutput = $true;
     },
     @{
@@ -448,8 +448,7 @@ $requirements = @(
         Name = 'Yarn';
         Tags = @('appDev');
         Valid = { CheckYarn }
-        Install = { ChocoInstall yarn };
-        InstallsWithChoco = $true;
+        Install = { WinGetInstall Yarn.Yarn };
         HasVerboseOutput = $true;
     },
     @{
@@ -473,12 +472,11 @@ $requirements = @(
         Tags = @('rnwDev');
         Valid = { ( cmd "/c assoc .binlog 2>nul" ) -ne $null; }
         Install = {
-            ChocoInstall msbuild-structured-log-viewer;
+            WinGetInstall KirillOsenkov.MSBuildStructuredLogViewer;
             $slv = gci ${env:LocalAppData}\MSBuildStructuredLogViewer\StructuredLogViewer.exe -Recurse | select FullName | Sort-Object -Property FullName -Descending | Select-Object -First 1
             cmd /c "assoc .binlog=MSBuildLog >nul";
             cmd /c "ftype MSBuildLog=$($slv.FullName) %1 >nul";
          };
-         InstallsWithChoco = $true;
          Optional = $true;
     },
     @{
@@ -487,8 +485,7 @@ $requirements = @(
         Name = 'Windows ADK';
         Tags = @('buildLab');
         Valid = { (Test-Path "${env:ProgramFiles(x86)}\Windows Kits\10\Windows Performance Toolkit\wpr.exe"); };
-        Install = { ChocoInstall windows-adk };
-        InstallsWithChoco = $true;
+        Install = { WinGetInstall Microsoft.WindowsADK };
         Optional = $true;
     },
     @{
@@ -515,63 +512,41 @@ $requirements = @(
         Name = ".NET SDK (LTS, = $dotnetver)";
         Tags = @('appDev');
         Valid = { CheckDotNetCore; };
-        Install = { ChocoInstall dotnet-$dotnetver-sdk };
-        InstallsWithChoco = $true;
+        Install = { WinGetInstall Microsoft.DotNet.SDK.$wingetDotNetVer };
         HasVerboseOutput = $true;
     }
 );
 
-$ChocoCmd = ""; # This should get set when EnsureChocoForInstall is called
-
-function EnsureChocoForInstall {
-    Write-Verbose "Checking for Chocolatey...";
+function EnsureWinGetForInstall {
+    Write-Verbose "Checking for WinGet...";
     try {
-        # Check if choco.exe is in PATH
-        if (Get-Command "choco.exe" -CommandType Application -ErrorAction Ignore) {
-            Set-Variable -Name "ChocoCmd" -Value "choco.exe" -Scope Script
-            Write-Verbose "Chocolatey found in PATH.";
+        # Check if winget.exe is in PATH
+        if (Get-Command "winget.exe" -CommandType Application -ErrorAction Ignore) {
+            Write-Verbose "WinGet found in PATH.";
             return;
         }
-
-        # Check for choco.exe in usual install location (taken from https://chocolatey.org/install.ps1)
-        $checkPath = if ($env:ChocolateyInstall) { $env:ChocolateyInstall } else { "$env:PROGRAMDATA\chocolatey" }
-
-        $FullPath = Join-Path $checkPath "bin\choco.exe";
-
-        if (Test-Path $FullPath) {
-            Set-Variable -Name "ChocoCmd" -Value $FullPath -Scope Script
-            Write-Verbose "Chocolatey found at $ChocoCmd.";
-            return;
-        }
-
     } catch { Write-Debug $_ }
 
-    Write-Verbose "Chocolatey not found.";
-
-    if (!$NoPrompt -and (Read-Host "This script uses Chocolatey to install this component. Do you want to install Chocolatey? [y/N]").ToUpperInvariant() -eq 'Y') {
-        Write-Host "Installing Chocolatey...";
-        [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
-        iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'));
-        EnsureChocoForInstall;
-        return;
-    }
-
-    throw "Chocolatey needed to install.";
+    Write-Host "WinGet is required to install dependencies. See https://learn.microsoft.com/en-us/windows/package-manager/winget/ for more information.";
+    throw "WinGet needed to install.";
 }
 
-function ChocoInstall {
+function WinGetInstall {
     param(
-        [string]$ChocoPackage
+        [string]$wingetPackage,
+        [string]$packageVersion = ""
     )
 
-    if ($ChocoCmd -eq "") {
-        throw "`$ChocoCmd is not set, did you call EnsureChocoForInstall?";
+    EnsureWinGetForInstall;
+    if ($packageVersion -ne "") {
+        Write-Verbose "Executing `winget install `"$wingetPackage`" --version `"$packageVersion`"";
+        & winget install "$wingetPackage" --version "$packageVersion" --accept-source-agreements --accept-package-agreements
+    } else {
+        Write-Verbose "Executing `winget install `"$wingetPackage`"";
+        & winget install "$wingetPackage" --accept-source-agreements --accept-package-agreements
     }
-
-    Write-Verbose "Executing `"$ChocoCmd`" install -y `"$ChocoPackage`"";
-    & "$ChocoCmd" install -y "$ChocoPackage"
-}
-
+ }
+ 
 function IsElevated {
     return [bool](([System.Security.Principal.WindowsIdentity]::GetCurrent()).groups -match "S-1-5-32-544");
 }
@@ -652,10 +627,6 @@ foreach ($req in $filteredRequirements)
         if ($req.Install) {
             if ($Install -or (!$NoPrompt -and (Read-Host "Do you want to install? [y/N]").ToUpperInvariant() -eq 'Y')) {
                 try {
-                    if ($req.InstallsWithChoco) {
-                        EnsureChocoForInstall;
-                    }
-
                     $LASTEXITCODE = 0;
                     $outputFromInstall = Invoke-Command $req.Install -ErrorAction Stop;
 
@@ -697,4 +668,4 @@ if ($NeedsRerun -ne 0) {
     $Tags | Out-File $MarkerFile;
     if (!$ShellInvocation) { Read-Host 'Press Enter to exit' }
     exit 0;
-}
+}

package/Shared/CreateInstance.h

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <InstanceManager.h>
+#include <winrt/Microsoft.ReactNative.h>
+
+namespace facebook::react {
+
+std::shared_ptr<InstanceWrapper> CreateReactInstance(
+    std::shared_ptr<Instance> &&instance,
+    std::string &&jsBundleRelativePath,
+    std::vector<
+        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
+        &&cxxModules,
+    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
+    std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
+    const winrt::Microsoft::ReactNative::IReactPropertyBag &propertyBag,
+    std::unique_ptr<InstanceCallback> &&callback,
+    std::shared_ptr<MessageQueueThread> jsQueue,
+    std::shared_ptr<MessageQueueThread> nativeQueue,
+    std::shared_ptr<DevSettings> devSettings) noexcept;
+
+} // namespace facebook::react

package/Shared/DevServerHelper.h

@@ -8,9 +8,6 @@
 namespace facebook {
 namespace react {
 
-using JSECreator =
-    std::function<std::unique_ptr<JSExecutor>(std::shared_ptr<ExecutorDelegate>, std::shared_ptr<MessageQueueThread>)>;
-
 class DevServerHelper {
  public:
   DevServerHelper() = default;

package/Shared/DevSettings.h

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 
 #pragma once
+
+#include "JSI/JSExecutorFactoryDelegate.h"
 #include "Logging.h"
 
 #include <IRedBoxHandler.h>
@@ -86,6 +88,10 @@ struct DevSettings {
   /// reentrancy.
   std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
 
+  /// A function that can be called with the current Instance to get
+  /// a JSExecutorFactory. This can be used to bypass the ABI JSI.
+  JSExecutorFactoryDelegate jsExecutorFactoryDelegate{nullptr};
+
   // Until the ABI story is addressed we'll use this instead of the above for
   // the purposes of selecting a JSI Runtime to use.
   JSIEngineOverride jsiEngineOverride{JSIEngineOverride::Default};
@@ -105,6 +111,9 @@ struct DevSettings {
 
   // OC:8368383 - Memory leak under investigation.
   bool useWebSocketTurboModule{false};
+
+  // Enable concurrent mode by installing runtimeScheduler
+  bool useRuntimeScheduler{false};
 };
 
 } // namespace react

package/Shared/HermesRuntimeHolder.cpp

@@ -393,4 +393,21 @@ void HermesRuntimeHolder::removeFromProfiling() const noexcept {
   CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_dump_to_file(fileName.c_str()));
 }
 
+HermesJSRuntime::HermesJSRuntime(std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> hermesRuntimeHolder)
+    : m_holder(std::move(hermesRuntimeHolder)) {}
+
+facebook::jsi::Runtime &HermesJSRuntime::getRuntime() noexcept {
+  return *m_holder->getRuntime();
+}
+
+std::unique_ptr<facebook::react::jsinspector_modern::RuntimeAgentDelegate> HermesJSRuntime::createAgentDelegate(
+    facebook::react::jsinspector_modern::FrontendChannel frontendChannel,
+    facebook::react::jsinspector_modern::SessionState &sessionState,
+    std::unique_ptr<facebook::react::jsinspector_modern::RuntimeAgentDelegate::ExportedState> previouslyExportedState,
+    const facebook::react::jsinspector_modern::ExecutionContextDescription &executionContextDescription) {
+  (void)frontendChannel;
+  (void)sessionState;
+  return nullptr;
+}
+
 } // namespace Microsoft::ReactNative

package/Shared/HermesRuntimeHolder.h

@@ -8,6 +8,7 @@
 #include <ReactPropertyBag.h>
 #include <cxxreact/MessageQueueThread.h>
 #include <hermes/hermes_api.h>
+#include <react/runtime/JSRuntimeFactory.h>
 
 namespace Microsoft::ReactNative {
 
@@ -52,4 +53,20 @@ class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
   std::shared_ptr<facebook::jsi::PreparedScriptStore> m_preparedScriptStore;
 };
 
+class HermesJSRuntime : public facebook::react::JSRuntime {
+ public:
+  HermesJSRuntime(std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> hermesRuntimeHolder);
+
+  facebook::jsi::Runtime &getRuntime() noexcept override;
+
+  std::unique_ptr<facebook::react::jsinspector_modern::RuntimeAgentDelegate> createAgentDelegate(
+      facebook::react::jsinspector_modern::FrontendChannel frontendChannel,
+      facebook::react::jsinspector_modern::SessionState &sessionState,
+      std::unique_ptr<facebook::react::jsinspector_modern::RuntimeAgentDelegate::ExportedState> previouslyExportedState,
+      const facebook::react::jsinspector_modern::ExecutionContextDescription &executionContextDescription) override;
+
+ private:
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_holder;
+};
+
 } // namespace Microsoft::ReactNative

package/Shared/HermesSamplingProfiler.cpp

@@ -13,8 +13,9 @@
 #include "ReactPropertyBag.h"
 #include "Utils.h"
 
-using namespace winrt::Microsoft::ReactNative;
 using namespace facebook::react;
+using namespace winrt::Microsoft::ReactNative;
+using namespace winrt::Windows::Foundation;
 
 namespace Microsoft::ReactNative {
 
@@ -46,22 +47,23 @@ auto resume_in_dispatcher(const IReactDispatcher &dispatcher) noexcept {
   return awaitable{dispatcher};
 }
 
-std::future<std::string> getTraceFilePath() noexcept {
-  std::string hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
-  std::ostringstream os;
+IAsyncOperation<winrt::hstring> getTraceFilePath() noexcept {
+  winrt::hstring hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
+  std::wostringstream os;
   auto now = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch())
                  .count();
 
-  os << hermesDataPath << "\\cpu_" << now << ".cpuprofile";
-  co_return os.str();
+  os << hermesDataPath.c_str() << L"\\cpu_" << now << L".cpuprofile";
+  // TODO: Use C++ 20 `os.view()` to avoid a copy
+  co_return winrt::hstring(os.str());
 }
 
 } // namespace
 
 std::atomic_bool HermesSamplingProfiler::s_isStarted{false};
-std::string HermesSamplingProfiler::s_lastTraceFilePath;
+winrt::hstring HermesSamplingProfiler::s_lastTraceFilePath;
 
-std::string HermesSamplingProfiler::GetLastTraceFilePath() noexcept {
+winrt::hstring HermesSamplingProfiler::GetLastTraceFilePath() noexcept {
   return s_lastTraceFilePath;
 }
 
@@ -83,7 +85,7 @@ winrt::fire_and_forget HermesSamplingProfiler::Start(
   co_return;
 }
 
-std::future<std::string> HermesSamplingProfiler::Stop(
+IAsyncOperation<winrt::hstring> HermesSamplingProfiler::Stop(
     Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept {
   bool expectedIsStarted = true;
   if (s_isStarted.compare_exchange_strong(expectedIsStarted, false)) {
@@ -94,7 +96,7 @@ std::future<std::string> HermesSamplingProfiler::Stop(
     HermesRuntimeHolder::disableSamplingProfiler();
 
     s_lastTraceFilePath = co_await getTraceFilePath();
-    HermesRuntimeHolder::dumpSampledTraceToFile(s_lastTraceFilePath);
+    HermesRuntimeHolder::dumpSampledTraceToFile(winrt::to_string(s_lastTraceFilePath));
 
     co_await resume_in_dispatcher(jsDispatcher);
     std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);