[wasm] Wasm.Build.Tests - some cleanup to prepare for Wasi.Build.Tests, and wasi workload (#81977)

* [wasm] Extract a base class from WasmAppBuilder, for future use with WasiAppBuilder task
* [wasm] RunScriptTemplate* - cleanup for use in WBT
And introduce a $SDK_DIR_NAME envvar

* [wasm] Wasm.Build.Tests - move some files to Common/ for use with Wasi.Build.Tests
* Address review feedback from @maraf

Author: radical

src/libraries/sendtohelix-wasm.targets

@@ -55,6 +55,9 @@
     <IncludeNodePayload Condition="'$(NeedsEMSDKNode)' == 'true' and '$(NeedsEMSDK)' != 'true'">true</IncludeNodePayload>
 
     <UseDotNetCliVersionFromGlobalJson>true</UseDotNetCliVersionFromGlobalJson>
+
+    <SdkForWorkloadTestingDirName Condition="'$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'">dotnet-latest</SdkForWorkloadTestingDirName>
+    <SdkForWorkloadTestingDirName Condition="'$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' != 'true'">dotnet-none</SdkForWorkloadTestingDirName>
   </PropertyGroup>
 
   <Import Project="$(TestArchiveRoot)**\*.helix.targets" />
@@ -120,6 +123,9 @@
 
     <HelixPreCommand Condition="'$(WindowsShell)' == 'true'" Include="set &quot;BUILT_NUGETS_PATH=%HELIX_CORRELATION_PAYLOAD%/built-nugets&quot;" />
     <HelixPreCommand Condition="'$(WindowsShell)' != 'true'" Include="export &quot;BUILT_NUGETS_PATH=$HELIX_CORRELATION_PAYLOAD/built-nugets&quot;" />
+
+    <HelixPreCommand Condition="'$(WindowsShell)' == 'true'" Include="set &quot;SDK_DIR_NAME=$(SdkForWorkloadTestingDirName)&quot;" />
+    <HelixPreCommand Condition="'$(WindowsShell)' != 'true'" Include="export &quot;SDK_DIR_NAME=$(SdkForWorkloadTestingDirName)&quot;" />
   </ItemGroup>
 
   <PropertyGroup>

src/libraries/sendtohelix.proj

@@ -90,7 +90,7 @@
       <_TestUsingCrossProductValues Include="@(_TestUsingCrossProductValuesTemp)">
         <Webcil>%(_TestUsingWebcilValues.Identity)</Webcil>
       </_TestUsingCrossProductValues>
-            
+
       <_BuildWasmAppsProjectsToBuild Include="$(PerScenarioProjectFile)">
         <AdditionalProperties>$(_PropertiesToPass);Scenario=BuildWasmApps;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);TestUsingWorkloads=%(_TestUsingCrossProductValues.Workloads);TestUsingWebcil=%(_TestUsingCrossProductValues.Webcil)</AdditionalProperties>
         <AdditionalProperties Condition="'$(NeedsToBuildWasmAppsOnHelix)' != ''">%(_BuildWasmAppsProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)</AdditionalProperties>

src/mono/wasm/Wasm.Build.Tests/BuildAndRunAttribute.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/BuildAndRunAttribute.cs

@@ -18,6 +18,7 @@ internal static class EnvironmentVariables
         internal static readonly string? BuiltNuGetsPath           = Environment.GetEnvironmentVariable("BUILT_NUGETS_PATH");
         internal static readonly string? BrowserPathForTests       = Environment.GetEnvironmentVariable("BROWSER_PATH_FOR_TESTS");
         internal static readonly bool    ShowBuildOutput           = Environment.GetEnvironmentVariable("SHOW_BUILD_OUTPUT") is not null;
-        internal static readonly bool UseWebcil = Environment.GetEnvironmentVariable("USE_WEBCIL_FOR_TESTS") is "true";
+        internal static readonly bool UseWebcil                    = Environment.GetEnvironmentVariable("USE_WEBCIL_FOR_TESTS") is "true";
+        internal static readonly string? SdkDirName                = Environment.GetEnvironmentVariable("SDK_DIR_NAME");
     }
 }

