From 183621877d40f9c5bfe46932685cac94c1d15c7d Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 22 Oct 2022 05:50:26 +0000
Subject: [PATCH 1/3] [wasm] Add InstallChrome task

---
 .../WasmBuildTasks/InstallChromeForTests.cs   | 177 ++++++++++++++++++
 .../WasmBuildTasks/WasmBuildTasks.csproj      |   2 +
 2 files changed, 179 insertions(+)
 create mode 100644 src/tasks/WasmBuildTasks/InstallChromeForTests.cs

diff --git a/src/tasks/WasmBuildTasks/InstallChromeForTests.cs b/src/tasks/WasmBuildTasks/InstallChromeForTests.cs
new file mode 100644
index 0000000000000..5a4587e4b90b6
--- /dev/null
+++ b/src/tasks/WasmBuildTasks/InstallChromeForTests.cs
@@ -0,0 +1,177 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Build.Framework;
+
+using MBU = Microsoft.Build.Utilities;
+
+#nullable enable
+
+namespace Microsoft.WebAssembly.Build.Tasks;
+
+public class InstallChromeForTests : MBU.Task
+{
+    private const string s_allJsonUrl = "http://omahaproxy.appspot.com/all.json";
+    private const string s_snapshotBaseUrl = $"https://storage.googleapis.com/chromium-browser-snapshots";
+    private const int s_versionCheckThresholdDays = 3;
+    private const int s_numBranchPositionsToTry = 10;
+    private static readonly HttpClient s_httpClient = new();
+
+    public string Channel { get; set; } = "stable";
+
+    [Required, NotNull]
+    public string OSIdentifier { get; set; } = string.Empty;
+
+    // Used in https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
+    [Required, NotNull]
+    public string? OSPrefix { get; set; }
+
+    [Required, NotNull]
+    public string IntermediateOutputPath { get; set; } = string.Empty;
+
+    // start at the branch position found in all.json, and try to
+    // download chrome, and chromedriver. If not found, then try up to
+    // MaxLowerBranchPositionsToCheck lower versions
+    public int MaxLowerBranchPositionsToCheck { get; set; } = 10;
+
+    [Output]
+    public string ChromeVersion { get; set; } = string.Empty;
+    [Output]
+    public string BranchBasePosition { get; set; } = string.Empty;
+    [Output]
+    public string BaseSnapshotUrl { get; set; } = string.Empty;
+    [Output]
+    public string V8Version { get; set; } = string.Empty;
+
+    public override bool Execute() => ExecuteInternalAsync().Result;
+
+    private async Task<bool> ExecuteInternalAsync()
+    {
+        if (!Directory.Exists(IntermediateOutputPath))
+        {
+            Log.LogError($"Cannot find {nameof(IntermediateOutputPath)}={IntermediateOutputPath}");
+            return false;
+        }
+
+        try
+        {
+            ChromeVersionSpec version = await GetChromeVersionAsync().ConfigureAwait(false);
+            BaseSnapshotUrl = await GetChromeUrlsAsync(version).ConfigureAwait(false);
+            ChromeVersion = version.version;
+            V8Version = version.v8_version;
+            BranchBasePosition = version.branch_base_position;
+
+            return !Log.HasLoggedErrors;
+        }
+        catch (LogAsErrorException laee)
+        {
+            Log.LogError(laee.Message);
+            return false;
+        }
+    }
+
+    private async Task<string> GetChromeUrlsAsync(ChromeVersionSpec version)
+    {
+        string baseUrl = Path.Combine(s_snapshotBaseUrl, OSPrefix);
+
+        int branchPosition = int.Parse(version.branch_base_position);
+        for (int i = 0; i < s_numBranchPositionsToTry; i++)
+        {
+            string branchUrl = Path.Combine(baseUrl, branchPosition.ToString());
+            string url = Path.Combine(branchUrl, "REVISIONS");
+
+            Log.LogMessage(MessageImportance.Low, $"Checking if {url} exists ..");
+            HttpResponseMessage response = await s_httpClient
+                                                    .GetAsync(url, HttpCompletionOption.ResponseHeadersRead)
+                                                    .ConfigureAwait(false);
+            if (response.StatusCode == HttpStatusCode.OK)
+            {
+                Log.LogMessage(MessageImportance.Low, $"Found {url}");
+                return branchUrl;
+            }
+
+            branchPosition -= 1;
+        }
+
+        throw new LogAsErrorException($"Could not find a chrome snapshot folder under {baseUrl}, " +
+                                        $"starting at branch position {branchPosition}, for version {version.version}");
+    }
+
+    private async Task<ChromeVersionSpec> GetChromeVersionAsync()
+    {
+        using Stream stream = await GetAllJsonContentsAsync().ConfigureAwait(false);
+
+        PerOSVersions[]? perOSVersions = await JsonSerializer
+                                                    .DeserializeAsync<PerOSVersions[]>(stream)
+                                                    .ConfigureAwait(false);
+        if (perOSVersions is null)
+            throw new LogAsErrorException($"Failed to read chrome versions from {s_allJsonUrl}");
+
+        PerOSVersions[] foundOSVersions = perOSVersions.Where(osv => osv.os == OSIdentifier).ToArray();
+        if (foundOSVersions.Length == 0)
+        {
+            string availableOSIds = string.Join(", ", perOSVersions.Select(osv => osv.os).Distinct().Order());
+            throw new LogAsErrorException($"Unknown OS identifier '{OSIdentifier}'. OS identifiers found in all.json: {availableOSIds}");
+        }
+
+        ChromeVersionSpec[] foundChromeVersions = foundOSVersions
+                                                    .SelectMany(osv => osv.versions)
+                                                    .Where(cv => cv.channel == Channel)
+                                                    .ToArray();
+
+        if (foundChromeVersions.Length == 0)
+        {
+            string availableChannels = string.Join(", ", perOSVersions
+                                                            .SelectMany(osv => osv.versions)
+                                                            .Select(cv => cv.channel)
+                                                            .Distinct()
+                                                            .Order());
+            throw new LogAsErrorException($"Unknown chrome channel '{Channel}'. Channels found in all.json: {availableChannels}");
+        }
+
+        return foundChromeVersions[0];
+    }
+
+    private async Task<Stream> GetAllJsonContentsAsync()
+    {
+        string allJsonPath = Path.Combine(IntermediateOutputPath, "all.json");
+
+        // Don't download all.json on every build, instead do that
+        // only every few days
+        if (File.Exists(allJsonPath) &&
+            (DateTime.UtcNow - File.GetLastWriteTimeUtc(allJsonPath)).TotalDays < s_versionCheckThresholdDays)
+        {
+            Log.LogMessage(MessageImportance.Low,
+                                $"{s_allJsonUrl} will not be downloaded again, as ${allJsonPath} " +
+                                $"is less than {s_versionCheckThresholdDays} old.");
+        }
+        else
+        {
+            try
+            {
+                Log.LogMessage(MessageImportance.Low, $"Downloading {s_allJsonUrl} ...");
+                Stream stream = await s_httpClient.GetStreamAsync(s_allJsonUrl).ConfigureAwait(false);
+                using FileStream fs = File.OpenWrite(allJsonPath);
+                await stream.CopyToAsync(fs).ConfigureAwait(false);
+            }
+            catch (HttpRequestException hre)
+            {
+                throw new LogAsErrorException($"Failed to download {s_allJsonUrl}: {hre.Message}");
+            }
+        }
+
+        return File.OpenRead(allJsonPath);
+    }
+
+
+    private sealed record PerOSVersions(string os, ChromeVersionSpec[] versions);
+    private sealed record ChromeVersionSpec(string os, string channel, string version, string branch_base_position, string v8_version);
+}
diff --git a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj
index fd88116ca0a85..32f7be8a7fa50 100644
--- a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj
+++ b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj
@@ -7,6 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+
+    <Compile Include="..\Common\LogAsErrorException.cs" />
   </ItemGroup>
 
   <Target Name="PublishBuilder"

