From 5dbf950474022e62e7f58daa3218ae37d1ceb470 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Jun 2024 15:14:28 +0200 Subject: [PATCH 1/3] Re-enable trimming of library tests on Apple mobile --- .../extra-platforms/runtime-extra-platforms-ioslike.yml | 3 +-- eng/pipelines/runtime.yml | 3 +-- src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml index 9794c736e2e82..be6ef9c63c00b 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml @@ -39,8 +39,7 @@ jobs: ${{ if eq(variables['isRollingBuild'], true) }}: buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false ${{ else }}: - # Tracking issue: https://github.com/dotnet/runtime/issues/82637 - buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false + buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=true timeoutInMinutes: 480 # extra steps, run tests postBuildSteps: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 97092071411ef..0cdcd022a4102 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1008,8 +1008,7 @@ extends: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - # Tracking issue: https://github.com/dotnet/runtime/issues/82637 - buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:RunSmokeTestsOnly=true /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:EnableAggressiveTrimming=false + buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:RunSmokeTestsOnly=true /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:EnableAggressiveTrimming=true timeoutInMinutes: 480 condition: >- or( diff --git a/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj b/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj index 0230c7d10d3a5..727e6b6c58a08 100644 --- a/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj +++ b/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj @@ -12,6 +12,8 @@ true $(OriginalPublishDir) + + false From 8630c0870d502f93d270daac70c127cc6244c073 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Jun 2024 19:43:31 +0200 Subject: [PATCH 2/3] Add on change trigger for tools_illink subset --- .../extra-platforms/runtime-extra-platforms-ioslike.yml | 2 ++ eng/pipelines/runtime.yml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml index be6ef9c63c00b..81756a071a0e2 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml @@ -31,6 +31,8 @@ jobs: value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] + - name: illinkContainsChange + value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 0cdcd022a4102..f544fc1b977a9 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1005,6 +1005,8 @@ extends: value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ] + - name: illinkContainsChange + value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -1015,6 +1017,7 @@ extends: eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests postBuildSteps: @@ -1027,6 +1030,7 @@ extends: or( eq(variables['librariesContainsChange'], true), eq(variables['monoContainsChange'], true), + eq(variables['illinkContainsChange'], true), eq(variables['isRollingBuild'], true)) # From 2806ac452b32d792908cf2cc7604dfc9c0e75761 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 2 Jul 2024 09:22:35 +0200 Subject: [PATCH 3/3] Set DynamicCodeSupport=false property --- src/tests/Directory.Build.props | 2 ++ src/tests/FunctionalTests/Directory.Build.props | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 8f85e3a0c293f..dc3b55e03da1d 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -209,6 +209,8 @@ true true true + + false diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 16117373adea2..01f0b3e21079a 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -6,6 +6,8 @@ true true true + + false