[PERF] Remove Android Maui Scenarios from Runtime Repo

eng/pipelines/coreclr/perf-non-wasm-jobs.yml

@@ -111,25 +111,21 @@ jobs:
       platforms:
       - linux_x64
 
-  # run mono and maui android scenarios
+  # run android scenarios
   - template: /eng/pipelines/common/platform-matrix.yml
     parameters:
       jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
       buildConfig: release
       runtimeFlavor: mono
       platforms:
         - windows_x64
-      variables:
-        - name: mauiVersion
-          value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ]
       jobParameters:
         testGroup: perf
         runtimeType: AndroidMono
         projectFile: android_scenarios.proj
         runKind: android_scenarios
         runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
         logicalmachine: 'perfpixel4a'
-        additionalSetupParameters: "-MauiVersion $env:mauiVersion"
 
   # run mono iOS scenarios and maui iOS scenarios
   - template: /eng/pipelines/common/platform-matrix.yml
@@ -172,26 +168,6 @@ jobs:
         iOSLlvmBuild: True
         additionalSetupParameters: "--mauiversion $(mauiVersion)"
 
-  # run maui android scenarios for net6
-  - template: /eng/pipelines/common/platform-matrix.yml
-    parameters:
-      jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
-      buildConfig: release
-      runtimeFlavor: mono
-      platforms:
-        - windows_x64
-      variables:
-        - name: mauiVersion
-          value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ]
-      jobParameters:
-        testGroup: perf
-        runtimeType: AndroidMobileNet6
-        projectFile: android_scenarios_net6.proj
-        runKind: android_scenarios_net6
-        runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
-        logicalmachine: 'perfpixel4a'
-        additionalSetupParameters: "-MauiVersion $env:mauiVersion"
-
   # run maui iOS scenarios for net6 (Maui doesn't need Llmv true build (for net6))
   - template: /eng/pipelines/common/platform-matrix.yml
     parameters:

eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml

@@ -57,26 +57,6 @@ steps:
     displayName: Build MAUI Android
     workingDirectory: $(Build.SourcesDirectory)/MauiTesting
 
-  - script: |
-      set -x
-      pwd
-      git clone https://github.com/microsoft/dotnet-podcasts.git -b maui/perf --single-branch
-      cd dotnet-podcasts
-      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props.net6 ./Directory.Build.props
-      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets.net6 ./Directory.Build.targets
-    displayName:  Clone podcast app
-    workingDirectory: $(Build.SourcesDirectory)
-
-  - script: |
-      set -x
-      pwd
-      chmod -R a+r .
-      ../../../dotnet restore Microsoft.NetConf2021.Maui.csproj
-      ../../../dotnet publish Microsoft.NetConf2021.Maui.csproj -bl:MauiPodcastAndroid.binlog -r android-arm64 --self-contained --no-restore -f net6.0-android -c Release
-      mv ./bin/Release/net6.0-android/android-arm64/com.Microsoft.NetConf2021.Maui-Signed.apk $(Build.SourcesDirectory)/MauiTesting/MauiAndroidPodcast.apk
-    displayName: Build MAUI Podcast Android
-    workingDirectory:  $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile
-
     # This step pulls the product version from the used Microsoft.Maui.dll file properties and saves it for upload with the maui test counter.
     # We pull from this file as we did not find another place to reliably get the version information pre or post build.
   - powershell: |
@@ -87,6 +67,16 @@ steps:
     displayName: Get and Save MAUI Version
     workingDirectory: $(Build.SourcesDirectory)/MauiTesting
 
+  - script: |
+      set -x
+      pwd
+      git clone https://github.com/microsoft/dotnet-podcasts.git -b maui/perf --single-branch
+      cd dotnet-podcasts
+      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props.net6 ./Directory.Build.props
+      cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets.net6 ./Directory.Build.targets
+    displayName:  Clone podcast app
+    workingDirectory: $(Build.SourcesDirectory)
+
   - script: |
       chmod -R a+r .
       # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877
@@ -156,15 +146,6 @@ steps:
     displayName: Setup MAUI Blazor Hybrid Project
     workingDirectory: $(Build.SourcesDirectory)
 
-  - script: |
-      chmod -R a+r .
-      # Restore is split out because of https://github.com/dotnet/sdk/issues/21877, can be removed with --no-restore once fixed
-      ../dotnet restore
-      ../dotnet publish -bl:MauiBlazorAndroid.binlog -f net6.0-android -c Release -r android-arm64 --no-restore --self-contained
-      mv ./bin/Release/net6.0-android/android-arm64/com.companyname.mauiblazortesting-Signed.apk ./MauiBlazorAndroidDefault.apk
-    displayName: Build MAUI Blazor Android
-    workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting
-
   - script: |
       chmod -R a+r .
       # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877
@@ -206,13 +187,6 @@ steps:
       pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
       artifactName:  ${{ parameters.artifactName }}
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish MauiBlazorAndroid binlog'
-    condition: always()
-    inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroid.binlog
-      artifactName:  ${{ parameters.artifactName }}
-
   - task: PublishBuildArtifacts@1
     displayName: 'Publish MauiiOS binlog'
     condition: always()
@@ -227,13 +201,6 @@ steps:
       pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
       artifactName:  ${{ parameters.artifactName }}
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish MauiBlazorAndroid binlog'
-    condition: always()
-    inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroid.binlog
-      artifactName:  ${{ parameters.artifactName }}
-
   - task: PublishBuildArtifacts@1
     displayName: 'Publish MauiBlazoriOS binlog'
     condition: always()
@@ -265,26 +232,6 @@ steps:
         archiveType: tar
         tarCompression: gz
 