From b6b3bfadb95ceb206198a832b7201344b9b52b9e Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 13 Oct 2022 00:20:32 +0000
Subject: [PATCH 2/3] [wasm] Download latest stable version of chrome for
 testing

- Rename provisioning.targets to wasm-provisioning.targets
- Use the new task to install chrome, and chromedriver
---
 eng/testing/ProvisioningVersions.props        |  45 +++----
 eng/testing/provisioning.targets              |  97 -------------
 eng/testing/tests.wasm.targets                |  21 ++-
 eng/testing/wasm-provisioning.targets         | 127 ++++++++++++++++++
 .../Wasm.Build.Tests/Wasm.Build.Tests.csproj  |   2 +-
 .../DebuggerTestSuite.csproj                  |   2 +-
 6 files changed, 171 insertions(+), 123 deletions(-)
 delete mode 100644 eng/testing/provisioning.targets
 create mode 100644 eng/testing/wasm-provisioning.targets

diff --git a/eng/testing/ProvisioningVersions.props b/eng/testing/ProvisioningVersions.props
index 63fc5a13c7e77..ef88b2d9e4921 100644
--- a/eng/testing/ProvisioningVersions.props
+++ b/eng/testing/ProvisioningVersions.props
@@ -1,31 +1,30 @@
 <Project>
-  <!-- Version number to revision number mapping from http://omahaproxy.appspot.com/ and find the closest one in
-    https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
-    and https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/
-
-    Eg. latest stable version is 100.0.4896.88 with revision 972766.
-    but the closest one available in the snapshosts is 972765.
-    Please make sure to check both platforms as sometimes
-    the same snapshot might not be available in both of them.
+  <!--
+    Set ChromeChannel properties to get the latest versions
   -->
+  <PropertyGroup>
+    <ChromeChannel>stable</ChromeChannel>
+
+    <ChromeOSIdentifier Condition="$([MSBuild]::IsOSPlatform('windows'))">win</ChromeOSIdentifier>
+    <ChromeOSIdentifier Condition="$([MSBuild]::IsOSPlatform('linux'))">linux</ChromeOSIdentifier>
+    <ChromeOSIdentifier Condition="$([MSBuild]::IsOSPlatform('mac'))">mac</ChromeOSIdentifier>
+
+    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and '$(ChromeOSIdentifier)' == ''">false</InstallChromeForTests>
+
+    <ChromeDir>$(ArtifactsBinDir)chrome\</ChromeDir>
+    <ChromeDriverDir>$(ArtifactsBinDir)chromedriver\</ChromeDriverDir>
+
+    <!-- Download all.json to get latest chrome versions, only if the last all.json
+         is more than 3 days old -->
+    <ChromeVersionCheckThresholdDays>3</ChromeVersionCheckThresholdDays>
+
+    <FirefoxDir>$(ArtifactsBinDir)firefox\</FirefoxDir>
+    <FirefoxStampFile>$([MSBuild]::NormalizePath($(FirefoxDir), '.install-firefox-$(FirefoxRevision).stamp'))</FirefoxStampFile>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(BrowserHost)' != 'windows'">
-    <ChromiumRevision>972765</ChromiumRevision>
-    <ChromiumUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chrome-linux.zip</ChromiumUrl>
-    <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chromedriver_linux64.zip</ChromeDriverUrl>
-    <ChromiumDirName>chrome-linux</ChromiumDirName>
-    <ChromeDriverDirName>chromedriver_linux64</ChromeDriverDirName>
-    <ChromiumBinaryName>chrome</ChromiumBinaryName>
     <FirefoxRevision>97.0.1</FirefoxRevision>
     <FirefoxUrl>https://ftp.mozilla.org/pub/firefox/releases/$(FirefoxRevision)/linux-x86_64/en-US/firefox-$(FirefoxRevision).tar.bz2</FirefoxUrl>
     <FirefoxBinaryName>firefox</FirefoxBinaryName>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BrowserHost)' == 'windows'">
-    <ChromiumRevision>972766</ChromiumRevision>
-    <ChromiumUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chrome-win.zip</ChromiumUrl>
-    <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chromedriver_win32.zip</ChromeDriverUrl>
-    <ChromiumDirName>chrome-win</ChromiumDirName>
-    <ChromeDriverDirName>chromedriver_win32</ChromeDriverDirName>
-    <ChromiumBinaryName>chrome.exe</ChromiumBinaryName>
-  </PropertyGroup>
 </Project>