src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs

@@ -44,6 +44,11 @@
     <Error Condition="'$(TestUsingWorkloads)' == 'true' and '$(PackageVersionForWorkloadManifests)' == ''"
            Text="%24(PackageVersionForWorkloadManifests) is not set. PackageVersion=$(PackageVersion)." />
 
+    <PropertyGroup>
+      <_SdkWithWorkloadForTestingDirName>$([System.IO.Path]::GetDirectoryName($(SdkWithWorkloadForTestingPath)))</_SdkWithWorkloadForTestingDirName>
+      <_SdkWithWorkloadForTestingDirName>$([System.IO.Path]::GetFilename($(_SdkWithWorkloadForTestingDirName)))</_SdkWithWorkloadForTestingDirName>
+    </PropertyGroup>
+
     <ItemGroup Condition="'$(TestUsingWorkloads)' == 'true'">
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export WORKLOAD_PACKS_VER=$(PackageVersionForWorkloadManifests)" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set WORKLOAD_PACKS_VER=$(PackageVersionForWorkloadManifests)" />
@@ -70,6 +75,9 @@
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export TEST_USING_WORKLOADS=$(TestUsingWorkloads)" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set TEST_USING_WORKLOADS=$(TestUsingWorkloads)" />
 
+      <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export SDK_DIR_NAME=$(_SdkWithWorkloadForTestingDirName)" />
+      <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set SDK_DIR_NAME=$(_SdkWithWorkloadForTestingDirName)" />
+
       <RunScriptCommands Condition="'$(OS)' != 'Windows_NT'" Include="export TEST_USING_WEBCIL=$(TestUsingWebcil)" />
       <RunScriptCommands Condition="'$(OS)' == 'Windows_NT'" Include="set TEST_USING_WEBCIL=$(TestUsingWebcil)" />
 

src/mono/wasm/Wasm.Build.Tests/CommandResult.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/CommandResult.cs

@@ -6,58 +6,13 @@ setlocal enabledelayedexpansion
 [[SetCommandsEcho]]
 
 set EXECUTION_DIR=%~dp0
-if [%3] NEQ [] (
-    set SCENARIO=%3
-)
 
 if [%HELIX_WORKITEM_UPLOAD_ROOT%] == [] (
     set "XHARNESS_OUT=%EXECUTION_DIR%xharness-output"
 ) else (
     set "XHARNESS_OUT=%HELIX_WORKITEM_UPLOAD_ROOT%\xharness-output"
 )
 
-if [%XHARNESS_CLI_PATH%] NEQ [] (
-    :: When running in CI, we only have the .NET runtime available
-    :: We need to call the XHarness CLI DLL directly via dotnet exec
-    set HARNESS_RUNNER=dotnet.exe exec "%XHARNESS_CLI_PATH%"
-) else (
-    set HARNESS_RUNNER=dotnet.exe xharness
-)
-
-if [%XHARNESS_COMMAND%] == [] (
-    if /I [%SCENARIO%]==[WasmTestOnBrowser] (
-        set XHARNESS_COMMAND=test-browser
-    ) else (
-        set XHARNESS_COMMAND=test
-    )
-)
-
-if /I [%XHARNESS_COMMAND%] == [test] (
-    if [%JS_ENGINE%] == [] (
-        if /I [%SCENARIO%] == [WasmTestOnNodeJS] (
-            set "JS_ENGINE=--engine^=NodeJS"
-        ) else (
-            set "JS_ENGINE=--engine^=V8"
-        )
-    )
-
-    if [%MAIN_JS%] == [] (
-        set "MAIN_JS=--js-file^=test-main.js"
-    )
-
-    if [%JS_ENGINE_ARGS%] == [] (
-        set "JS_ENGINE_ARGS=--engine-arg^=--stack-trace-limit^=1000"
-    )
-) else (
-    if [%BROWSER_PATH%] == [] if not [%HELIX_CORRELATION_PAYLOAD%] == [] (
-        set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe"
-    )
-)
-
-if [%XHARNESS_ARGS%] == [] (
-    set "XHARNESS_ARGS=%JS_ENGINE% %JS_ENGINE_ARGS% %BROWSER_PATH% %MAIN_JS%"
-)
-
 if [%PREPEND_PATH%] NEQ [] (
     set "PATH=%PREPEND_PATH%;%PATH%"
 )
