[wasm][aot] Testing Steve's aot helix PR

Directory.Build.props

@@ -70,6 +70,7 @@
  <AndroidAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</AndroidAppBuilderDir>
  <WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmAppBuilderDir>
  <WasmBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmBuildTasksDir>
+ <WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
  <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
  <RuntimeConfigParserDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'RuntimeConfigParser', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</RuntimeConfigParserDir>
 

eng/pipelines/common/platform-matrix.yml

@@ -194,7 +194,7 @@ jobs:
  targetRid: browser-wasm
  platform: Browser_wasm
  container:
- image: ubuntu-18.04-webassembly-20210223133559-4800846
+ image: ubuntu-18.04-webassembly-20210309143118-005aab4
  registry: mcr
  jobParameters:
  runtimeFlavor: ${{ parameters.runtimeFlavor }}

eng/pipelines/runtime-staging.yml

@@ -205,8 +205,47 @@ jobs:
  jobParameters:
  testGroup: innerloop
  nameSuffix: AllSubsets_Mono_AOT
- buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:EnableAggressiveTrimming=true /p:RunAOTCompilation=true
- timeoutInMinutes: 120
+ buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:EnableAggressiveTrimming=true /p:BuildWasmAOTTestsOnHelix=true /p:RunAOTCompilation=true
+ timeoutInMinutes: 180
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+ eq(variables['isFullMatrix'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ extraHelixArguments: /p:NeedsToBuildWasmAppsOnHelix=true
+ scenarios:
+ - normal
+ condition: >-
+ or(
+ eq(variables['librariesContainsChange'], true),
+ eq(variables['monoContainsChange'], true),
+ eq(variables['isFullMatrix'], true))
+
+- 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: Release
+ runtimeFlavor: mono
+ platforms:
+ - Browser_wasm
+ variables:
+ # map dependencies variables to local variables
+ - name: librariesContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+ - name: monoContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: AllSubsets_Mono_EAT
+ buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:EnableAggressiveTrimming=true /p:BuildWasmAOTTestsOnHelix=true /p:RunAOTCompilation=false
+ timeoutInMinutes: 180
  condition: >-
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -218,6 +257,7 @@ jobs:
  extraStepsParameters:
  creator: dotnet-bot
  testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ extraHelixArguments: /p:NeedsToBuildWasmAppsOnHelix=true
  scenarios:
  - normal
  condition: >-

eng/testing/ILLink.Descriptor.TestUtilities.xml

@@ -0,0 +1,5 @@
+<linker>
+ <assembly fullname="TestUtilities">
+ <namespace fullname="System" />
+ </assembly>
+</linker>

eng/testing/ILLink.Descriptor.xunit.xml

@@ -9,7 +9,7 @@
  </type>
  <type fullname="Xunit.Sdk.FactDiscoverer" />
  </assembly>
- <assembly fullname="xunit.core">
-  <namespace fullname="Xunit" />
- </assembly>
+ <assembly fullname="xunit.core"/>
+ <assembly fullname="Microsoft.DotNet.XUnitExtensions"/>
+ <assembly fullname="mscorlib" />
 </linker>

eng/testing/tests.mobile.targets

@@ -13,15 +13,31 @@
  <UseDefaultiOSFeatureSwitches Condition="'$(UseDefaultiOSFeatureSwitches)' == ''">true</UseDefaultiOSFeatureSwitches>
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(TargetOS)' == 'Browser' And '$(UseDefaultBlazorWASMFeatureSwitches)' == 'true'">
+ <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
+ <BuildWasmTestsOn Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(Scenario)' == 'BuildWasmApps'">helix</BuildWasmTestsOn>
+ <BuildWasmTestsOn Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(BuildWasmAOTTestsOnHelix)' == 'true'">helix</BuildWasmTestsOn>
+ <BuildWasmTestsOn Condition="'$(BuildWasmTestsOn)' == ''">local</BuildWasmTestsOn>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildWasmAOTTestsOnHelix)' == 'true'">
+ <RunScriptCommand>dotnet msbuild publish/aot-build.proj /p:WasmBuildSupportDir=$HELIX_CORRELATION_PAYLOAD/build /bl:$XHARNESS_OUT/AOTBuild.binlog</RunScriptCommand>
+ <RunScriptCommand Condition="'$(RunAOTCompilation)' != ''">$(RunScriptCommand) /p:RunAOTCompilation=$(RunAOTCompilation)</RunScriptCommand>
+
+ <RunScriptCommand>$(RunScriptCommand) &amp;&amp; cd AppBundle &amp;&amp;</RunScriptCommand>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
  <!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties -->
- <RunScriptCommand Condition="'$(IsFunctionalTest)' != 'true' and '$(Scenario)' != 'BuildWasmApps'">$HARNESS_RUNNER wasm $XHARNESS_COMMAND --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT -- $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
- <RunScriptCommand Condition="'$(IsFunctionalTest)' == 'true'">$HARNESS_RUNNER wasm $XHARNESS_COMMAND --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --expected-exit-code=$(ExpectedExitCode) -- $(RunTestsJSArguments) --run $(AssemblyName).dll --testing</RunScriptCommand>
+ <RunScriptCommand Condition="'$(IsFunctionalTest)' != 'true' and '$(Scenario)' != 'BuildWasmApps'">$(RunScriptCommand) $HARNESS_RUNNER wasm $XHARNESS_COMMAND --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT -- $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
+ <RunScriptCommand Condition="'$(IsFunctionalTest)' == 'true'">$(RunScriptCommand) $HARNESS_RUNNER wasm $XHARNESS_COMMAND --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --expected-exit-code=$(ExpectedExitCode) -- $(RunTestsJSArguments) --run $(AssemblyName).dll --testing</RunScriptCommand>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(TargetOS)' == 'Browser' And '$(UseDefaultBlazorWASMFeatureSwitches)' == 'true'">
  <EventSourceSupport>false</EventSourceSupport>
- <UseSystemResourceKeys>true</UseSystemResourceKeys>
+ <UseSystemResourceKeys>false</UseSystemResourceKeys>
  <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
  <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
- <DebuggerSupport>false</DebuggerSupport>
+ <DebuggerSupport>true</DebuggerSupport>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
@@ -163,7 +179,7 @@
  <BundleAssemblies Condition="'$(RunAOTCompilation)' != 'true'" Include="$(PublishDir)*.dll" />
  </ItemGroup>
 
- <MakeDir Directories="$(_MobileIntermediateOutputPath)" 
+ <MakeDir Directories="$(_MobileIntermediateOutputPath)"
  Condition="'$(RunAOTCompilation)' == 'true'"/>
  <RemoveDir Directories="$(BundleDir)" />
 
@@ -240,31 +256,53 @@
 
  <ItemGroup>
  <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml" />
+ <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.TestUtilities.xml" Condition="'$(SkipTestUtilitiesReference)' != 'true'" />
  </ItemGroup>
  </Target>
 
  <!-- Don't include InTree.props here, because the test projects themselves can set the target* properties -->
- <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.props" Condition="'$(TargetOS)' == 'Browser'" />
- <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.InTree.targets" Condition="'$(TargetOS)' == 'Browser'" />
- <PropertyGroup>
+ <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.props"
+ Condition="'$(TargetOS)' == 'Browser' and '$(BuildWasmTestsOn)' == 'local'" />
+ <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.InTree.targets"
+ Condition="'$(TargetOS)' == 'Browser' and '$(BuildWasmTestsOn)' == 'local'" />
+
+ <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
  <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
- <EmSdkDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'emsdk'))</EmSdkDir>
+ <EmSdkDirForHelixPayload>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'emsdk'))</EmSdkDirForHelixPayload>
+
+ <BundleTestWasmAppDependsOn Condition="'$(BuildWasmTestsOn)' == 'local'">WasmBuildApp</BundleTestWasmAppDependsOn>
+ <BundleTestWasmAppDependsOn Condition="'$(BuildWasmTestsOn)' == 'helix'">StageEmSdkForHelix</BundleTestWasmAppDependsOn>
+
+ <BundleTestWasmAppDependsOn Condition="'$(BuildWasmAOTTestsOnHelix)' == 'true'">$(BundleTestWasmAppDependsOn);_BundleAOTTestWasmAppForHelix</BundleTestWasmAppDependsOn>
  </PropertyGroup>
 