diff --git a/eng/testing/provisioning.targets b/eng/testing/provisioning.targets
deleted file mode 100644
index 040f423fa19f9..0000000000000
--- a/eng/testing/provisioning.targets
+++ /dev/null
@@ -1,97 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ChromeDir>$(ArtifactsBinDir)chrome\</ChromeDir>
-    <ChromeDriverDir>$(ArtifactsBinDir)chromedriver\</ChromeDriverDir>
-    <BrowserStampDir>$(ArtifactsBinDir)\</BrowserStampDir>
-    <ChromeStampFile>$(BrowserStampDir).install-chrome-$(ChromiumRevision).stamp</ChromeStampFile>
-    <ChromeDriverStampFile>$(BrowserStampDir).install-chromedriver-$(ChromiumRevision).stamp</ChromeDriverStampFile>
-    <FirefoxDir>$(ArtifactsBinDir)firefox\</FirefoxDir>
-    <FirefoxStampFile>$(BrowserStampDir).install-firefox-$(FirefoxRevision).stamp</FirefoxStampFile>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)ProvisioningVersions.props" />
-
-  <Target Name="DownloadAndInstallChrome"
-          AfterTargets="Build"
-          Condition="!Exists($(ChromeStampFile)) and '$(InstallChromeForTests)' == 'true'">
-
-    <ItemGroup>
-      <_StampFile Include="$(BrowserStampDir).install-chrome*.stamp" />
-    </ItemGroup>
-
-    <Delete Files="@(_StampFile)" />
-    <RemoveDir Directories="$(ChromeDir)" />
-
-    <DownloadFile SourceUrl="$(ChromiumUrl)" DestinationFolder="$(ChromeDir)" SkipUnchangedFiles="true">
-      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
-    </DownloadFile>
-    <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDir)" />
-
-    <PropertyGroup>
-      <_ChromeBinaryPath>$([MSBuild]::NormalizePath($(ChromeDir), $(ChromiumDirName), $(ChromiumBinaryName)))</_ChromeBinaryPath>
-    </PropertyGroup>
-
-    <Error Text="Cannot find chrome at $(_ChromeBinaryPath) in the downloaded copy"
-           Condition="!Exists($(_ChromeBinaryPath))" />
-
-    <Exec Command="chmod +x $(_ChromeBinaryPath)" Condition="!$([MSBuild]::IsOSPlatform('windows'))" />
-
-    <Touch Files="$(ChromeStampFile)" AlwaysCreate="true" />
-  </Target>
-
-  <Target Name="DownloadAndInstallChromeDriver"
-          AfterTargets="Build"
-          Condition="!Exists($(ChromeDriverStampFile)) and '$(InstallChromeForTests)' == 'true'">
-
-    <ItemGroup>
-      <_StampFile Include="$(BrowserStampDir).install-chromedriver*.stamp" />
-    </ItemGroup>
-
-    <Delete Files="@(_StampFile)" />
-    <RemoveDir Directories="$(ChromeDriverDir)" />
-
-    <DownloadFile SourceUrl="$(ChromeDriverUrl)" DestinationFolder="$(ChromeDriverDir)" SkipUnchangedFiles="true">
-      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
-    </DownloadFile>
-    <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDriverDir)" />
-
-    <PropertyGroup>
-      <_ChromeDriverBinaryPath>$([MSBuild]::NormalizePath($(ChromeDriverDir), $(ChromeDriverDirName), 'chromedriver'))</_ChromeDriverBinaryPath>
-    </PropertyGroup>
-
-    <Error Text="Cannot find chromedriver at $(_ChromeDriverBinaryPath) in the downloaded copy"
-           Condition="!Exists($(_ChromeDriverBinaryPath))" />
-
-    <Exec Command="chmod +x $(_ChromeDriverBinaryPath)" Condition="!$([MSBuild]::IsOSPlatform('windows'))" />
-
-    <Touch Files="$(ChromeDriverStampFile)" AlwaysCreate="true" />
-  </Target>
-
-  <Target Name="DownloadAndInstallFirefox"
-          AfterTargets="Build"
-          Condition="!Exists($(FirefoxStampFile)) and '$(InstallFirefoxForTests)' == 'true' and !$([MSBuild]::IsOSPlatform('windows'))">
-    <ItemGroup>
-      <_StampFile Include="$(BrowserStampDir).install-firefox*.stamp" />
-    </ItemGroup>
-
-    <Delete Files="@(_StampFile)" />
-    <RemoveDir Directories="$(FirefoxDir)" />
-
-    <DownloadFile SourceUrl="$(FirefoxUrl)" DestinationFolder="$(FirefoxDir)" SkipUnchangedFiles="true">
-      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
-    </DownloadFile>
-    <Exec Command="tar -xf $(_DownloadedFile) -C $(FirefoxDir)"/>
-    <Exec Command="rm -rf $(_DownloadedFile)"/>
-
-    <PropertyGroup>
-      <_FirefoxBinaryPath>$([MSBuild]::NormalizePath($(FirefoxDir), $(FirefoxBinaryName)))</_FirefoxBinaryPath>
-    </PropertyGroup>
-
-    <Error Text="Cannot find firefox at $(_FirefoxBinaryPath) in the downloaded copy"
-           Condition="!Exists($(_FirefoxBinaryPath))" />
-
-    <Exec Command="chmod +x $(_FirefoxBinaryPath)"/>
-
-    <Touch Files="$(FirefoxStampFile)" AlwaysCreate="true" />
-  </Target>
-</Project>
diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets
index 2c94f1fa8f1b3..ca7adf3e2987a 100644
--- a/eng/testing/tests.wasm.targets
+++ b/eng/testing/tests.wasm.targets
@@ -30,8 +30,15 @@
     <_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true</_UseWasmSymbolicator>
     <WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' == ''">true</WasmIgnoreNet6WorkloadInstallErrors>
     <WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' != 'true'">false</WasmIgnoreNet6WorkloadInstallErrors>
+    <InstallWorkloadUsingArtifactsDependsOn>_GetWorkloadsToInstall;$(InstallWorkloadUsingArtifactsDependsOn)</InstallWorkloadUsingArtifactsDependsOn>
+
+    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and
+                                        ('$(ContinuousIntegrationBuild)' != 'true' or Exists('/.dockerenv')) and
+                                        '$(Scenario)' == 'WasmTestOnBrowser'">true</InstallChromeForTests>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)wasm-provisioning.targets" Condition="'$(InstallChromeForTests)' == 'true'" />
+
   <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
     <!-- suppress warnings as these are tests, and not expected to be trim-safe -->
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
@@ -45,6 +52,9 @@
     <BuildAOTTestsOn Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(Scenario)' == 'BuildWasmApps'">helix</BuildAOTTestsOn>
     <BuildAOTTestsOn Condition="'$(BuildAOTTestsOnHelix)' == 'true'">helix</BuildAOTTestsOn>
     <BuildAOTTestsOn Condition="'$(BuildAOTTestsOn)' == ''">local</BuildAOTTestsOn>
+
+    <_WasmBrowserPathForTests Condition="'$(BROWSER_PATH_FOR_TESTS)' != ''">$(BROWSER_PATH_FOR_TESTS)</_WasmBrowserPathForTests>
+    <_WasmBrowserPathForTests Condition="'$(_WasmBrowserPathForTests)' == '' and '$(InstallChromeForTests)' == 'true'">$(ChromeBinaryPath)</_WasmBrowserPathForTests>
   </PropertyGroup>
 
   <ItemGroup>
