From f6cfa5e15bfc88d468ddb5bb41689a0398968798 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 14 Jul 2021 09:20:37 -0400 Subject: [PATCH 1/6] Fix _packageRID --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 541ad0417e40d..88bd06a38693f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -159,7 +159,7 @@ $(_toolRuntimeRID) <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture) - <_packageRID Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)-$(TargetArchitecture) + <_packageRID Condition="'$(CrossBuild)' == 'true'">$(_runtimeOS.ToLowerInvariant)-$(TargetArchitecture) $(_packageRID) $(_runtimeOS)-$(TargetArchitecture) From 9092d57174cb52a5ec741409a5c4de878eb46ed2 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 14 Jul 2021 09:26:30 -0400 Subject: [PATCH 2/6] Hack to enable arm64 run for PR --- eng/pipelines/runtime-staging.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index f58caca2899de..5e7f158a1851f 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -329,13 +329,13 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) - # don't run tests on PRs until we can get significantly more devices - ${{ if eq(variables['isFullMatrix'], true) }}: - # extra steps, run tests - extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml - extraStepsParameters: - creator: dotnet-bot - testRunNamePrefixSuffix: Mono_$(_BuildConfig) + # # don't run tests on PRs until we can get significantly more devices + # ${{ if eq(variables['isFullMatrix'], true) }}: + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml + extraStepsParameters: + creator: dotnet-bot + testRunNamePrefixSuffix: Mono_$(_BuildConfig) # Run disabled installer tests on Linux x64 - template: /eng/pipelines/common/platform-matrix.yml From 08448257d08a66ffdece3c5e487fcc33c07b1583 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Fri, 23 Jul 2021 12:36:35 -0400 Subject: [PATCH 3/6] Dealing with the case when both PortableBuild and CrossBuild were set to true --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 88bd06a38693f..0c41d136686ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -159,7 +159,7 @@ $(_toolRuntimeRID) <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture) - <_packageRID Condition="'$(CrossBuild)' == 'true'">$(_runtimeOS.ToLowerInvariant)-$(TargetArchitecture) + <_packageRID Condition="'$(CrossBuild)' == 'true' and '$(_packageRID)' == ''">$(_hostOS.ToLowerInvariant)-$(TargetArchitecture) $(_packageRID) $(_runtimeOS)-$(TargetArchitecture) From 8065a695cec0c74340a25d8da80b4a3f27d8e232 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 28 Jul 2021 09:32:08 -0400 Subject: [PATCH 4/6] Do not set CrossBuild to true when building for Android --- Directory.Build.props | 2 +- src/tests/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0c41d136686ea..541ad0417e40d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -159,7 +159,7 @@ $(_toolRuntimeRID) <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture) - <_packageRID Condition="'$(CrossBuild)' == 'true' and '$(_packageRID)' == ''">$(_hostOS.ToLowerInvariant)-$(TargetArchitecture) + <_packageRID Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)-$(TargetArchitecture) $(_packageRID) $(_runtimeOS)-$(TargetArchitecture) diff --git a/src/tests/build.sh b/src/tests/build.sh index e5575f69f98ff..4ef4e4c595d84 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -573,7 +573,7 @@ if [[ "${__BuildArch}" != "${__HostArch}" ]]; then __CrossBuild=1 fi -if [[ "$__CrossBuild" == 1 ]]; then +if [[ ("$__CrossBuild" == 1) && ("$__TargetOS" != "Android") ]]; then __UnprocessedBuildArgs+=("/p:CrossBuild=true") fi From 2d913a382aed6124da55bdc98b81303db6b9c462 Mon Sep 17 00:00:00 2001 From: Fan Yang <52458914+fanyang-mono@users.noreply.github.com> Date: Thu, 29 Jul 2021 09:38:39 -0400 Subject: [PATCH 5/6] Update src/tests/build.sh Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> --- src/tests/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/build.sh b/src/tests/build.sh index 4ef4e4c595d84..0b259904adb55 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -573,7 +573,7 @@ if [[ "${__BuildArch}" != "${__HostArch}" ]]; then __CrossBuild=1 fi -if [[ ("$__CrossBuild" == 1) && ("$__TargetOS" != "Android") ]]; then +if [[ "$__CrossBuild" == 1 && "$__TargetOS" != "Android" ]]; then __UnprocessedBuildArgs+=("/p:CrossBuild=true") fi From 963d731f8b773f6d3e858826c718ecac135e5216 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Thu, 29 Jul 2021 15:19:09 -0400 Subject: [PATCH 6/6] Revert qualification hack --- eng/pipelines/runtime-staging.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 5e7f158a1851f..f58caca2899de 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -329,13 +329,13 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) - # # don't run tests on PRs until we can get significantly more devices - # ${{ if eq(variables['isFullMatrix'], true) }}: - # extra steps, run tests - extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml - extraStepsParameters: - creator: dotnet-bot - testRunNamePrefixSuffix: Mono_$(_BuildConfig) + # don't run tests on PRs until we can get significantly more devices + ${{ if eq(variables['isFullMatrix'], true) }}: + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml + extraStepsParameters: + creator: dotnet-bot + testRunNamePrefixSuffix: Mono_$(_BuildConfig) # Run disabled installer tests on Linux x64 - template: /eng/pipelines/common/platform-matrix.yml