From 831e34bd5273659a2d0022bdf79bb4428a4d41a3 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 22 Oct 2021 11:27:14 -0700 Subject: [PATCH 1/4] Update the file location and android runtimes. The Maui android architecture targets are being updated to include all android targets. --- eng/pipelines/coreclr/perf.yml | 2 ++ .../templates/build-perf-maui-apps.yml | 16 ++++++++++++- src/tests/Common/maui/MauiScenario.props | 3 +++ src/tests/Common/maui/MauiScenario.targets | 23 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/tests/Common/maui/MauiScenario.props create mode 100644 src/tests/Common/maui/MauiScenario.targets diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 0b22bb399dfff..84499b17926a3 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -492,6 +492,8 @@ jobs: runtimeFlavor: mono platforms: - Android_x86 + - Android_x64 + - Android_arm - Android_arm64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index cedaa236b7e61..28322b09b1f62 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -50,7 +50,14 @@ steps: workingDirectory: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks - # #Unzip the nuget packages to make the actual runtimes accessible + #Unzip the nuget packages to make the actual runtimes accessible + - task: ExtractFiles@1 + displayName: Extract android-arm runtime + inputs: + archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm.*.zip + destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm + overwriteExistingFiles: true + cleanDestinationFolder: false - task: ExtractFiles@1 displayName: Extract android-arm64 runtime inputs: @@ -65,6 +72,13 @@ steps: destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86 overwriteExistingFiles: true cleanDestinationFolder: false + - task: ExtractFiles@1 + displayName: Extract android-x64 runtime + inputs: + archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64.*.zip + destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x64 + overwriteExistingFiles: true + cleanDestinationFolder: false - script: | curl -o ./rollback.json 'maui.blob.core.windows.net/metadata/rollbacks/main.json' diff --git a/src/tests/Common/maui/MauiScenario.props b/src/tests/Common/maui/MauiScenario.props new file mode 100644 index 0000000000000..a36bd59d0a2d4 --- /dev/null +++ b/src/tests/Common/maui/MauiScenario.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/tests/Common/maui/MauiScenario.targets b/src/tests/Common/maui/MauiScenario.targets new file mode 100644 index 0000000000000..ca22268def068 --- /dev/null +++ b/src/tests/Common/maui/MauiScenario.targets @@ -0,0 +1,23 @@ + + + + + + + + + ./ArtifactPacks + + + + + + + + + From 6d392102cc511a076aa8b4f5a1c714df784c7e72 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 22 Oct 2021 11:34:08 -0700 Subject: [PATCH 2/4] Updated the targets and props copy location. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 28322b09b1f62..b87725d6e41e2 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -90,8 +90,8 @@ steps: - script: | ./dotnet.sh new maui -n MauiTesting cd MauiTesting - cp $(Build.SourcesDirectory)/src/maui/MauiScenario.props ./Directory.Build.props - cp $(Build.SourcesDirectory)/src/maui/MauiScenario.targets ./Directory.Build.targets + cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props ./Directory.Build.props + cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets ./Directory.Build.targets displayName: Setup MAUI Project workingDirectory: $(Build.SourcesDirectory) From c79ac48e9317db1d536e216fdd14485680ccf7d1 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 22 Oct 2021 11:59:03 -0700 Subject: [PATCH 3/4] Add in the correct depends on for the maui build. --- eng/pipelines/coreclr/perf.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 84499b17926a3..ba46d4069aa2c 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -520,8 +520,10 @@ jobs: - iOS_arm64 jobParameters: dependsOn: + - Build_Android_arm_release_Maui_Packs_Mono - Build_Android_arm64_release_Maui_Packs_Mono - Build_Android_x86_release_Maui_Packs_Mono + - Build_Android_x64_release_Maui_Packs_Mono buildArgs: -s mono -c $(_BuildConfig) nameSuffix: MACiOSAndroidMaui isOfficialBuild: false From 3a48b15155e206e9463f447263feff8a73393caa Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 22 Oct 2021 13:50:36 -0700 Subject: [PATCH 4/4] The initial file move did not actually delete the folder being moved, delete it. --- src/maui/MauiScenario.props | 3 --- src/maui/MauiScenario.targets | 19 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 src/maui/MauiScenario.props delete mode 100644 src/maui/MauiScenario.targets diff --git a/src/maui/MauiScenario.props b/src/maui/MauiScenario.props deleted file mode 100644 index a36bd59d0a2d4..0000000000000 --- a/src/maui/MauiScenario.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/maui/MauiScenario.targets b/src/maui/MauiScenario.targets deleted file mode 100644 index 8a7466235ae24..0000000000000 --- a/src/maui/MauiScenario.targets +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - ./ArtifactPacks - - - - - - -