@@ -93,6 +103,7 @@
     <_XHarnessArgs                                                 >$(_XHarnessArgs) -s dotnet.js.symbols</_XHarnessArgs>
     <_XHarnessArgs Condition="'$(_UseWasmSymbolicator)' == 'true'" >$(_XHarnessArgs) --symbol-patterns wasm-symbol-patterns.txt</_XHarnessArgs>
     <_XHarnessArgs Condition="'$(_UseWasmSymbolicator)' == 'true'" >$(_XHarnessArgs) --symbolicator WasmSymbolicator.dll,Microsoft.WebAssembly.Internal.SymbolicatorWrapperForXHarness</_XHarnessArgs>
+    <_XHarnessArgs Condition="'$(_WasmBrowserPathForTests)' != ''" >$(_XHarnessArgs) &quot;--browser-path=$(_WasmBrowserPathForTests)&quot;</_XHarnessArgs>
     <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''"      >$(_XHarnessArgs) $(WasmXHarnessArgsCli)</_XHarnessArgs>
 
     <!-- There two flavors of WasmXHarnessArgs and WasmXHarnessMonoArgs, one is MSBuild property and the other is environment variable -->
@@ -315,7 +326,8 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="ProvideNodeNpmRestoreScripts" BeforeTargets="GenerateRunScript">
+
+  <Target Name="_WasmAddToRunScript" BeforeTargets="GenerateRunScript">
     <!-- Combine optional alias on all NodeNpmModule and trim separator where alias is empty -->
     <ItemGroup>
       <_NodeNpmModuleString Include="%(NodeNpmModule.Identity):%(NodeNpmModule.Alias)" />
@@ -329,10 +341,17 @@
     <ItemGroup Condition="'$(OS)' != 'Windows_NT'">
       <SetScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then export WasmXHarnessMonoArgs=&quot;$WasmXHarnessMonoArgs --setenv=NPM_MODULES=$(NodeNpmModuleString)&quot;; fi" />
       <RunScriptCommands Include="if [[ &quot;$SCENARIO&quot; == &quot;WasmTestOnNodeJS&quot; || &quot;$SCENARIO&quot; == &quot;wasmtestonnodejs&quot; ]]; then npm ci; fi" />
+
+      <SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="export PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
     </ItemGroup>
     <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
       <SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;WasmXHarnessMonoArgs=%WasmXHarnessMonoArgs% --setenv=NPM_MODULES^=$(NodeNpmModuleString)&quot; )" />
       <RunScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( call npm ci )" />
+
+      <SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::Path.GetDirectoryName($(ChromeDriverBinaryPath)))" />
+    </ItemGroup>
+
+    <ItemGroup>
     </ItemGroup>
   </Target>
 
diff --git a/eng/testing/wasm-provisioning.targets b/eng/testing/wasm-provisioning.targets
new file mode 100644
index 0000000000000..ae0261c4f2976
--- /dev/null
+++ b/eng/testing/wasm-provisioning.targets
@@ -0,0 +1,127 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)ProvisioningVersions.props" />
+
+  <PropertyGroup Condition="'$(ChromeOSIdentifier)' == 'linux'">
+    <ChromeDirName>chrome-linux</ChromeDirName>
+    <ChromeDriverDirName>chromedriver_linux64</ChromeDriverDirName>
+    <ChromeBinaryName>chrome</ChromeBinaryName>
+    <ChromeDriverBinaryName>chromedriver</ChromeDriverBinaryName>
+    <_ChromeOSPrefix>Linux_x64</_ChromeOSPrefix>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ChromeOSIdentifier)' == 'win'">
+    <ChromeDirName>chrome-win</ChromeDirName>
+    <ChromeDriverDirName>chromedriver_win32</ChromeDriverDirName>
+    <ChromeBinaryName>chrome.exe</ChromeBinaryName>
+    <ChromeDriverBinaryName>chromedriver.exe</ChromeDriverBinaryName>
+    <_ChromeOSPrefix>Win_x64</_ChromeOSPrefix>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_BrowserStampDir>$(ArtifactsBinDir)\</_BrowserStampDir>
+    <ChromeBinaryPath>$([MSBuild]::NormalizePath($(ChromeDir), $(ChromeDirName), $(ChromeBinaryName)))</ChromeBinaryPath>
+    <ChromeDriverBinaryPath>$([MSBuild]::NormalizePath($(ChromeDriverDir), $(ChromeDriverDirName), $(ChromeDriverBinaryName)))</ChromeDriverBinaryPath>
+  </PropertyGroup>
+
+  <Target Name="DownloadAndInstallChrome"
+          AfterTargets="GetChromeVersion"
+          Condition="(!Exists($(ChromeStampFile)) or !Exists($(ChromeBinaryPath))) and '$(InstallChromeForTests)' == 'true'">
+
+    <RemoveDir Directories="$(ChromeDir)" />
+
+    <Message Text="** Installing chrome version $(ChromeVersion), rev: $(ChromeRevision). Disable this by setting msbuild property InstallChromeForTests=false ."
+             Importance="High" />
+
+    <DownloadFile SourceUrl="$(ChromeUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="true">
+      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
+    </DownloadFile>
+    <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDir)" />
+
+    <Error Text="Cannot find chrome at $(ChromeBinaryPath) in the downloaded copy"
+           Condition="!Exists($(ChromeBinaryPath))" />
+
+    <Exec Command="chmod +x $(ChromeBinaryPath)" Condition="!$([MSBuild]::IsOSPlatform('windows'))" />
+
+    <Touch Files="$(ChromeStampFile)" AlwaysCreate="true" />
+  </Target>
+
+  <Target Name="DownloadAndInstallChromeDriver"
+          AfterTargets="GetChromeVersion"
+          Condition="(!Exists($(ChromeDriverStampFile)) or !Exists($(ChromeDriverBinaryPath))) and '$(InstallChromeForTests)' == 'true'">
+
+    <RemoveDir Directories="$(ChromeDriverDir)" />
+
+    <Message Text="** Installing chromedriver version $(ChromeVersion), rev: $(ChromeRevision). Disable this by setting msbuild property InstallChromeForTests=false ."
+             Importance="High" />
+
+    <DownloadFile SourceUrl="$(ChromeDriverUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="true">
+      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
+    </DownloadFile>
+    <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDriverDir)" />
+
+    <Error Text="Cannot find chromedriver at $(ChromeDriverBinaryPath) in the downloaded copy"
+           Condition="!Exists($(ChromeDriverBinaryPath))" />
+
+    <Exec Command="chmod +x $(ChromeDriverBinaryPath)" Condition="!$([MSBuild]::IsOSPlatform('windows'))" />
+
+    <Touch Files="$(ChromeDriverStampFile)" AlwaysCreate="true" />
+  </Target>
+
+  <Target Name="DownloadAndInstallFirefox"
+          AfterTargets="Build"
+          Condition="!Exists($(FirefoxStampFile)) and '$(InstallFirefoxForTests)' == 'true' and !$([MSBuild]::IsOSPlatform('windows'))">
+    <ItemGroup>
+      <_StampFile Include="$(_BrowserStampDir).install-firefox*.stamp" />
+    </ItemGroup>
+
+    <Delete Files="@(_StampFile)" />
+    <RemoveDir Directories="$(FirefoxDir)" />
+
+    <DownloadFile SourceUrl="$(FirefoxUrl)" DestinationFolder="$(FirefoxDir)" SkipUnchangedFiles="true">
+      <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
+    </DownloadFile>
+    <Exec Command="tar -xf $(_DownloadedFile) -C $(FirefoxDir)"/>
+    <Exec Command="rm -rf $(_DownloadedFile)"/>
+
+    <PropertyGroup>
+      <_FirefoxBinaryPath>$([MSBuild]::NormalizePath($(FirefoxDir), $(FirefoxBinaryName)))</_FirefoxBinaryPath>
+    </PropertyGroup>
+
+    <Error Text="Cannot find firefox at $(_FirefoxBinaryPath) in the downloaded copy"
+           Condition="!Exists($(_FirefoxBinaryPath))" />
+
+    <Exec Command="chmod +x $(_FirefoxBinaryPath)"/>
+
+    <Touch Files="$(FirefoxStampFile)" AlwaysCreate="true" />
+  </Target>
+
+  <UsingTask AssemblyFile="$(WasmBuildTasksAssemblyPath)"
+             TaskName="Microsoft.WebAssembly.Build.Tasks.InstallChromeForTests" />
+
+  <Target Name="GetChromeVersion" AfterTargets="Build" Condition="'$(InstallChromeForTests)' == 'true'">
+    <InstallChromeForTests
+                OSIdentifier="$(ChromeOSIdentifier)"
+                OSPrefix="$(_ChromeOSPrefix)"
+                Channel="$(ChromeChannel)"
+                IntermediateOutputPath="$(ArtifactsObjDir)">
+      <Output TaskParameter="ChromeVersion"      PropertyName="ChromeVersion" />
+      <Output TaskParameter="V8Version"          PropertyName="V8Version" />
+      <Output TaskParameter="BranchBasePosition" PropertyName="ChromeRevision" />
+      <Output TaskParameter="BaseSnapshotUrl"    PropertyName="_ChromeBaseSnapshotUrl" />
+    </InstallChromeForTests>
+
+    <PropertyGroup Condition="'$(ChromeOSIdentifier)' == 'linux'">
+      <ChromeUrl>$(_ChromeBaseSnapshotUrl)/chrome-linux.zip</ChromeUrl>
+      <ChromeDriverUrl>$(_ChromeBaseSnapshotUrl)/chromedriver_linux64.zip</ChromeDriverUrl>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(ChromeOSIdentifier)' == 'win'">
+      <ChromeUrl>$(_ChromeBaseSnapshotUrl)/chrome-win.zip</ChromeUrl>
+      <ChromeDriverUrl>$(_ChromeBaseSnapshotUrl)/chromedriver_win32.zip</ChromeDriverUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <ChromeStampFile>$([MSBuild]::NormalizePath('$(ChromeDir)', '.install-$(ChromeVersion)-$(ChromeRevision).stamp'))</ChromeStampFile>
+      <ChromeDriverStampFile>$([MSBuild]::NormalizePath('$(ChromeDriverDir)', '.install-$(ChromeVersion)-$(ChromeRevision).stamp'))</ChromeDriverStampFile>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
index 7a9c16c6a34bd..b84e917833944 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
@@ -20,7 +20,7 @@
     <UseDefaultTestHost>true</UseDefaultTestHost>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)testing\provisioning.targets" />