- <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp;StageEmSdkForHelix" />
+ <Target Name="BundleTestWasmApp" Condition="'$(TargetOS)' == 'Browser'" DependsOnTargets="$(BundleTestWasmAppDependsOn)" />
+
+ <Target Name="_BundleAOTTestWasmAppForHelix" DependsOnTargets="PrepareForWasmBuildApp">
+ <ItemGroup>
+ <BundleFiles Include="$(WasmMainJSPath)" TargetDir="publish" />
+ <BundleFiles Include="@(WasmSatelliteAssemblies)" TargetDir="%(WasmSatelliteAssemblies.CultureName)" />
+ <BundleFiles Include="@(WasmAssembliesToBundle)" TargetDir="publish" />
+
+ <BundleFiles Include="$(MonoProjectRoot)\wasm\data\aot-tests\*" TargetDir="publish" />
+ </ItemGroup>
+
+ <Copy SourceFiles="@(BundleFiles)" DestinationFolder="$(BundleDir)%(TargetDir)" />
+ <Copy SourceFiles="@(WasmFilesToIncludeInFileSystem)" DestinationFiles="$(BundleDir)\extraFiles\%(WasmFilesToIncludeInFileSystem.TargetPath)" Condition="'%(WasmFilesToIncludeInFileSystem.TargetPath)' != ''" />
+ </Target>
 
  <!-- CI has emscripten provisioned in $(EMSDK_PATH) as `/usr/local/emscripten`. Because helix tasks will
  attempt to write a .payload file, we cannot use $(EMSDK_PATH) to package emsdk as a helix correlation 
  payload. Instead, we copy over the files to a new directory `src/mono/wasm/emsdk` and use that. -->
