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] [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 63fc5a13c7e77c..ef88b2d9e4921a 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 040f423fa19f92..00000000000000
--- 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 2c94f1fa8f1b36..ca7adf3e2987ae 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 00000000000000..ae0261c4f29765
--- /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 7a9c16c6a34bdd..b84e9178339445 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 45e5d54b85f467..8032934e68a946 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" />