+  <Import Project="$(RepositoryEngineeringDir)testing\wasm-provisioning.targets" />
 
   <PropertyGroup>
     <RunScriptInputName Condition="'$(OS)' == 'Windows_NT'">RunScriptTemplate.cmd</RunScriptInputName>
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
index 45e5d54b85f46..8032934e68a94 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
@@ -12,7 +12,7 @@
     <InstallFirefoxForTests Condition="'$(DebuggerHost)' == 'firefox' and '$(InstallFirefoxForTests)' == '' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallFirefoxForTests>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)testing\provisioning.targets" />
+  <Import Project="$(RepositoryEngineeringDir)testing\wasm-provisioning.targets" />
 
   <ItemGroup>
     <Content Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />

From d7d0e526f865ce0bf7da71963f98e14768262cfe Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 22 Oct 2022 05:52:58 +0000
Subject: [PATCH 3/3] [wasm] Use the provisioned chrome

---
 .../common/templates/wasm-library-tests.yml   |  8 +++++-
 eng/testing/WasmRunnerTemplate.sh             |  4 +++
 eng/testing/tests.wasm.targets                |  7 ++++--
 eng/testing/wasm-provisioning.targets         | 16 ++++++------
 src/libraries/pretest.proj                    |  3 +++
 src/libraries/sendtohelix-wasm.targets        | 15 +++++++----
 .../Wasm.Build.Tests/Wasm.Build.Tests.csproj  | 11 ++++----
 .../data/RunScriptTemplate.cmd                |  4 +++
 .../data/RunScriptTemplate.sh                 |  4 +++
 .../DebuggerTestSuite.csproj                  |  2 +-
 ...ChromeForTests.cs => GetChromeVersions.cs} | 25 +++++++++++--------
 11 files changed, 66 insertions(+), 33 deletions(-)
 rename src/tasks/WasmBuildTasks/{InstallChromeForTests.cs => GetChromeVersions.cs} (88%)

diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml
index eb64ac55ee7a0..6037b4529ecaa 100644
--- a/eng/pipelines/common/templates/wasm-library-tests.yml
+++ b/eng/pipelines/common/templates/wasm-library-tests.yml
@@ -49,11 +49,17 @@ jobs:
             ne(dependencies.evaluate_paths.outputs.SetPathVars_any_other_than_wasm_wbt_dbg.containsChange, true))
       - name: _wasmRunSmokeTestsOnlyArg
         value: /p:RunSmokeTestsOnly=${{ eq(parameters.shouldRunSmokeOnly, true) }}
+      - name: chromeInstallArg
+        ${{ if containsValue(parameters.scenarios, 'wasmtestonbrowser') }}:
+          value: /p:InstallChromeForTests=true
+        ${{ else }}:
+          value: ''
+
     jobParameters:
       isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
       testGroup: innerloop
       nameSuffix: LibraryTests${{ parameters.nameSuffix }}
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraBuildArgs }}
+      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) $(chromeInstallArg) ${{ parameters.extraBuildArgs }}
       timeoutInMinutes: 240
       # if !alwaysRun, then:
       #   if this is runtime-wasm (isWasmOnlyBuild):
