From 5dbf950474022e62e7f58daa3218ae37d1ceb470 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 27 Jun 2024 15:14:28 +0200 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 From 6428149e7cf8bbb388170f29b60c41a059a49cd9 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Fri, 25 Oct 2024 14:18:35 +0200 Subject: [PATCH 04/11] Move feature switches to ConfigureTrimming target --- src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets | 6 ++++++ src/tests/Directory.Build.props | 2 -- src/tests/FunctionalTests/Directory.Build.props | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets index 14df939e12ffe..a869a2c32223f 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets @@ -43,6 +43,12 @@ + + + false + + <_DefaultValueAttributeSupport>true + diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index d3634a789f6f6..2f438eea2fea1 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -218,8 +218,6 @@ true true true - - false diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index 01f0b3e21079a..16117373adea2 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -6,8 +6,6 @@ true true true - - false From a949c9710ee5829edf2f972a853a2162aaa1c4ab Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Fri, 25 Oct 2024 14:50:55 +0200 Subject: [PATCH 05/11] Typo --- src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets index a869a2c32223f..3b9e549407567 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets @@ -43,12 +43,12 @@ - + false <_DefaultValueAttributeSupport>true - + From f3ffb45a8d46baef34d46c024bd90b49acd1a5a0 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 29 Oct 2024 14:31:08 +0100 Subject: [PATCH 06/11] Add _DesignerHostSupport --- src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets | 4 ++-- src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets index 3b9e549407567..a396c14cc2c99 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets @@ -44,10 +44,10 @@ should be considered if we ever want to change the Condition of the ConfigureTrimming target --> - + false - <_DefaultValueAttributeSupport>true + <_DesignerHostSupport>true diff --git a/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj b/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj index e4512b9d0666e..2847f567f469a 100644 --- a/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj +++ b/src/mono/msbuild/apple/data/ProxyProjectForAOTOnHelix.proj @@ -12,8 +12,6 @@ true $(OriginalPublishDir) - - false From 4eca28618d95246e949949c5c328e07f80643557 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 30 Oct 2024 18:06:06 +0100 Subject: [PATCH 07/11] Add RuntimeHostConfigurationOption to prevent getting defaults from ILLink targets --- .../msbuild/apple/build/AppleBuild.LocalBuild.targets | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets index a396c14cc2c99..cb1ef24e8528e 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets @@ -43,16 +43,15 @@ - - - false - <_DefaultValueAttributeSupport>true - <_DesignerHostSupport>true - + + + + + From 346a69cc6c425d69e2f4dfded3523972cd994932 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 31 Oct 2024 08:16:14 +0100 Subject: [PATCH 08/11] Add RuntimeHostConfigurationOption to prevent getting defaults from ILLink targets --- eng/testing/tests.mobile.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index b599da5d228e6..eb98817f97494 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -99,6 +99,11 @@ + + + + + From e3588f4f55264cccde625d975fecad31cc19f925 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 6 Nov 2024 15:17:04 +0100 Subject: [PATCH 09/11] Set the actual feature switch properties instead of RuntimeHostConfigurationOptio --- eng/testing/tests.mobile.targets | 8 +++----- .../msbuild/apple/build/AppleBuild.LocalBuild.targets | 5 ----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index eb98817f97494..1281a28c9b984 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -38,6 +38,9 @@ false false false + false + <_DefaultValueAttributeSupport Condition="'$(_DefaultValueAttributeSupport)' == ''">true + <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">true - - - - - diff --git a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets index cb1ef24e8528e..14df939e12ffe 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.LocalBuild.targets @@ -47,11 +47,6 @@ - - - - - From e77d1d2ae7ee14983c683ca8b4fa21b196d59137 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 6 Nov 2024 15:25:22 +0100 Subject: [PATCH 10/11] Fix condition --- eng/testing/tests.mobile.targets | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 1281a28c9b984..327e85a67c17d 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -43,6 +43,13 @@ <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">true + + + false + <_DefaultValueAttributeSupport Condition="'$(_DefaultValueAttributeSupport)' == ''">true + <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">true + + From b6a3bc23aa08accffe83c477ba809c8cdd722e29 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 6 Nov 2024 15:55:03 +0100 Subject: [PATCH 11/11] Match Xamarin trimming props --- eng/testing/tests.mobile.targets | 5 ----- .../tests/System.Runtime.Tests/System.Runtime.Tests.csproj | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 327e85a67c17d..5c882fcb3c836 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -38,16 +38,11 @@ false false false - false - <_DefaultValueAttributeSupport Condition="'$(_DefaultValueAttributeSupport)' == ''">true - <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">true false - <_DefaultValueAttributeSupport Condition="'$(_DefaultValueAttributeSupport)' == ''">true - <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">true