diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets
index 9a915de0918c659fd1c464534d77096c5651dce0..4c5310cb696f946edbf5b379d75c14490fdab0f9 100644
--- a/eng/testing/tests.wasm.targets
+++ b/eng/testing/tests.wasm.targets
@@ -303,4 +303,8 @@
+
+
+
+
diff --git a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
index f8e1b4697b8046a3c8091713c632fb92f66527d1..18ac02d424878f7da2c4df091d1274621f63b9de 100644
--- a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
@@ -6,13 +6,11 @@
true
true
-
- WasmTestOnBrowser
- $(WasmXHarnessArgs) --web-server-use-cop
-
$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))
+
+ wasm.helix.targets
true
diff --git a/src/libraries/System.Security.Cryptography/tests/wasm.helix.targets b/src/libraries/System.Security.Cryptography/tests/wasm.helix.targets
new file mode 100644
index 0000000000000000000000000000000000000000..ecb37438b651b19c5ce83c56059e25dbe172d463
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography/tests/wasm.helix.targets
@@ -0,0 +1,35 @@
+
+
+ $(HelixExtensionTargets);_AddHelixCrypoItems
+ <_CryptoProjectName>System.Security.Cryptography.Tests
+
+
+
+
+
+
+
+
+
+ $(TestArchiveTestsDir)$(_CryptoProjectName).zip
+ $(HelixCommand)
+ $(_workItemTimeout)
+
+
+
+ $(TestArchiveTestsDir)$(_CryptoProjectName).zip
+ $(HelixCommand)
+ $(_workItemTimeout)
+
+ set "WasmXHarnessArgs=%WasmXHarnessArgs% --web-server-use-cop"
+ export "WasmXHarnessArgs=$WasmXHarnessArgs --web-server-use-cop"
+
+
+ <_CryptoHelixItem Include="@(HelixWorkItem)"
+ Condition="$([System.String]::new('%(HelixWorkItem.Identity)').EndsWith('-$(_CryptoProjectName)'))" />
+
+
+
+
+
diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets
index cd01a18d1c9656d45903ba34d11d688d42aa306d..b89edb87704d7cce02506103a75c1c6659c056ed 100644
--- a/src/libraries/sendtohelix-wasm.targets
+++ b/src/libraries/sendtohelix-wasm.targets
@@ -1,4 +1,22 @@
+
+
<_workItemTimeout Condition="'$(Scenario)' == 'BuildWasmApps' and '$(_workItemTimeout)' == ''">01:30:00
<_workItemTimeout Condition="'$(NeedsToBuildWasmAppsOnHelix)' == 'true'">01:00:00
@@ -6,15 +24,27 @@
<_workItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests' and '$(BrowserHost)' == 'windows'">01:30:00
<_workItemTimeout Condition="'$(Scenario)' == 'WasmTestOnBrowser' and '$(BrowserHost)' == 'windows'">00:45:00
+ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))
+ $(DebuggerHost)-
+ $(Scenario)-
+
true
true
+
+
+ PrepareHelixCorrelationPayload_Wasm;
+ _AddWorkItemsForLibraryTests;
+ _AddWorkItemsForBuildWasmApps;
+ _AddWorkItemsForWasmDebuggerTests
+
+
$(BuildHelixWorkItemsDependsOn);StageEmSdkForHelix;PrepareForBuildHelixWorkItems_Wasm
$(BuildHelixWorkItemsDependsOn);DownloadFirefoxToSendToHelix
false
- false
-
- $(RepositoryEngineeringDir)\testing\scenarios\BuildWasmAppsJobsList.txt
+ false
$(RepoRoot)src\mono\wasm\emsdk\
@@ -33,6 +63,8 @@
true
+
+
<_HelixLocalNodePath Condition="'$(NeedsEMSDKNode)' == 'true' and '$(WindowsShell)' != 'true'">$HELIX_CORRELATION_PAYLOAD/build/emsdk-node
<_HelixLocalNodePath Condition="'$(NeedsEMSDKNode)' == 'true' and '$(WindowsShell)' == 'true'">%HELIX_CORRELATION_PAYLOAD%\build\emsdk-node
@@ -126,16 +158,8 @@
-
-
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))
- Workloads-
- NoWorkload-
- $(DebuggerHost)-
- $(Scenario)-
-
+
+
@@ -164,41 +188,69 @@
+
-
-
-
+
-
-
-
- <_WasmWorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" Condition="'$(Scenario)' == 'BuildWasmApps'" />
+
+
+ <_WasmWorkItem Include="$(TestArchiveRoot)browseronly/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnBrowser'" />
+ <_WasmWorkItem Include="$(TestArchiveRoot)browserornodejs/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnBrowser'" />
+ <_WasmWorkItem Include="$(TestArchiveRoot)browserornodejs/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" />
+ <_WasmWorkItem Include="$(TestArchiveRoot)nodejsonly/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" />
- <_WasmWorkItem Include="$(TestArchiveTestsRoot)**/Wasm.Debugger.Tests.zip" Condition="'$(IsWasmDebuggerTests)' == 'true'" />
+
+ %(Identity)
+ $(HelixCommand)
+ $(_workItemTimeout)
+
-
- <_BuildWasmAppsPayloadArchive>@(_WasmWorkItem)
- <_WasmDebuggerTestsPayloadArchive>@(_WasmWorkItem)
-
+
+
+ <_WasmSampleZipFile Condition="'$(Scenario)' == 'normal' or '$(Scenario)' == ''" Include="$(TestArchiveRoot)runonly/**/*.Console.V8.*.Sample.zip" />
+ <_WasmSampleZipFile Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" Include="$(TestArchiveRoot)runonly/**/*.Console.Node.*.Sample.zip" />
+ <_WasmSampleZipFile Condition="'$(Scenario)' == 'WasmTestOnBrowser'" Include="$(TestArchiveRoot)runonly/**/*.Browser.*.Sample.zip" />
-
+
+ %(Identity)
+ $(HelixCommand)
+ $(_workItemTimeout)
+
-
- <_WasmWorkItem Include="$(TestArchiveRoot)browseronly/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnBrowser'" />
- <_WasmWorkItem Include="$(TestArchiveRoot)browserornodejs/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnBrowser'" />
- <_WasmWorkItem Include="$(TestArchiveRoot)browserornodejs/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" />
- <_WasmWorkItem Include="$(TestArchiveRoot)nodejsonly/**/*.zip" Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" />
+ <_DefaultWorkItems Remove="@(_DefaultWorkItems)" />
+ <_DefaultWorkItems Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
-
+
%(Identity)
$(HelixCommand)
$(_workItemTimeout)
+
+
+
+
+ $(RepositoryEngineeringDir)testing\scenarios\BuildWasmAppsJobsList.txt
+ Workloads-
+ NoWorkload-
+
+
+
+
+ <_WasmWorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
+
+
+ <_BuildWasmAppsPayloadArchive>@(_WasmWorkItem)
+
+
+
+
+
-
+
$(_BuildWasmAppsPayloadArchive)
set "HELIX_XUNIT_ARGS=-class %(Identity)"
@@ -213,23 +265,19 @@
$(_workItemTimeout)
+
-
-
- $(_WasmDebuggerTestsPayloadArchive)
- $(HelixCommand)
- $(_workItemTimeout)
-
+
+
+ <_WasmWorkItem Include="$(TestArchiveTestsRoot)**/Wasm.Debugger.Tests.zip" />
+
+ <_WasmDebuggerTestsPayloadArchive>@(_WasmWorkItem)
+
-
-
- <_WasmSampleZipFile Condition="'$(Scenario)' == 'normal' or '$(Scenario)' == ''" Include="$(TestArchiveRoot)runonly/**/*.Console.V8.*.Sample.zip" />
- <_WasmSampleZipFile Condition="'$(Scenario)' == 'WasmTestOnNodeJs'" Include="$(TestArchiveRoot)runonly/**/*.Console.Node.*.Sample.zip" />
- <_WasmSampleZipFile Condition="'$(Scenario)' == 'WasmTestOnBrowser'" Include="$(TestArchiveRoot)runonly/**/*.Browser.*.Sample.zip" />
-
-
- %(Identity)
+
+
+ $(_WasmDebuggerTestsPayloadArchive)
$(HelixCommand)
$(_workItemTimeout)