diff --git a/eng/testing/WasmRunnerTemplate.sh b/eng/testing/WasmRunnerTemplate.sh
index 2d5152215635a..077f891d05105 100644
--- a/eng/testing/WasmRunnerTemplate.sh
+++ b/eng/testing/WasmRunnerTemplate.sh
@@ -53,6 +53,10 @@ if [[ -z "$XHARNESS_ARGS" ]]; then
 	XHARNESS_ARGS="$JS_ENGINE $JS_ENGINE_ARGS $MAIN_JS"
 fi
 
+if [[ -n "$PREPEND_PATH" ]]; then
+    export PATH=$PREPEND_PATH:$PATH
+fi
+
 if [[ -n "$XUNIT_RANDOM_ORDER_SEED" ]]; then
     WasmXHarnessMonoArgs="${WasmXHarnessMonoArgs} --setenv=XUNIT_RANDOM_ORDER_SEED=${XUNIT_RANDOM_ORDER_SEED}"
 fi
diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets
index ca7adf3e2987a..0c845a741f2cd 100644
--- a/eng/testing/tests.wasm.targets
+++ b/eng/testing/tests.wasm.targets
@@ -37,7 +37,10 @@
                                         '$(Scenario)' == 'WasmTestOnBrowser'">true</InstallChromeForTests>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)wasm-provisioning.targets" Condition="'$(InstallChromeForTests)' == 'true'" />
+  <!-- On CI this is installed as part of pretest, but it should still be installed
+       for WBT, and debugger tests -->
+  <Import Project="$(MSBuildThisFileDirectory)wasm-provisioning.targets"
+          Condition="'$(InstallChromeForTests)' == 'true' and ('$(ContinuousIntegrationBuild)' != 'true' or '$(IsWasmProject)' != 'true')" />
 
   <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
     <!-- suppress warnings as these are tests, and not expected to be trim-safe -->
@@ -348,7 +351,7 @@
       <SetScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( set &quot;WasmXHarnessMonoArgs=%WasmXHarnessMonoArgs% --setenv=NPM_MODULES^=$(NodeNpmModuleString)&quot; )" />
       <RunScriptCommands Include="if /I [%SCENARIO%]==[WasmTestOnNodeJS] ( call npm ci )" />
 
-      <SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::Path.GetDirectoryName($(ChromeDriverBinaryPath)))" />
+      <SetScriptCommands Condition="'$(InstallChromeForTests)' == 'true' and '$(ChromeDriverBinaryPath)' != ''" Include="set PREPEND_PATH=$([System.IO.Path]::GetDirectoryName($(ChromeDriverBinaryPath)))" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/eng/testing/wasm-provisioning.targets b/eng/testing/wasm-provisioning.targets
index ae0261c4f2976..63238cdbc248a 100644
--- a/eng/testing/wasm-provisioning.targets
+++ b/eng/testing/wasm-provisioning.targets
@@ -29,10 +29,10 @@
 
     <RemoveDir Directories="$(ChromeDir)" />
 
-    <Message Text="** Installing chrome version $(ChromeVersion), rev: $(ChromeRevision). Disable this by setting msbuild property InstallChromeForTests=false ."
+    <Message Text="** Installing chrome version $(ChromeVersion), rev: $(ChromeRevision). To disable this set the msuild property InstallChromeForTests=false ."
              Importance="High" />
 
-    <DownloadFile SourceUrl="$(ChromeUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="true">
+    <DownloadFile SourceUrl="$(ChromeUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="false">
       <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
     </DownloadFile>
     <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDir)" />
@@ -51,10 +51,10 @@
 
     <RemoveDir Directories="$(ChromeDriverDir)" />
 
-    <Message Text="** Installing chromedriver version $(ChromeVersion), rev: $(ChromeRevision). Disable this by setting msbuild property InstallChromeForTests=false ."
+    <Message Text="** Installing chromedriver version $(ChromeVersion), rev: $(ChromeRevision). To disable this set the msuild property InstallChromeForTests=false ."
              Importance="High" />
 
-    <DownloadFile SourceUrl="$(ChromeDriverUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="true">
+    <DownloadFile SourceUrl="$(ChromeDriverUrl)" DestinationFolder="$(ArtifactsObjDir)" SkipUnchangedFiles="false">
       <Output TaskParameter="DownloadedFile" PropertyName="_DownloadedFile" />
     </DownloadFile>
     <Unzip SourceFiles="$(_DownloadedFile)" DestinationFolder="$(ChromeDriverDir)" />
@@ -96,19 +96,19 @@
   </Target>
 
   <UsingTask AssemblyFile="$(WasmBuildTasksAssemblyPath)"
-             TaskName="Microsoft.WebAssembly.Build.Tasks.InstallChromeForTests" />
+             TaskName="Microsoft.WebAssembly.Build.Tasks.GetChromeVersions" />
 
   <Target Name="GetChromeVersion" AfterTargets="Build" Condition="'$(InstallChromeForTests)' == 'true'">
-    <InstallChromeForTests
+    <GetChromeVersions
                 OSIdentifier="$(ChromeOSIdentifier)"
                 OSPrefix="$(_ChromeOSPrefix)"
                 Channel="$(ChromeChannel)"
                 IntermediateOutputPath="$(ArtifactsObjDir)">
       <Output TaskParameter="ChromeVersion"      PropertyName="ChromeVersion" />
       <Output TaskParameter="V8Version"          PropertyName="V8Version" />
-      <Output TaskParameter="BranchBasePosition" PropertyName="ChromeRevision" />
+      <Output TaskParameter="BranchPosition"     PropertyName="ChromeRevision" />
       <Output TaskParameter="BaseSnapshotUrl"    PropertyName="_ChromeBaseSnapshotUrl" />
-    </InstallChromeForTests>
+    </GetChromeVersions>
 
     <PropertyGroup Condition="'$(ChromeOSIdentifier)' == 'linux'">
       <ChromeUrl>$(_ChromeBaseSnapshotUrl)/chrome-linux.zip</ChromeUrl>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index ac4f3c9021c0c..dc68ed802a448 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -29,6 +29,9 @@
     <ProjectReference Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" Pack="true" Condition="'$(TargetOS)' == 'Browser'" />
   </ItemGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)testing\wasm-provisioning.targets"
+          Condition="'$(TargetOS)' == 'Browser' and '$(ContinuousIntegrationBuild)' == 'true'" />
+
   <Target Name="BuildExternalsProject"
           BeforeTargets="Build">
     <MSBuild Targets="Build"
diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets
index d2ad699314fce..ef933e398f618 100644
--- a/src/libraries/sendtohelix-wasm.targets
+++ b/src/libraries/sendtohelix-wasm.targets
@@ -84,7 +84,7 @@
     <HelixPreCommand Include="export XHARNESS_LOG_WITH_TIMESTAMPS=true" />
 
     <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="export PATH=$HELIX_CORRELATION_PAYLOAD/$(ChromeDriverDirName):$PATH" />
-    <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="export PATH=$HELIX_CORRELATION_PAYLOAD/$(ChromiumDirName):$PATH" />
+    <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="export PATH=$HELIX_CORRELATION_PAYLOAD/$(ChromeDirName):$PATH" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(WindowsShell)' == 'true'">
@@ -97,7 +97,7 @@
     <HelixPreCommand Include="set XHARNESS_LOG_WITH_TIMESTAMPS=true" />
 
     <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\$(ChromeDriverDirName)%3B%PATH%" />
-    <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\$(ChromiumDirName)%3B%PATH%" />
+    <HelixPreCommand Condition="'$(NeedsToRunOnBrowser)' == 'true' and '$(DebuggerHost)' == 'chrome'" Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\$(ChromeDirName)%3B%PATH%" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NeedsEMSDKNode)' == 'true' and '$(WindowsShell)' != 'true'">
@@ -161,14 +161,19 @@
     </When>
   </Choose>
 
-  <Import Project="$(RepositoryEngineeringDir)testing\ProvisioningVersions.props" />
+  <Import Project="$(RepositoryEngineeringDir)testing\wasm-provisioning.targets" />
 
   <Target Name="PrepareHelixCorrelationPayload_Wasm">
     <Message Condition="'$(NeedsEMSDK)' == 'true' or '$(NeedsEMSDKNode)' == 'true'" Importance="High" Text="Using emsdk: $(EmSdkDirForHelixPayload)" />
 
+    <Error Condition="'$(NeedsToRunOnBrowser)' == 'true' and !Exists($(ChromeDir))"
+           Text="Could not find chrome at $(ChromeDir)" />
+    <Error Condition="'$(NeedsToRunOnBrowser)' == 'true' and !Exists($(ChromeDriverDir))"
+           Text="Could not find chromedriver at $(ChromeDriverDir)" />
+
     <ItemGroup Condition="'$(NeedsToRunOnBrowser)' == 'true'">
-      <HelixCorrelationPayload Condition="'$(DebuggerHost)' == 'chrome'" Include="chromium" Uri="$(ChromiumUrl)" />
-      <HelixCorrelationPayload Condition="'$(DebuggerHost)' == 'chrome'" Include="chromedriver" Uri="$(ChromeDriverUrl)" />
+      <HelixCorrelationPayload Condition="'$(DebuggerHost)' == 'chrome'" Include="$(ChromeDir)" />
+      <HelixCorrelationPayload Condition="'$(DebuggerHost)' == 'chrome'" Include="$(ChromeDriverDir)" />
 
       <!--<HelixCorrelationPayload Condition="'$(WindowsShell)' != 'true' and '$(DebuggerHost)' == 'firefox'" Include="firefox" Uri="$(FirefoxUrl)" />-->
       <HelixCorrelationPayload Condition="'$(WindowsShell)' != 'true' and '$(DebuggerHost)' == 'firefox'" Include="$(FirefoxForHelixPayload)" />
diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
index b84e917833944..26d619310c3ea 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
@@ -13,15 +13,13 @@
 
     <TestUsingWorkloads Condition="'$(TestUsingWorkloads)' == ''">true</TestUsingWorkloads>
     <InstallWorkloadForTesting>true</InstallWorkloadForTesting>
-    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallChromeForTests>
+    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and ('$(ContinuousIntegrationBuild)' == 'true' or Exists('/.dockerenv'))">true</InstallChromeForTests>
 
     <!-- don't run any wasm build steps -->
     <IsWasmProject>false</IsWasmProject>
     <UseDefaultTestHost>true</UseDefaultTestHost>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)testing\wasm-provisioning.targets" />
-
   <PropertyGroup>
     <RunScriptInputName Condition="'$(OS)' == 'Windows_NT'">RunScriptTemplate.cmd</RunScriptInputName>
     <RunScriptInputName Condition="'$(OS)' != 'Windows_NT'">RunScriptTemplate.sh</RunScriptInputName>
@@ -49,8 +47,8 @@
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BASE_DIR=%24{HELIX_CORRELATION_PAYLOAD}" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BASE_DIR=%HELIX_CORRELATION_PAYLOAD%" />
 
-      <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BROWSER_PATH_FOR_TESTS=$HELIX_CORRELATION_PAYLOAD/chrome-linux/chrome" />
-      <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BROWSER_PATH_FOR_TESTS=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe" />
+      <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BROWSER_PATH_FOR_TESTS=$HELIX_CORRELATION_PAYLOAD/$(ChromeDirName)/$(ChromeBinaryName)" />
+      <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BROWSER_PATH_FOR_TESTS=%HELIX_CORRELATION_PAYLOAD%\$(ChromeDirName)\$(ChromeBinaryName)" />
 
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="chmod +x $HELIX_WORKITEM_ROOT/.playwright/node/linux/playwright.sh" />
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="chmod +x $HELIX_WORKITEM_ROOT/.playwright/node/linux/node" />
@@ -71,6 +69,9 @@
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BASE_DIR=$(ArtifactsBinDir)" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BASE_DIR=$(ArtifactsBinDir)" />
 
+      <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BROWSER_PATH_FOR_TESTS=$(_WasmBrowserPathForTests)" />
+      <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BROWSER_PATH_FOR_TESTS=$(_WasmBrowserPathForTests)" />
+
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export BUILT_NUGETS_PATH=$(LibrariesShippingPackagesDir)/" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set BUILT_NUGETS_PATH=$(LibrariesShippingPackagesDir)" />
     </ItemGroup>
diff --git a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
index e2568eff83f79..08a8b04d5f43e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
+++ b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.cmd
@@ -58,6 +58,10 @@ if [%XHARNESS_ARGS%] == [] (
     set "XHARNESS_ARGS=%JS_ENGINE% %JS_ENGINE_ARGS% %BROWSER_PATH% %MAIN_JS%"
 )
 
+if [%PREPEND_PATH%] NEQ [] (
+    set "PATH=%PREPEND_PATH%;%PATH%"
+)
+
 echo EXECUTION_DIR=%EXECUTION_DIR%
 echo SCENARIO=%SCENARIO%
 echo XHARNESS_OUT=%XHARNESS_OUT%
