[browser] More Wasm.Build.Tests on CoreCLR (#128296)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Radek Doulik <radek.doulik@gmail.com>

Author: 3 people

eng/liveBuilds.targets

@@ -245,6 +245,9 @@
         $(LibrariesSharedFrameworkDir)*.a;
         $(LibrariesSharedFrameworkDir)*.dat;
         "
+        Exclude="$(LibrariesSharedFrameworkDir)libminipal.a;
+                 $(LibrariesSharedFrameworkDir)libSystem.IO.Compression.Native.a;
+                 $(LibrariesSharedFrameworkDir)libz.a"
         IsNative="true" />
 
       <!-- Runtime tests for Helix are built without the host subset, so browser host files are excluded from the runtime tests build -->

eng/testing/scenarios/BuildWasmAppsJobsListCoreCLR.txt

@@ -12,4 +12,12 @@ Wasm.Build.Tests.WasmRunOutOfAppBundleTests
 Wasm.Build.Tests.WasmTemplateTests
 Wasm.Build.Tests.MaxParallelDownloadsTests
 Wasm.Build.Tests.LibraryInitializerTests
+Wasm.Build.Tests.NativeBuildTests
+Wasm.Build.Tests.DllImportTests
+Wasm.Build.Tests.PInvokeTableGeneratorTests
+Wasm.Build.Tests.NativeLibraryTests
+Wasm.Build.Tests.IcuShardingTests
+Wasm.Build.Tests.IcuShardingTests2
+Wasm.Build.Tests.IcuTests
+Wasm.Build.Tests.MemoryTests
 Wasm.Build.Tests.DownloadThenInitTests

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

@@ -271,12 +271,14 @@
     <PlatformManifestFileEntry Include="libgcinfo_unix_wasm.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libminipal.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libnativeresourcestring.a" IsNative="true" />
+    <PlatformManifestFileEntry Include="libBrowserHost.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libBrowserHost.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libBrowserHost.js.map" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.Utils.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.Utils.js.map" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.js.map" IsNative="true" />
+    <PlatformManifestFileEntry Include="libSystem.Native.Browser.extpost.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Runtime.InteropServices.JavaScript.Native.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Runtime.InteropServices.JavaScript.Native.js.map" IsNative="true" />
     <!-- wasi specific -->

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj

@@ -14,6 +14,8 @@
     <VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName>
     <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
     <UseRidGraph>true</UseRidGraph>
+    <!-- WASM CoreCLR ships static libs in the runtime pack so apps can relink with emcc. -->
+    <IncludeStaticLibrariesInPack Condition="'$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'">true</IncludeStaticLibrariesInPack>
   </PropertyGroup>
 
   <ItemGroup>

src/libraries/sendtohelix-browser.targets

@@ -158,13 +158,17 @@
     <HelixPreCommand Include="$(EnvVarCommand) BROWSER_BUILD_TARGETS_DIR=$HELIX_CORRELATION_PAYLOAD/build/wasm/" />
     <HelixPreCommand Include="$(EnvVarCommand) WASM_APP_BUILDER_TASKS_ASSEMBLY_PATH=$HELIX_CORRELATION_PAYLOAD/build/WasmAppBuilder/WasmAppBuilder.dll" />
     <HelixPreCommand Include="$(EnvVarCommand) EMSDK_PATH=$HELIX_CORRELATION_PAYLOAD/build/emsdk/" />
+    <HelixPreCommand Include="$(EnvVarCommand) MINIPAL_INCLUDE_DIR=$HELIX_CORRELATION_PAYLOAD/build/minipal/" />
+    <HelixPreCommand Include="$(EnvVarCommand) CORECLR_VM_WASM_INCLUDE_DIR=$HELIX_CORRELATION_PAYLOAD/build/coreclr-vm-wasm/" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(Scenario)' == 'BuildWasmApps' and '$(WindowsShell)' == 'true'">
     <HelixPreCommand Include="$(EnvVarCommand) REPOSITORY_ENGINEERING_DIR=%HELIX_CORRELATION_PAYLOAD%\build\eng\" />
     <HelixPreCommand Include="$(EnvVarCommand) BROWSER_BUILD_TARGETS_DIR=%HELIX_CORRELATION_PAYLOAD%\build\wasm\" />
     <HelixPreCommand Include="$(EnvVarCommand) WASM_APP_BUILDER_TASKS_ASSEMBLY_PATH=%HELIX_CORRELATION_PAYLOAD%\build\WasmAppBuilder\WasmAppBuilder.dll" />
     <HelixPreCommand Include="$(EnvVarCommand) EMSDK_PATH=%HELIX_CORRELATION_PAYLOAD%\build\emsdk\" />
+    <HelixPreCommand Include="$(EnvVarCommand) MINIPAL_INCLUDE_DIR=%HELIX_CORRELATION_PAYLOAD%\build\minipal\" />
+    <HelixPreCommand Include="$(EnvVarCommand) CORECLR_VM_WASM_INCLUDE_DIR=%HELIX_CORRELATION_PAYLOAD%\build\coreclr-vm-wasm\" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Scenario)' == 'BuildWasmApps'">
@@ -174,7 +178,7 @@
     <_XUnitTraitArg Condition="'$(TestUsingWorkloads)' != 'true'">-trait category=no-workload</_XUnitTraitArg>
     <_XUnitTraitArg Condition="'$(WasmFingerprintAssets)' == 'false'">$(_XUnitTraitArg) -trait category=no-fingerprinting</_XUnitTraitArg>
     <_XUnitTraitArg Condition="'$(WasmBundlerFriendlyBootConfig)' == 'true'">$(_XUnitTraitArg) -trait category=bundler-friendly</_XUnitTraitArg>
-    <_XUnitTraitArg Condition="'$(RuntimeFlavor)' == 'CoreCLR'">-notrait category=native -notrait category=mono -notrait category=workload</_XUnitTraitArg>
+    <_XUnitTraitArg Condition="'$(RuntimeFlavor)' == 'CoreCLR'">-notrait category=native-mono -notrait category=mono -notrait category=workload</_XUnitTraitArg>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -283,6 +287,34 @@
       <HelixCorrelationPayload Include="$(_CoreCLRWbtEngPayloadDir)" Destination="build/eng" />
     </ItemGroup>
 
+    <!-- CoreCLR WBT: ship src/native/minipal/{utils.h,entrypoints.h} and
+         src/coreclr/vm/wasm/callhelpers.hpp into the payload so per-app native
+         re-link (BrowserWasmApp.CoreCLR.targets) can resolve the #include lines
+         emitted by ManagedToNativeGenerator output. Stage into directories first
+         because HelixCorrelationPayload on individual files causes the Helix
+         client to try unzipping them as archives. -->
+    <PropertyGroup Condition="'$(NeedsEMSDK)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">
+      <_CoreCLRWbtMinipalPayloadDir>$(ArtifactsObjDir)helix-staging\coreclr-wbt-minipal\</_CoreCLRWbtMinipalPayloadDir>
+      <_CoreCLRWbtVmWasmPayloadDir>$(ArtifactsObjDir)helix-staging\coreclr-wbt-vm-wasm\</_CoreCLRWbtVmWasmPayloadDir>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(NeedsEMSDK)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">
+      <_CoreCLRWbtMinipalFiles Include="$(RepoRoot)src\native\minipal\utils.h" />
+      <_CoreCLRWbtMinipalFiles Include="$(RepoRoot)src\native\minipal\entrypoints.h" />
+      <_CoreCLRWbtVmWasmFiles Include="$(RepoRoot)src\coreclr\vm\wasm\callhelpers.hpp" />
+    </ItemGroup>
+    <Copy Condition="'$(NeedsEMSDK)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'"
+          SourceFiles="@(_CoreCLRWbtMinipalFiles)"
+          DestinationFolder="$(_CoreCLRWbtMinipalPayloadDir)"
+          SkipUnchangedFiles="true" />
+    <Copy Condition="'$(NeedsEMSDK)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'"
+          SourceFiles="@(_CoreCLRWbtVmWasmFiles)"
+          DestinationFolder="$(_CoreCLRWbtVmWasmPayloadDir)"
+          SkipUnchangedFiles="true" />
+    <ItemGroup Condition="'$(NeedsEMSDK)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">
+      <HelixCorrelationPayload Include="$(_CoreCLRWbtMinipalPayloadDir)" Destination="build/minipal" />
+      <HelixCorrelationPayload Include="$(_CoreCLRWbtVmWasmPayloadDir)" Destination="build/coreclr-vm-wasm" />
+    </ItemGroup>
+
     <!-- copy node separately only if EMSDK is not being included -->
     <ItemGroup Condition="'$(IncludeNodePayload)' == 'true'">
       <HelixCorrelationPayload Include="$(EmSdkDirForHelixPayload)node"          Destination="build/emsdk-node" />