[browser] Support CoreCLR in WebAssembly SDK

eng/pipelines/common/templates/browser-wasm-build-tests.yml

@@ -112,6 +112,7 @@ jobs:
           /p:WasmSkipMissingRuntimePackBuild=true
           /p:PreparePackagesForWorkloadInstall=false
           /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
+          /p:RuntimeFlavor=Mono
         timeoutInMinutes: 180
         condition: >-
           or(

eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml

@@ -0,0 +1,128 @@
+# Depends on other builds to get runtime packs, and nugets
+# And then runs Wasm.Build.Tests
+parameters:
+  alwaysRun: false
+  isExtraPlatformsBuild: false
+  isWasmOnlyBuild: false
+  platforms: []
+  shouldContinueOnError: false
+  extraBuildArgs: ''
+
+jobs:
+
+- ${{ each platform in parameters.platforms }}:
+  - template: /eng/pipelines/common/platform-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/common/global-build-job.yml
+      helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+      buildConfig: Debug
+      runtimeFlavor: CoreCLR
+      platforms:
+        - ${{ platform }}
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      variables:
+        # map dependencies variables to local variables
+        - name: alwaysRunVar
+          value: ${{ parameters.alwaysRun }}
+        - name: workloadsTestPreviousVersionsVar
+          value: false
+#         value: $[
+#           or(
+#             eq(variables['Build.SourceBranchName'], 'main'),
+#             eq(variables['System.PullRequest.TargetBranch'], 'main'))
+#           ]
+        - name: wbtProjectArg
+          ${{ if eq(platform, 'browser_wasm_win') }}:
+            value: '-projects'
+          ${{ else }}:
+            value: '--projects'
+        - name: shouldRunOnDefaultPipelines
+          value: $(shouldRunWasmBuildTestsOnDefaultPipeline)
+
+      jobParameters:
+        dependsOn:
+          - ${{ if eq(platform, 'browser_wasm') }}:
+            - build_browser_wasm_linux_Debug_AllSubsets_CoreCLR
+          - ${{ if eq(platform, 'browser_wasm_win') }}:
+            - build_browser_wasm_windows_Debug_AllSubsets_CoreCLR
+        isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+        testGroup: innerloop
+        nameSuffix: CoreCLR_WasmBuildTests
+
+        preBuildSteps:
+          # Download single threaded runtime packs, and tasks needed to build WBT
+          - task: DownloadBuildArtifacts@0
+            displayName: Download built nugets for singlethreaded runtime
+            inputs:
+              buildType: current
+              artifactName: 'BuildArtifacts_browser_wasm_$(_hostedOs)_Debug_AllSubsets_CoreCLR'
+              downloadType: single
+              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+
+          - task: CopyFiles@2
+            displayName: Copy single threaded assets
+            inputs:
+              SourceFolder: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Debug_AllSubsets_CoreCLR'
+              TargetFolder: '$(Build.SourcesDirectory)/artifacts'
+              CleanTargetFolder: false
+
+          # Download for multi-threaded
+          # - task: DownloadBuildArtifacts@0
+          #   displayName: Download built nugets for multi-threaded runtime
+          #   inputs:
+          #     buildType: current
+          #     artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
+          #     downloadType: single
+          #     downloadPath: '$(Build.SourcesDirectory)/artifacts'
+
+          # - task: CopyFiles@2
+          #   displayName: Copy multithreading runtime pack
+          #   inputs:
+          #     SourceFolder: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'
+          #     Contents: packages/$(_BuildConfig)/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.*
+          #     TargetFolder: '$(Build.SourcesDirectory)/artifacts'
+          #     CleanTargetFolder: false
+
+          # Download WBT - TODO-WASM: This points to "mono" build, altough 
+          - task: DownloadBuildArtifacts@0
+            displayName: Download Wasm.Build.Tests
+            inputs:
+              buildType: current
+              artifactName: WasmBuildTests_$(_hostedOs)_AllSubsets_CoreCLR
+              downloadType: single
+              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+
+          - task: CopyFiles@2
+            displayName: Copy Wasm.Build.Tests archive
+            inputs:
+              SourceFolder: '$(Build.SourcesDirectory)/artifacts/WasmBuildTests_$(_hostedOs)_AllSubsets_CoreCLR'
+              Contents: helix/**
+              TargetFolder: '$(Build.SourcesDirectory)/artifacts'
+              CleanTargetFolder: false
+
+        # build WBT
+        buildArgs: >-
+          $(wbtProjectArg) $(Build.SourcesDirectory)/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj
+          /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Build.binlog
+          /p:Configuration=$(_BuildConfig)
+          /p:TestUsingWorkloads=false
+          /p:InstallWorkloadForTesting=true
+          /p:WasmSkipMissingRuntimePackBuild=true
+          /p:PreparePackagesForWorkloadInstall=false
+          /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
+          /p:RuntimeFlavor=CoreCLR
+        timeoutInMinutes: 180
+        condition: >-
+          or(
+            eq(variables['alwaysRunVar'], true),
+            eq(variables['isDefaultPipeline'], variables['shouldRunWasmBuildTestsOnDefaultPipeline']))
+
+        # extra steps, run tests
+        postBuildSteps:
+          - template: /eng/pipelines/libraries/helix.yml
+            parameters:
+              creator: dotnet-bot
+              testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)_$(_hostedOs)
+              extraHelixArguments: /p:BrowserHost=$(_hostedOs)
+              scenarios:
+              - buildwasmapps

eng/pipelines/runtime-linker-tests.yml

@@ -135,5 +135,5 @@ extends:
             postBuildSteps:
               - template: /eng/pipelines/libraries/execute-trimming-tests-steps.yml
                 parameters:
-                    extraTestArgs: '/p:WasmBuildNative=false'
+                    extraTestArgs: '/p:WasmBuildNative=false /p:RuntimeFlavor=Mono'
                     runAotTests: false

eng/pipelines/runtime.yml

@@ -112,12 +112,16 @@ extends:
           - browser_wasm_win
           jobParameters:
             nameSuffix: AllSubsets_CoreCLR
-            buildArgs: -s clr+libs+packs -c $(_BuildConfig) -lc Release
+            buildArgs: -s clr+libs+libs.tests+packs -c $(_BuildConfig) -lc Release /p:TestAssemblies=false /p:TestWasmBuildTests=true /p:ArchiveTests=true /p:InstallWorkloadForTesting=false
             timeoutInMinutes: 120
             postBuildSteps:
               - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml
                 parameters:
                   testBuildArgs: test JIT/interpreter/Interpreter.csproj
+              - template: /eng/pipelines/common/wasm-post-build-steps.yml
+                parameters:
+                  publishArtifactsForWorkload: true
+                  publishWBT: true
             extraVariablesTemplates:
               - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
                 parameters:
@@ -130,6 +134,15 @@ extends:
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
 
+      # Browser Wasm.Build.Tests
+      - template: /eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml
+        parameters:
+          platforms:
+            - browser_wasm
+            - browser_wasm_win
+          alwaysRun: ${{ variables.isRollingBuild }}
+          extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+
       #
       # Build CoreCLR and Libraries with Libraries tests
       # For running libraries tests and installer tests

eng/testing/tests.browser.targets

@@ -20,6 +20,10 @@
       ReadWasmNativeAssetsFromFileSystem;
       UpdateWasmNativeAssetOriginalItemSpec
     </ResolveWasmOutputsDependsOn>
+    <ResolveWasmOutputsDependsOn Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
+      $(ResolveWasmOutputsDependsOn);
+      AddTestRunnersToReferenceCopyLocalPaths
+    </ResolveWasmOutputsDependsOn>
 
     <!-- set this when provisioning emsdk on CI -->
     <EMSDK_PATH Condition="'$(EMSDK_PATH)' == '' and '$(ContinuousIntegrationBuild)' == 'true' and '$(MonoProjectRoot)' != ''">$([MSBuild]::NormalizeDirectory($(BrowserProjectRoot), 'emsdk'))</EMSDK_PATH>
@@ -176,6 +180,24 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="AddTestRunnersToReferenceCopyLocalPaths"
+          AfterTargets=""
+          Condition="'$(TestFramework)' == 'xunit'">
+    <ItemGroup>
+      <_runnerFilesToBuild Include="$(WasmTestRunnerDir)*" />
+
+      <!-- Remove runner files that already exist in ReferenceCopyLocalPaths to avoid double Building -->
+      <_resolvedFilesToBuildToFileName Include="@(ReferenceCopyLocalPaths -> '%(FileName)%(Extension)')" />
+
+      <_runnerFilesToBuildToFileName Include="@(_runnerFilesToBuild -> '%(FileName)%(Extension)')">
+        <OriginalIdentity>%(Identity)</OriginalIdentity>
+      </_runnerFilesToBuildToFileName>
+      <_runnerFilesToBuildToFileName Remove="@(_resolvedFilesToBuildToFileName)" />
+
+      <ReferenceCopyLocalPaths Include="@(_runnerFilesToBuildToFileName -> '%(OriginalIdentity)')" RelativePath="%(FileName)%(Extension)" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
+    </ItemGroup>
+  </Target>
+
   <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.LinkContentToWwwroot" AssemblyFile="$(WasmBuildTasksAssemblyPath)" Condition="'$(TestTrimming)' != 'true'" />
 
   <Target Name="LinkContentToWwwroot" BeforeTargets="ResolveProjectStaticWebAssets" Condition="'$(TargetOS)' == 'browser' and '$(WasmBuildingForNestedPublish)' != 'true' and '$(TestTrimming)' != 'true'">

eng/testing/workloads-browser.targets

@@ -8,7 +8,7 @@
 
   <Target Name="_GetWorkloadsToInstall" DependsOnTargets="_SetPackageVersionForWorkloadsTesting" Returns="@(WorkloadIdForTesting);@(WorkloadCombinationsToInstall)">
     <Error Condition="'$(RIDForWorkload)' == ''" Text="$(RIDForWorkload) is unset" />
-    <ItemGroup>
+    <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
       <WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
                             ManifestName="Microsoft.NET.Workload.Mono.ToolChain.Current"
                             Variant="latest"
@@ -73,16 +73,11 @@
       </_DefaultRuntimePackNuGetPath>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
       <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.$(RIDForWorkload).*$(PackageVersionForWorkloadManifests).nupkg" />
       <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.*.$(RIDForWorkload).*$(PackageVersionForWorkloadManifests).nupkg" />
       <_RuntimePackNugetAvailable Remove="@(_RuntimePackNugetAvailable)" Condition="$([System.String]::new('%(_RuntimePackNugetAvailable.FileName)').EndsWith('.symbols'))" />
-    </ItemGroup>
-
-    <Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 2 and @(_RuntimePackNugetAvailable -> Count()) != 1"
-           Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
-
-    <ItemGroup>
+
       <!-- We need nugets for all wasm runtime flavors. The one corresponding the current
       property values is already built, the others need to be added to NuGetsToBuildForWorkloadTesting -->
       <NuGetsToBuildForWorkloadTesting Include="$(_DefaultRuntimePackNuGetPath)"
@@ -91,6 +86,21 @@
                       Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(_IsMTNugetMissing)"
                       Descriptor="$(_Descriptor)"/>
     </ItemGroup>
+    <ItemGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
+      <_RuntimePackNugetAvailable Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.$(RIDForWorkload).*$(PackageVersionForWorkloadManifests).nupkg" />
+      <_RuntimePackNugetAvailable Remove="@(_RuntimePackNugetAvailable)" Condition="$([System.String]::new('%(_RuntimePackNugetAvailable.FileName)').EndsWith('.symbols'))" />
+
+      <!-- We need nugets for all wasm runtime flavors. The one corresponding the current
+      property values is already built, the others need to be added to NuGetsToBuildForWorkloadTesting -->
+      <NuGetsToBuildForWorkloadTesting Include="$(_DefaultRuntimePackNuGetPath)"
+                      Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj"
+                      Dependencies="$(_DefaultRuntimePackNuGetPath)"
+                      Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(_IsMTNugetMissing);RuntimeFlavor=CoreCLR"
+                      Descriptor="$(_Descriptor)"/>
+    </ItemGroup>
+
+    <Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 2 and @(_RuntimePackNugetAvailable -> Count()) != 1"
+           Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
 
     <Message
         Condition="@(_RuntimePackNugetAvailable -> Count()) == 1"

eng/testing/workloads-wasm.targets

@@ -22,7 +22,8 @@
       <NuGetsToBuildForWorkloadTesting Include="$(_AOTCrossNuGetPath)"
                       Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App\MonoCrossAOT\Microsoft.NETCore.App.MonoCrossAOT.$(RIDForWorkload).sfxproj"
                       Properties="@(_PropsForAOTCrossBuild,';')"
-                      Descriptor="AOT Cross compiler"/>
+                      Descriptor="AOT Cross compiler"
+                      Condition="'$(RuntimeFlavor)' == 'Mono'" />
     </ItemGroup>
   </Target>
 </Project>

src/coreclr/.nuget/coreclr-packages.proj

@@ -12,5 +12,13 @@
     <ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.proj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
+    <ProjectReference Include="$(MonoProjectRoot)\nuget\Microsoft.NETCore.BrowserDebugHost.Transport\Microsoft.NETCore.BrowserDebugHost.Transport.pkgproj" />
+    <ProjectReference Include="$(MonoProjectRoot)\wasm\templates\Microsoft.NET.Runtime.WebAssembly.Templates.csproj" />
+    <ProjectReference Include="$(MonoProjectRoot)\nuget\Microsoft.NET.Sdk.WebAssembly.Pack\Microsoft.NET.Sdk.WebAssembly.Pack.pkgproj" />
+
+    <ProjectReference Include="$(MonoProjectRoot)\nuget\Microsoft.NET.Runtime.WorkloadTesting.Internal\Microsoft.NET.Runtime.WorkloadTesting.Internal.pkgproj" />
+  </ItemGroup>
+
   <Import Project="versioning.targets" />
 </Project>

src/libraries/pretest.proj

@@ -22,13 +22,16 @@
 
     <ProjectReference Include="$(CommonTestPath)AppleTestRunner\AppleTestRunner.csproj" Condition="'$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator'"/>
     <ProjectReference Include="$(CommonTestPath)AndroidTestRunner\AndroidTestRunner.csproj" Condition="'$(TargetOS)' == 'android'" />
-    <ProjectReference Include="$(CommonTestPath)WasmTestRunner\WasmTestRunner.csproj" Condition="('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi') and '$(RuntimeFlavor)' == 'Mono'" />
-    <ProjectReference Include="$(MonoProjectRoot)wasm\symbolicator\WasmSymbolicator.csproj" Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'" />
+    <ProjectReference Include="$(CommonTestPath)WasmTestRunner\WasmTestRunner.csproj" Condition="('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi')" />
+    <ProjectReference Include="$(MonoProjectRoot)wasm\symbolicator\WasmSymbolicator.csproj" Condition="'$(TargetOS)' == 'browser'" />
 
     <!-- needed to test workloads for wasm -->
     <ProjectReference Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.Mono.sfxproj"
                       Pack="true"
                       Condition="('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi') and '$(RuntimeFlavor)' == 'Mono'" />
+    <ProjectReference Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj"
+                      Pack="true"
+                      Condition="('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi') and '$(RuntimeFlavor)' == 'CoreCLR'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestReadyToRun)' == 'true'">

src/libraries/sendtohelix-browser.targets

@@ -135,6 +135,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'">-trait category=$(RuntimeFlavor)</_XUnitTraitArg>
   </PropertyGroup>
 
   <PropertyGroup>

src/libraries/sendtohelix.proj

@@ -85,10 +85,11 @@
 
     <!-- For BuildWasmApps we want to build the project 4 times, with: TestUsingWorkloads=true, and TestUsingWorkloads=false and WasmEnableWebcil=true and WasmEnableWebcil=false-->
     <ItemGroup Condition="'@(_Scenarios -> AnyHaveMetadataValue('Identity', 'buildwasmapps'))' == 'true'">
-      <_TestUsingWorkloadsValues Include="true;false" />
-      <_TestUsingWebcilValues Include="true;false" Condition="'$(TargetOS)' == 'browser'" />
-      <_TestUsingFingerprintingValues Include="true;false" Condition="'$(TargetOS)' == 'browser'" />
-      <_TestUsingJavascriptBundlerValues Include="true;false" Condition="'$(TargetOS)' == 'browser'" />
+      <_TestUsingWorkloadsValues Include="false" />
+      <_TestUsingWorkloadsValues Include="true" Condition="'$(RuntimeFlavor)' == 'Mono'" />
+      <_TestUsingWebcilValues Include="true;false" Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'" />
+      <_TestUsingFingerprintingValues Include="true;false" Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'" />
+      <_TestUsingJavascriptBundlerValues Include="true;false" Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'" />
 
       <!-- now make the cartesian product of true and false values for two categories -->
       <_TestUsingCrossProductValuesTemp Include="@(_TestUsingWorkloadsValues)">
@@ -106,7 +107,7 @@
       <_TestUsingCrossProductValues Remove="@(_TestUsingCrossProductValues)" Condition="'%(_TestUsingCrossProductValues.Workloads)' == 'false' and '%(_TestUsingCrossProductValues.Fingerprinting)' == 'false'" />
 
       <!-- Add combination for JavascriptBundler friendliness -->
-      <_TestUsingCrossProductValues Include="JavaScriptBundlerFriendly">
+      <_TestUsingCrossProductValues Include="JavaScriptBundlerFriendly" Condition="'$(RuntimeFlavor)' == 'Mono'">
         <Workloads>true</Workloads>
         <Webcil>true</Webcil>
         <Fingerprinting>true</Fingerprinting>

src/mono/browser/build/BrowserWasmApp.CoreCLR.targets

@@ -0,0 +1,9 @@
+<Project>
+  <!-- TODO-WASM: These targets are invoked by public WasmSDK -->
+  <Target Name="WasmBuildApp">
+    <Message Importance="high" Text="WasmBuildApp for CoreCLR not implemented" />
+  </Target>
+  <Target Name="WasmTriggerPublishApp">
+    <Message Importance="high" Text="WasmTriggerPublishApp for CoreCLR not implemented" />
+  </Target>
+</Project>