- <Target Name="StageEmSdkForHelix" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' == 'BuildWasmApps' and '$(ContinuousIntegrationBuild)' == 'true' and !Exists($(EmSdkDir))">
- <Error Condition="!Exists($(EMSDK_PATH))" Text="Could not find emscripten sdk in $(EmSdkDir) or in EMSDK_PATH=$(EMSDK_PATH)" />
+ <Target Name="StageEmSdkForHelix" Condition="'$(TargetOS)' == 'Browser' and !Exists($(EmSdkDirForHelixPayload))">
+ <Error Condition="!Exists($(EMSDK_PATH))" Text="Could not find emscripten sdk in $(EmSdkDirForHelixPayload) or in EMSDK_PATH=$(EMSDK_PATH)" />
 
  <ItemGroup>
  <EmSdkFiles Include="$(EMSDK_PATH)\**\*" Exclude="$(EMSDK_PATH)\.git\**\*" />
  </ItemGroup>
 
- <MakeDir Directories="$(EmSdkDir)" />
- <Copy SourceFiles="@(EmSdkFiles)" DestinationFolder="$(EmSdkDir)\%(RecursiveDir)" />
+ <MakeDir Directories="$(EmSdkDirForHelixPayload)" />
+ <Copy SourceFiles="@(EmSdkFiles)" DestinationFolder="$(EmSdkDirForHelixPayload)\%(RecursiveDir)" />
  </Target>
 
  <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp">
@@ -286,10 +324,16 @@
  <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
 
  <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
- <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />
+
+ <_CopyLocalPaths Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />
+ <_CopyLocalPaths TargetPath="%(_CopyLocalPaths.RelativePath)" Condition="'%(_CopyLocalPaths.RelativePath)' != ''" />
+ <_CopyLocalPaths TargetPath="%(FileName)%(Extension)" Condition="'%(_CopyLocalPaths.RelativePath)' == ''" />
+ <WasmFilesToIncludeInFileSystem Include="@(_CopyLocalPaths)" />
+
  <WasmFilesToIncludeInFileSystem Include="@(WasmSatelliteAssemblies)" TargetPath="%(WasmSatelliteAssemblies.CultureName)\%(WasmSatelliteAssemblies.Filename)%(WasmSatelliteAssemblies.Extension)" />