@@ -66,12 +21,6 @@ echo EXECUTION_DIR=%EXECUTION_DIR%
 echo SCENARIO=%SCENARIO%
 echo XHARNESS_OUT=%XHARNESS_OUT%
 echo XHARNESS_CLI_PATH=%XHARNESS_CLI_PATH%
-echo HARNESS_RUNNER=%HARNESS_RUNNER%
-echo XHARNESS_COMMAND=%XHARNESS_COMMAND%
-echo MAIN_JS=%MAIN_JS%
-echo JS_ENGINE=%JS_ENGINE%
-echo JS_ENGINE_ARGS=%JS_ENGINE_ARGS%
-echo XHARNESS_ARGS=%XHARNESS_ARGS%
 
 set TEST_LOG_PATH=%XHARNESS_OUT%\logs
 
@@ -98,10 +47,8 @@ exit /b %EXIT_CODE%
 REM Functions
 :SetEnvVars
 if [%TEST_USING_WORKLOADS%] == [true] (
-    set _DIR_NAME=dotnet-net7+latest
     set SDK_HAS_WORKLOAD_INSTALLED=true
 ) else (
-    set _DIR_NAME=dotnet-none
     set SDK_HAS_WORKLOAD_INSTALLED=false
 )
 if [%TEST_USING_WEBCIL%] == [true] (
@@ -111,10 +58,10 @@ if [%TEST_USING_WEBCIL%] == [true] (
 )
 
 if [%HELIX_CORRELATION_PAYLOAD%] NEQ [] (
-    robocopy /mt /np /nfl /NDL /nc /e %BASE_DIR%\%_DIR_NAME% %EXECUTION_DIR%\%_DIR_NAME%
-    set _SDK_DIR=%EXECUTION_DIR%\%_DIR_NAME%
+    robocopy /mt /np /nfl /NDL /nc /e %BASE_DIR%\%SDK_DIR_NAME% %EXECUTION_DIR%\%SDK_DIR_NAME%
+    set _SDK_DIR=%EXECUTION_DIR%\%SDK_DIR_NAME%
 ) else (
-    set _SDK_DIR=%BASE_DIR%\%_DIR_NAME%
+    set _SDK_DIR=%BASE_DIR%\%SDK_DIR_NAME%
 )
 
 set "PATH=%_SDK_DIR%;%PATH%"

src/mono/wasm/Wasm.Build.Tests/DotNetCommand.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/DotNetCommand.cs

@@ -1,81 +1,32 @@
 #!/usr/bin/env bash
 
-# SetCommands defined in eng\testing\tests.wasm.targets
+set
+echo "------------------------ start -------------------"
+
 [[SetCommands]]
 [[SetCommandsEcho]]
 
 EXECUTION_DIR=$(dirname $0)
-if [[ -n "$3" ]]; then
-	SCENARIO=$3
-fi
 
 if [[ -z "$HELIX_WORKITEM_UPLOAD_ROOT" ]]; then
 	XHARNESS_OUT="$EXECUTION_DIR/xharness-output"
 else
 	XHARNESS_OUT="$HELIX_WORKITEM_UPLOAD_ROOT/xharness-output"
 fi
 
-if [[ -n "$XHARNESS_CLI_PATH" ]]; then
-	# When running in CI, we only have the .NET runtime available
-	# We need to call the XHarness CLI DLL directly via dotnet exec
-	HARNESS_RUNNER="dotnet exec $XHARNESS_CLI_PATH"
-else
-	HARNESS_RUNNER="dotnet xharness"
-fi
-
-if [[ -z "$XHARNESS_COMMAND" ]]; then
-	if [[ "$SCENARIO" == "WasmTestOnBrowser" || "$SCENARIO" == "wasmtestonbrowser" ]]; then
-		XHARNESS_COMMAND="test-browser"
-	else
-		XHARNESS_COMMAND="test"
-	fi
-fi
-
-if [[ "$XHARNESS_COMMAND" == "test" ]]; then
-	if [[ -z "$JS_ENGINE" ]]; then
-		if [[ "$SCENARIO" == "WasmTestOnNodeJS" || "$SCENARIO" == "wasmtestonnodejs" ]]; then
-			JS_ENGINE="--engine=NodeJS"
-		else
-			JS_ENGINE="--engine=V8"
-		fi
-	fi
-
-	if [[ -z "$MAIN_JS" ]]; then
-		MAIN_JS="--js-file=test-main.js"
-	fi
-
-	if [[ -z "$JS_ENGINE_ARGS" ]]; then
-		JS_ENGINE_ARGS="--engine-arg=--stack-trace-limit=1000"
-	fi
-fi
-
-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
 echo XHARNESS_CLI_PATH=$XHARNESS_CLI_PATH
-echo HARNESS_RUNNER=$HARNESS_RUNNER
-echo XHARNESS_COMMAND=$XHARNESS_COMMAND
-echo MAIN_JS=$MAIN_JS
-echo JS_ENGINE=$JS_ENGINE
-echo JS_ENGINE_ARGS=$JS_ENGINE_ARGS
-echo XHARNESS_ARGS=$XHARNESS_ARGS
 
 function set_env_vars()
 {
-    local _DIR_NAME=
     if [ "x$TEST_USING_WORKLOADS" = "xtrue" ]; then
-        _DIR_NAME=dotnet-net7+latest
         export SDK_HAS_WORKLOAD_INSTALLED=true
     else
-        _DIR_NAME=dotnet-none
         export SDK_HAS_WORKLOAD_INSTALLED=false
     fi
 
@@ -87,10 +38,10 @@ function set_env_vars()
 
     local _SDK_DIR=
     if [[ -n "$HELIX_WORKITEM_UPLOAD_ROOT" ]]; then
-        cp -r $BASE_DIR/$_DIR_NAME $EXECUTION_DIR
-        _SDK_DIR=$EXECUTION_DIR/$_DIR_NAME
+        cp -r $BASE_DIR/$SDK_DIR_NAME $EXECUTION_DIR
+        _SDK_DIR=$EXECUTION_DIR/$SDK_DIR_NAME
     else
-        _SDK_DIR=$BASE_DIR/$_DIR_NAME
+        _SDK_DIR=$BASE_DIR/$SDK_DIR_NAME
     fi
 
     export PATH=$_SDK_DIR:$PATH

src/mono/wasm/Wasm.Build.Tests/EnvironmentVariables.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs

@@ -1,7 +1,7 @@
 <Project>
   <!-- not really meant to be used w/o WasmApp.targets -->
 
-  <UsingTask TaskName="ManagedToNativeGenerator" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.ManagedToNativeGenerator" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
   <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.EmccCompile" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
 
   <PropertyGroup>

src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/HelperExtensions.cs

@@ -1,7 +1,7 @@
 <Project>
-  <UsingTask TaskName="WasmAppBuilder" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
-  <UsingTask TaskName="WasmLoadAssembliesAndReferences" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
-  <UsingTask TaskName="WasmCalculateInitialHeapSize" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.WasmAppBuilder" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.WasmLoadAssembliesAndReferences" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.WasmCalculateInitialHeapSize" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
 
   <!--
       Required public items/properties:

src/mono/wasm/Wasm.Build.Tests/ProcessExtensions.cs renamed to src/mono/wasm/Wasm.Build.Tests/Common/ProcessExtensions.cs

@@ -11,6 +11,8 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
+namespace Microsoft.WebAssembly.Build.Tasks;
+
 public class ManagedToNativeGenerator : Task
 {
     [Required]