[ios][tests] Run functional tests with Mono and Native AOT on Helix

Directory.Build.props

@@ -173,6 +173,8 @@
     <CoreCLRToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)'))</CoreCLRToolPath>
     <ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true' or '$(BuildArchitecture)' == 's390x' or '$(BuildArchitecture)' == 'ppc64le'">$(CoreCLRToolPath)</ILAsmToolPath>
 
+    <NativeAotTargetsPath>$([MSBuild]::NormalizeDirectory('$(CoreClrProjectRoot)', 'nativeaot', 'BuildIntegration'))</NativeAotTargetsPath>
+
     <WasmtimeDir Condition="'$(WasmtimeDir)' == '' and '$(WASMTIME_PATH)' != '' and Exists($(WASMTIME_PATH))">$(WASMTIME_PATH)</WasmtimeDir>
     <WasmtimeDir Condition="'$(WasmtimeDir)' == ''">$([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime'))</WasmtimeDir>
     <InstallWasmtimeForTests Condition="'$(InstallWasmtimeForTests)' == '' and !Exists($(WasmtimeDir))">true</InstallWasmtimeForTests>

eng/pipelines/common/global-build-job.yml

@@ -2,8 +2,10 @@ parameters:
   buildConfig: ''
   nameSuffix: ''
   buildArgs: ''
+  runtimeBuildArgs: ''
   archType: ''
   hostedOs: ''
+  hostedArch: ''
   osGroup: ''
   osSubgroup: ''
   container: ''
@@ -70,6 +72,13 @@ jobs:
 
       - name: _osParameter
         value: -os ${{ parameters.osGroup }}
+      - name: _archParameter
+        value: -arch ${{ parameters.archType }}
+      - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), in(parameters.osGroup, 'ios', 'iossimulator', 'tvos', 'tvossimulator', 'maccatalyst')) }}:
+        - name: _osParameter
+          value: -os ${{ parameters.hostedOs }}
+        - name: _archParameter
+          value: -arch ${{ parameters.hostedArch }}
 
       - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubGroup, '_bionic')) }}:
         - name: _osParameter
@@ -190,7 +199,7 @@ jobs:
         - task: CodeQL3000Init@0
           displayName: Initialize CodeQL (manually-injected)
 
-      - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_cxx11Parameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
+      - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci $(_archParameter) $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_cxx11Parameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
         displayName: Build product
         ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
           continueOnError: ${{ parameters.shouldContinueOnError }}
@@ -200,6 +209,16 @@ jobs:
           displayName: Finalize CodeQL (manually-injected)
     #endif isSourceBuild
 