+
  <!-- Include files specified by test projects from publish dir -->
- <WasmFilesToIncludeInFileSystem Include="@(WasmFilesToIncludeFromPublishDir -> '$(PublishDir)%(Identity)')" />
+ <WasmFilesToIncludeInFileSystem Include="$(PublishDir)%(WasmFilesToIncludeFromPublishDir.Identity)" TargetPath="%(WasmFilesToIncludeFromPublishDir.Identity)" Condition="'%(WasmFilesToIncludeFromPublishDir.Identity)' != ''" />
  </ItemGroup>
  </Target>
 

src/libraries/sendtohelix.proj

@@ -63,6 +63,7 @@
  <!-- MSBuild creates a new instance of the project for each %(_Scenarios.Identity) and can build them in parallel. -->
  <_ProjectsToBuild Include="$(PerScenarioProjectFile)">
  <AdditionalProperties>$(_PropertiesToPass);Scenario=%(_Scenarios.Identity);TestArchiveRuntimeFile=$(TestArchiveRuntimeFile)</AdditionalProperties>
+ <AdditionalProperties Condition="'$(NeedsToBuildWasmAppsOnHelix)' != ''">%(_ProjectsToBuild.AdditionalProperties);NeedsToBuildWasmAppsOnHelix=$(NeedsToBuildWasmAppsOnHelix)</AdditionalProperties>
  </_ProjectsToBuild>
  </ItemGroup>
 

src/libraries/sendtohelixhelp.proj

@@ -50,6 +50,7 @@
  <TestRunNamePrefix Condition="'$(Scenario)' != ''">$(TestRunNamePrefix)$(Scenario)-</TestRunNamePrefix>
 
  <FailOnTestFailure Condition="'$(WaitForWorkItemCompletion)' != ''">$(WaitForWorkItemCompletion)</FailOnTestFailure>
+ <NeedsToBuildWasmAppsOnHelix Condition="'$(TargetOS)' == 'Browser' and '$(NeedsToBuildWasmAppsOnHelix)' == '' and '$(Scenario)' == 'BuildWasmApps'">true</NeedsToBuildWasmAppsOnHelix>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(TestPackages)' == 'true'">
@@ -104,7 +105,7 @@
  <HelixPreCommand Include="export PATH=$HELIX_CORRELATION_PAYLOAD/chrome-linux:$PATH" />
  </ItemGroup>
 
- <PropertyGroup Condition="'$(Scenario)' == 'BuildWasmApps'">
+ <PropertyGroup Condition="'$(NeedsToBuildWasmAppsOnHelix)' == 'true'">
  <IncludeXHarnessCli>true</IncludeXHarnessCli>
  <IncludeDotNetCli>true</IncludeDotNetCli>
  <DotNetCliPackageType>sdk</DotNetCliPackageType>
@@ -255,6 +256,8 @@
  <WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
  </PropertyGroup>
 
+ <Message Condition="'$(TargetOS)' == 'Browser'" Importance="High" Text="Using emsdk: $(EmSdkDir)" />
+
  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(BUILD_BUILDID)' != ''">
  <HelixPostCommands Condition="'$(TargetsWindows)' == 'true'">
  $(HelixPostCommands);
@@ -266,7 +269,7 @@
  </HelixPostCommands>
  </PropertyGroup>
 
- <ItemGroup Condition="'$(Scenario)' == 'BuildWasmApps'">
+ <ItemGroup Condition="'$(NeedsToBuildWasmAppsOnHelix)' == 'true'">
  <HelixCorrelationPayload Include="$(EmSdkDir)" Destination="build/emsdk" />
  <HelixCorrelationPayload Include="$(WasmAppBuilderDir)" Destination="build/WasmAppBuilder" />
  <HelixCorrelationPayload Include="$(MonoAOTCompilerDir)" Destination="build/MonoAOTCompiler" />