diff --git a/eng/performance/maui_scenarios_ios.proj b/eng/performance/maui_scenarios_ios.proj index d6fc88576b7..f5f032e52c6 100644 --- a/eng/performance/maui_scenarios_ios.proj +++ b/eng/performance/maui_scenarios_ios.proj @@ -11,7 +11,10 @@ $(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\ $(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/ - --nativeaot true + --nativeaot true + + <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'mono'">/p:UseMonoRuntime=true + <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr'">/p:UseMonoRuntime=false diff --git a/eng/pipelines/sdk-perf-jobs.yml b/eng/pipelines/sdk-perf-jobs.yml index bd92ce6f6ec..fde76658c95 100644 --- a/eng/pipelines/sdk-perf-jobs.yml +++ b/eng/pipelines/sdk-perf-jobs.yml @@ -507,6 +507,24 @@ jobs: ${{ each parameter in parameters.jobParameters }}: ${{ parameter.key }}: ${{ parameter.value }} + # Maui iOS CoreCLR scenario benchmarks + - template: /eng/pipelines/templates/build-machine-matrix.yml + parameters: + jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml + buildMachines: + - osx-x64-ios-arm64 + isPublic: false + jobParameters: + runKind: maui_scenarios_ios + projectFileName: maui_scenarios_ios.proj + channels: + - main + runtimeFlavor: coreclr + codeGenType: Interpreter + additionalJobIdentifier: CoreCLR + ${{ each parameter in parameters.jobParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + # Maui iOS Native AOT scenario benchmarks - template: /eng/pipelines/templates/build-machine-matrix.yml parameters: diff --git a/scripts/run_performance_job.py b/scripts/run_performance_job.py index 774ed901986..ebda855ddbc 100644 --- a/scripts/run_performance_job.py +++ b/scripts/run_performance_job.py @@ -1007,7 +1007,7 @@ def publish_dotnet_app_to_payload(payload_dir_name: str, csproj_path: str, self_ os.environ["CodegenType"] = args.codegen_type or '' # TODO: See if these commands are needed for linux as they were being called before but were failing. - if args.os_group == "windows" or args.os_group == "osx": + if args.os_group == "windows" or (args.os_group == "osx" and args.run_kind not in ["maui_scenarios_ios", "maui_scenarios_android"]): RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "--upgrade", "pip"]).run() RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "urllib3==1.26.19"]).run() RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "requests"]).run()