diff --git a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
index be117f0063909..d1f987199555e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
+++ b/src/mono/wasm/Wasm.Build.Tests/data/RunScriptTemplate.sh
@@ -53,6 +53,10 @@ if [[ -z "$XHARNESS_ARGS" ]]; then
 	XHARNESS_ARGS="$JS_ENGINE $JS_ENGINE_ARGS $MAIN_JS"
 fi
 
+if [[ -n "$PREPEND_PATH" ]]; then
+    export PATH=$PREPEND_PATH:$PATH
+fi
+
 echo EXECUTION_DIR=$EXECUTION_DIR
 echo SCENARIO=$SCENARIO
 echo XHARNESS_OUT=$XHARNESS_OUT
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
index 8032934e68a94..0962b33581bcf 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
@@ -8,7 +8,7 @@
     <DebuggerHost Condition="'$(DebuggerHost)' == '' or ('$(DebuggerHost)' != 'chrome' and '$(DebuggerHost)' != 'firefox')">chrome</DebuggerHost>
     <DefineConstants Condition="'$(DebuggerHost)' == 'chrome'">$(DefineConstants);RUN_IN_CHROME</DefineConstants>
     <BrowserHost Condition="$([MSBuild]::IsOSPlatform('windows'))">windows</BrowserHost>
-    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and '$(DebuggerHost)' == 'chrome' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallChromeForTests>
+    <InstallChromeForTests Condition="'$(InstallChromeForTests)' == '' and '$(DebuggerHost)' == 'chrome' and ('$(ContinuousIntegrationBuild)' == 'true' or Exists('/.dockerenv'))">true</InstallChromeForTests>
     <InstallFirefoxForTests Condition="'$(DebuggerHost)' == 'firefox' and '$(InstallFirefoxForTests)' == '' and '$(ContinuousIntegrationBuild)' != 'true' and Exists('/.dockerenv')">true</InstallFirefoxForTests>
   </PropertyGroup>
 
diff --git a/src/tasks/WasmBuildTasks/InstallChromeForTests.cs b/src/tasks/WasmBuildTasks/GetChromeVersions.cs
similarity index 88%
rename from src/tasks/WasmBuildTasks/InstallChromeForTests.cs
rename to src/tasks/WasmBuildTasks/GetChromeVersions.cs
index 5a4587e4b90b6..81a65abb6bd8a 100644
--- a/src/tasks/WasmBuildTasks/InstallChromeForTests.cs
+++ b/src/tasks/WasmBuildTasks/GetChromeVersions.cs
@@ -17,12 +17,12 @@
 
 namespace Microsoft.WebAssembly.Build.Tasks;
 
-public class InstallChromeForTests : MBU.Task
+public class GetChromeVersions : MBU.Task
 {
     private const string s_allJsonUrl = "http://omahaproxy.appspot.com/all.json";
     private const string s_snapshotBaseUrl = $"https://storage.googleapis.com/chromium-browser-snapshots";
     private const int s_versionCheckThresholdDays = 3;
-    private const int s_numBranchPositionsToTry = 10;
+    private const int s_numBranchPositionsToTry = 30;
     private static readonly HttpClient s_httpClient = new();
 
     public string Channel { get; set; } = "stable";
@@ -45,7 +45,7 @@ public class InstallChromeForTests : MBU.Task
     [Output]
     public string ChromeVersion { get; set; } = string.Empty;
     [Output]
-    public string BranchBasePosition { get; set; } = string.Empty;
+    public string BranchPosition { get; set; } = string.Empty;
     [Output]
     public string BaseSnapshotUrl { get; set; } = string.Empty;
     [Output]
@@ -67,7 +67,7 @@ private async Task<bool> ExecuteInternalAsync()
             BaseSnapshotUrl = await GetChromeUrlsAsync(version).ConfigureAwait(false);
             ChromeVersion = version.version;
             V8Version = version.v8_version;
-            BranchBasePosition = version.branch_base_position;
+            BranchPosition = version.branch_base_position;
 
             return !Log.HasLoggedErrors;
         }
@@ -80,13 +80,13 @@ private async Task<bool> ExecuteInternalAsync()
 
     private async Task<string> GetChromeUrlsAsync(ChromeVersionSpec version)
     {
-        string baseUrl = Path.Combine(s_snapshotBaseUrl, OSPrefix);
+        string baseUrl = $"{s_snapshotBaseUrl}/{OSPrefix}";
 
         int branchPosition = int.Parse(version.branch_base_position);
         for (int i = 0; i < s_numBranchPositionsToTry; i++)
         {
-            string branchUrl = Path.Combine(baseUrl, branchPosition.ToString());
-            string url = Path.Combine(branchUrl, "REVISIONS");
+            string branchUrl = $"{baseUrl}/{branchPosition}";
+            string url = $"{branchUrl}/REVISIONS";
 
             Log.LogMessage(MessageImportance.Low, $"Checking if {url} exists ..");
             HttpResponseMessage response = await s_httpClient
@@ -98,11 +98,12 @@ private async Task<string> GetChromeUrlsAsync(ChromeVersionSpec version)
                 return branchUrl;
             }
 
-            branchPosition -= 1;
+            branchPosition += 1;
         }
 
         throw new LogAsErrorException($"Could not find a chrome snapshot folder under {baseUrl}, " +
-                                        $"starting at branch position {branchPosition}, for version {version.version}");
+                                        $"for branch positions {version.branch_base_position} to " +
+                                        $"{branchPosition}, for version {version.version}.");
     }
 
     private async Task<ChromeVersionSpec> GetChromeVersionAsync()
@@ -119,7 +120,8 @@ private async Task<ChromeVersionSpec> GetChromeVersionAsync()
         if (foundOSVersions.Length == 0)
         {
             string availableOSIds = string.Join(", ", perOSVersions.Select(osv => osv.os).Distinct().Order());
-            throw new LogAsErrorException($"Unknown OS identifier '{OSIdentifier}'. OS identifiers found in all.json: {availableOSIds}");
+            throw new LogAsErrorException($"Unknown OS identifier '{OSIdentifier}'. OS identifiers found " +
+                                            $"in all.json: {availableOSIds}");
         }
 
         ChromeVersionSpec[] foundChromeVersions = foundOSVersions
@@ -134,7 +136,8 @@ private async Task<ChromeVersionSpec> GetChromeVersionAsync()
                                                             .Select(cv => cv.channel)
                                                             .Distinct()
                                                             .Order());
-            throw new LogAsErrorException($"Unknown chrome channel '{Channel}'. Channels found in all.json: {availableChannels}");
+            throw new LogAsErrorException($"Unknown chrome channel '{Channel}'. Channels found in all.json: " +
+                                            availableChannels);
         }
 
         return foundChromeVersions[0];