+    # Build Native AOT runtime packs
+    - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), in(parameters.osGroup, 'ios', 'iossimulator', 'tvos', 'tvossimulator', 'maccatalyst')) }}:
+      - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt)
+                clr.nativeaotruntime+clr.nativeaotlibs+libs+libs.tests
+                -os ${{ parameters.osGroup }}
+                -arch ${{ parameters.archType }}
+                -c ${{ parameters.buildConfig }}
+                ${{ parameters.runtimeBuildArgs }}
+        displayName: "Build Native AOT runtime packs"
+
     - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos', 'android') }}:
       - script: |
           du -sh $(Build.SourcesDirectory)/*

eng/pipelines/common/platform-matrix.yml

@@ -769,7 +769,13 @@ jobs:
       platform: ios_arm64
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
       jobParameters:
-        runtimeFlavor: mono
+        ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}:
+          hostedOs: osx
+          hostedArch: x64
+        ${{ if eq(parameters.runtimeFlavor, '') }}:
+          runtimeFlavor: mono
+        ${{ else }}:
+          runtimeFlavor: ${{ parameters.runtimeFlavor }}
         buildConfig: ${{ parameters.buildConfig }}
         helixQueueGroup: ${{ parameters.helixQueueGroup }}
         ${{ insert }}: ${{ parameters.jobParameters }}

eng/pipelines/global-build.yml

@@ -40,140 +40,140 @@ extends:
       - ${{ if eq(variables.dependOnEvaluatePaths, true) }}:
         - template: /eng/pipelines/common/evaluate-default-paths.yml
 
-      #
-      # Build with Release config and Debug runtimeConfiguration
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: release
-          platforms:
-          - windows_x86
-          - osx_x64
-          - osx_arm64
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: Runtime_Debug
-            buildArgs: -c release -runtimeConfiguration debug
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build with Release config and Debug runtimeConfiguration
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: release
+      #     platforms:
+      #     - windows_x86
+      #     - osx_x64
+      #     - osx_arm64
+      #     jobParameters:
+      #       testGroup: innerloop
+      #       nameSuffix: Runtime_Debug
+      #       buildArgs: -c release -runtimeConfiguration debug
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # Build with Release config and runtimeConfiguration with MSBuild generator
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: release
-          platforms:
-          - windows_x86
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: MSBuild_CMake
-            buildArgs: -c Release -msbuild
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build with Release config and runtimeConfiguration with MSBuild generator
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: release
+      #     platforms:
+      #     - windows_x86
+      #     jobParameters:
+      #       testGroup: innerloop
+      #       nameSuffix: MSBuild_CMake
+      #       buildArgs: -c Release -msbuild
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # Build with Debug config and Release runtimeConfiguration
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: debug
-          platforms:
-          - linux_x64_dev_innerloop
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: Runtime_Release
-            buildArgs: -c debug -runtimeConfiguration release
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build with Debug config and Release runtimeConfiguration
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: debug
+      #     platforms:
+      #     - linux_x64_dev_innerloop
+      #     jobParameters:
+      #       testGroup: innerloop
+      #       nameSuffix: Runtime_Release
+      #       buildArgs: -c debug -runtimeConfiguration release
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # Build with RuntimeFlavor only. This exercise code paths where only RuntimeFlavor is
-      # specified. Catches cases where we depend on Configuration also being specified
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: debug
-          platforms:
-          - linux_x64_dev_innerloop
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: RuntimeFlavor_Mono
-            buildArgs: /p:RuntimeFlavor=Mono
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build with RuntimeFlavor only. This exercise code paths where only RuntimeFlavor is
+      # # specified. Catches cases where we depend on Configuration also being specified
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: debug
+      #     platforms:
+      #     - linux_x64_dev_innerloop
+      #     jobParameters:
+      #       testGroup: innerloop
+      #       nameSuffix: RuntimeFlavor_Mono
+      #       buildArgs: /p:RuntimeFlavor=Mono
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # Build Mono + Libraries. This exercises the code path where we build libraries without
-      # first building CoreCLR
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: debug
-          platforms:
-          - windows_x64
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: Mono_Libraries
-            buildArgs: -subset mono+libs /p:RuntimeFlavor=Mono
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build Mono + Libraries. This exercises the code path where we build libraries without
+      # # first building CoreCLR
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: debug
+      #     platforms:
+      #     - windows_x64
+      #     jobParameters:
+      #       testGroup: innerloop
+      #       nameSuffix: Mono_Libraries
+      #       buildArgs: -subset mono+libs /p:RuntimeFlavor=Mono
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # Build Libraries AllConfigurations. This exercises the code path where we build libraries for all
-      # configurations on a non Windows operating system.
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: debug
-          platforms:
-          - linux_x64_dev_innerloop
-          jobParameters:
-            nameSuffix: Libraries_AllConfigurations
-            buildArgs: -subset libs -allconfigurations
-            timeoutInMinutes: 120
-            condition:
-              or(
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
+      # #
+      # # Build Libraries AllConfigurations. This exercises the code path where we build libraries for all
+      # # configurations on a non Windows operating system.
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: debug
+      #     platforms:
+      #     - linux_x64_dev_innerloop
+      #     jobParameters:
+      #       nameSuffix: Libraries_AllConfigurations
+      #       buildArgs: -subset libs -allconfigurations
+      #       timeoutInMinutes: 120
+      #       condition:
+      #         or(
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),
+      #           eq(variables['isRollingBuild'], true))
 
-      #
-      # SourceBuild Build
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: Release
-          platforms:
-          - SourceBuild_linux_x64
-          jobParameters:
-            nameSuffix: PortableSourceBuild
-            extraStepsParameters:
-              name: SourceBuildPackages
-            timeoutInMinutes: 95
-            condition:
-                eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)
+      # #
+      # # SourceBuild Build
+      # #
+      # - template: /eng/pipelines/common/platform-matrix.yml
+      #   parameters:
+      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
+      #     buildConfig: Release
+      #     platforms:
+      #     - SourceBuild_linux_x64
+      #     jobParameters:
+      #       nameSuffix: PortableSourceBuild
+      #       extraStepsParameters:
+      #         name: SourceBuildPackages
+      #       timeoutInMinutes: 95
+      #       condition:
+      #           eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)