-  - template: /eng/pipelines/common/upload-artifact-step.yml
-    parameters:
-        rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroidDefault.apk
-        includeRootFolder: true
-        displayName: Maui Blazor Android App
-        artifactName: MauiBlazorAndroidAppNet6
-        archiveExtension: '.tar.gz'
-        archiveType: tar
-        tarCompression: gz
-
-  - template: /eng/pipelines/common/upload-artifact-step.yml
-    parameters:
-        rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiAndroidPodcast.apk
-        includeRootFolder: true
-        displayName: Maui Android Podcast
-        artifactName: MauiAndroidPodcastNet6
-        archiveExtension: '.tar.gz'
-        archiveType: tar
-        tarCompression: gz
-
   - template: /eng/pipelines/common/upload-artifact-step.yml
     parameters:
         rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiiOSDefault.ipa

eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml

@@ -149,26 +149,6 @@ steps:
     displayName: Build MAUI Android
     workingDirectory: $(Build.SourcesDirectory)/MauiTesting
 
-  - script: |
-      set -x
-      pwd
-      git clone https://github.com/microsoft/dotnet-podcasts.git -b net7.0 --single-branch
-      cd dotnet-podcasts
-      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:  Clone podcast app
-    workingDirectory: $(Build.SourcesDirectory)
-
-  - script: |
-      set -x
-      pwd
-      chmod -R a+r .
-      ../../../dotnet restore Microsoft.NetConf2021.Maui.csproj
-      ../../../dotnet publish Microsoft.NetConf2021.Maui.csproj -bl:MauiPodcastAndroid.binlog -r android-arm64 --self-contained --no-restore -f net7.0-android -c Release
-      mv ./bin/Release/net7.0-android/android-arm64/com.Microsoft.NetConf2021.Maui-Signed.apk $(Build.SourcesDirectory)/MauiTesting/MauiAndroidPodcast.apk
-    displayName: Build MAUI Podcast Android
-    workingDirectory:  $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile
-
     # This step pulls the product version from the used Microsoft.Maui.dll file properties and saves it for upload with the maui test counter.
     # We pull from this file as we did not find another place to reliably get the version information pre or post build.
   - powershell: |
@@ -179,6 +159,16 @@ steps:
     displayName: Get and Save MAUI Version
     workingDirectory: $(Build.SourcesDirectory)/MauiTesting
 
+  - script: |
+      set -x
+      pwd
+      git clone https://github.com/microsoft/dotnet-podcasts.git -b net7.0 --single-branch
+      cd dotnet-podcasts
+      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:  Clone podcast app
+    workingDirectory: $(Build.SourcesDirectory)
+
   - script: |
       chmod -R a+r .
       # remove net7.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877
@@ -248,15 +238,6 @@ steps:
     displayName: Setup MAUI Blazor Hybrid Project
     workingDirectory: $(Build.SourcesDirectory)
 
-  - script: |
-      chmod -R a+r .
-      # Restore is split out because of https://github.com/dotnet/sdk/issues/21877, can be removed with --no-restore once fixed
-      ../dotnet restore
-      ../dotnet publish -bl:MauiBlazorAndroid.binlog -f net7.0-android -c Release -r android-arm64 --no-restore --self-contained
-      mv ./bin/Release/net7.0-android/android-arm64/com.companyname.mauiblazortesting-Signed.apk ./MauiBlazorAndroidDefault.apk
-    displayName: Build MAUI Blazor Android
-    workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting
-
   - script: |
       chmod -R a+r .
       # remove net7.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877
@@ -298,13 +279,6 @@ steps:
       pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
       artifactName:  ${{ parameters.artifactName }}
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish MauiBlazorAndroid binlog'
-    condition: always()
-    inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroid.binlog
-      artifactName:  ${{ parameters.artifactName }}
-
   - task: PublishBuildArtifacts@1
     displayName: 'Publish MauiiOS binlog'
     condition: always()
@@ -319,13 +293,6 @@ steps:
       pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
       artifactName:  ${{ parameters.artifactName }}
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish MauiBlazorAndroid binlog'
-    condition: always()
-    inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroid.binlog
-      artifactName:  ${{ parameters.artifactName }}
-
   - task: PublishBuildArtifacts@1
     displayName: 'Publish MauiBlazoriOS binlog'
     condition: always()
@@ -347,36 +314,6 @@ steps:
       pathtoPublish: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
       artifactName:  ${{ parameters.artifactName }}
 
-  - template: /eng/pipelines/common/upload-artifact-step.yml
-    parameters:
-        rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiAndroidDefault.apk
-        includeRootFolder: true
-        displayName: Maui Android App
-        artifactName: MauiAndroidApp
-        archiveExtension: '.tar.gz'
-        archiveType: tar
-        tarCompression: gz
-
-  - template: /eng/pipelines/common/upload-artifact-step.yml
-    parameters:
-        rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorAndroidDefault.apk
-        includeRootFolder: true
-        displayName: Maui Blazor Android App
-        artifactName: MauiBlazorAndroidApp
-        archiveExtension: '.tar.gz'
-        archiveType: tar
-        tarCompression: gz
-
-  - template: /eng/pipelines/common/upload-artifact-step.yml
-    parameters:
-        rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiAndroidPodcast.apk
-        includeRootFolder: true
-        displayName: Maui Android Podcast
-        artifactName: MauiAndroidPodcast
-        archiveExtension: '.tar.gz'
-        archiveType: tar
-        tarCompression: gz
-
   - template: /eng/pipelines/common/upload-artifact-step.yml
     parameters:
         rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiiOSDefault.ipa