diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 69479200e24c0c..39a8b0527b1e78 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -111,7 +111,7 @@ 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 @@ -119,9 +119,6 @@ jobs: runtimeFlavor: mono platforms: - Windows_x64 - variables: - - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: AndroidMono @@ -129,9 +126,8 @@ jobs: 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 + # run mono iOS scenarios scenarios - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml @@ -139,9 +135,6 @@ jobs: runtimeFlavor: mono platforms: - OSX_x64 - variables: - - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: iOSMono @@ -150,7 +143,6 @@ jobs: runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml logicalmachine: 'perfiphone12mini' iOSLlvmBuild: False - additionalSetupParameters: "--mauiversion $(mauiVersion)" - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -159,9 +151,6 @@ jobs: runtimeFlavor: mono platforms: - OSX_x64 - variables: - - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: iOSMono @@ -170,48 +159,6 @@ jobs: runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml logicalmachine: 'perfiphone12mini' 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: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - OSX_x64 - variables: - - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ] - jobParameters: - testGroup: perf - runtimeType: iOSMobileNet6 - projectFile: ios_scenarios_net6.proj - runKind: ios_scenarios_net6 - runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perfiphone12mini' - iOSLlvmBuild: False - additionalSetupParameters: "--mauiversion $(mauiVersion)" # run mono microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml @@ -368,85 +315,3 @@ jobs: runKind: crossgen_scenarios runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml logicalmachine: 'perftiger' - - # Uncomment to reenable package replacement - ## build maui runtime packs - #- template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/common/global-build-job.yml - # buildConfig: release - # runtimeFlavor: mono - # platforms: - # - Android_x86 - # - Android_x64 - # - Android_arm - # - Android_arm64 - # - MacCatalyst_x64 - # - iOSSimulator_x64 - # - iOS_arm64 - # - iOS_arm - # jobParameters: - # buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) - # nameSuffix: Maui_Packs_Mono - # isOfficialBuild: false - # extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml - # extraStepsParameters: - # name: MonoRuntimePacks - - # build maui app net7.0 - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - iOS_arm64 - jobParameters: - # Uncomment to reenable package replacement for main - #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 - # - Build_MacCatalyst_x64_release_Maui_Packs_Mono - # - Build_iOSSimulator_x64_release_Maui_Packs_Mono - # - Build_iOS_arm_release_Maui_Packs_Mono - # - Build_iOS_arm64_release_Maui_Packs_Mono - buildArgs: -s mono -c $(_BuildConfig) - nameSuffix: MACiOSAndroidMauiNet7 - isOfficialBuild: false - pool: - vmImage: 'macos-12' - extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml - extraStepsParameters: - rootFolder: '$(Build.SourcesDirectory)/artifacts/' - includeRootFolder: true - displayName: MAC, iOS, and Android Maui Artifacts Net7 - artifactName: MACiOSAndroidMauiArmNet7 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - # build maui app net6.0 - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - iOS_arm64 - jobParameters: - buildArgs: -s mono -c $(_BuildConfig) - nameSuffix: MACiOSAndroidMauiNet6 - isOfficialBuild: false - pool: - vmImage: 'macos-12' - extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml - extraStepsParameters: - rootFolder: '$(Build.SourcesDirectory)/artifacts/' - includeRootFolder: true - displayName: MAC, iOS, and Android Maui Artifacts Net6 - artifactName: MACiOSAndroidMauiArmNet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml deleted file mode 100644 index 305541577632a7..00000000000000 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps-net6.yml +++ /dev/null @@ -1,366 +0,0 @@ -parameters: - osGroup: '' - osSubgroup: '' - archType: '' - buildConfig: '' - runtimeFlavor: '' - helixQueues: '' - targetRid: '' - nameSuffix: '' - platform: '' - shouldContinueOnError: '' - rootFolder: '' - includeRootFolder: '' - displayName: '' - artifactName: '' - archiveExtension: '' - archiveType: '' - tarCompression: '' - - -steps: - # There is a global.json in the runtime repo, but it sets the version to 7.xxx preview. This creates a local global.json to allow the running of 6.0 version. - - script: | - echo '{}' > ./global.json - displayName: Create global.json - workingDirectory: $(Build.SourcesDirectory) - - # Get the current maui nuget config so all things can be found and darc based package sources are kept up to date. - - script: | - curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/net6.0/NuGet.config' - curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh' - chmod -R a+rx . - ./dotnet-install.sh --channel 6.0 --quality daily --install-dir . - ./dotnet --info - ./dotnet workload install maui --from-rollback-file https://aka.ms/dotnet/maui/net6.0.json --configfile NuGet.config - displayName: Install MAUI workload - workingDirectory: $(Build.SourcesDirectory) - - - script: $(Build.SourcesDirectory)/eng/testing/performance/create-provisioning-profile.sh - displayName: Create iOS code signing and provisioning profile - - - script: | - ./dotnet new maui -n MauiTesting - cd MauiTesting - 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 - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - displayName: Setup MAUI 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:MauiAndroid.binlog -f net6.0-android -c Release -r android-arm64 --no-restore --self-contained - mv ./bin/Release/net6.0-android/android-arm64/com.companyname.mauitesting-Signed.apk ./MauiAndroidDefault.apk - 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: | - $RetrievedMauiVersion = Get-ChildItem .\obj\Release\net6.0-android\android-arm64\linked\Microsoft.Maui.dll | Select-Object -ExpandProperty VersionInfo | Select-Object ProductVersion | Select-Object -ExpandProperty ProductVersion - $RetrievedMauiVersion - Write-Host "##vso[task.setvariable variable=mauiVersion;isOutput=true]$RetrievedMauiVersion" - name: getMauiVersion - displayName: Get and Save MAUI Version - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - chmod -R a+r . - # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 - cp MauiTesting.csproj MauiTesting.csproj.bak - sed -i'' -e 's/net6.0-ios;net6.0-maccatalyst/net6.0-ios/g' MauiTesting.csproj - - ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.mauitesting - mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa - - cp MauiTesting.csproj.bak MauiTesting.csproj - displayName: Build MAUI Default iOS - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - chmod -R a+r . - # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 - cp Microsoft.NetConf2021.Maui.csproj Microsoft.NetConf2021.Maui.csproj.bak - sed -i'' -e 's/net6.0-ios;net6.0-maccatalyst/net6.0-ios/g' Microsoft.NetConf2021.Maui.csproj - - ../../../dotnet build ../Web/Components/Podcast.Components.Maui.csproj - ../../../dotnet publish Microsoft.NetConf2021.Maui.csproj -bl:MauiiOSPodcast.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.netconf2021.maui - mv ./bin/Release/net6.0-ios/ios-arm64/publish/Microsoft.NetConf2021.Maui.ipa ./MauiiOSPodcast.ipa - - cp Microsoft.NetConf2021.Maui.csproj.bak Microsoft.NetConf2021.Maui.csproj - displayName: Build MAUI Podcast iOS - workingDirectory: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile - - - script: | - chmod -R a+r . - ../dotnet publish -bl:MauiMacCatalyst.binlog -f net6.0-maccatalyst -c Release - mv ./bin/Release/net6.0-maccatalyst/maccatalyst-x64/MauiTesting.app ./MauiMacCatalystDefault.app - displayName: Build MAUI MacCatalyst - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - ./dotnet new maui-blazor -n MauiBlazorTesting - cd MauiBlazorTesting - 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 - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - echo -e "using Microsoft.AspNetCore.Components; - #if ANDROID - using Android.App; - #endif - - namespace MauiBlazorTesting.Pages - { - public partial class Index - { - protected override void OnAfterRender(bool firstRender) - { - if (firstRender) - { - #if ANDROID - var activity = MainActivity.Context as Activity; - activity.ReportFullyDrawn(); - #else - System.Console.WriteLine(\"__MAUI_Blazor_WebView_OnAfterRender__\"); - #endif - } - } - } - }" > Pages/Index.razor.cs - - sed -i'' -e "s/{/{\npublic static Android.Content.Context Context { get; private set; }\npublic MainActivity() { Context = this; }/g" Platforms/Android/MainActivity.cs - 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 - cp MauiBlazorTesting.csproj MauiBlazorTesting.csproj.bak - sed -i'' -e 's/net6.0-ios;net6.0-maccatalyst/net6.0-ios/g' MauiBlazorTesting.csproj - - # NuGet.config file cannot be in the build directory currently due to https://github.com/dotnet/aspnetcore/issues/41397 - rm NuGet.config - - ../dotnet publish -bl:MauiBlazoriOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.mauiblazortesting - mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiBlazorTesting.ipa ./MauiBlazoriOSDefault.ipa - - # Restore NuGet.config - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - cp MauiBlazorTesting.csproj.bak MauiBlazorTesting.csproj - displayName: Build MAUI Blazor iOS - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - - - script: | - chmod -R a+r . - - # NuGet.config file cannot be in the build directory currently due to https://github.com/dotnet/aspnetcore/issues/41397 - rm NuGet.config - - ../dotnet publish -bl:MauiBlazorMacCatalyst.binlog -f net6.0-maccatalyst -c Release - - # Restore NuGet.config - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - mv ./bin/Release/net6.0-maccatalyst/maccatalyst-x64/MauiBlazorTesting.app ./MauiBlazorMacCatalystDefault.app - displayName: Build MAUI Blazor MacCatalyst - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiAndroid binlog' - condition: always() - inputs: - 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() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiMacCatalyst binlog' - condition: always() - inputs: - 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() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiBlazorMacCatalyst binlog' - condition: always() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiiOSPodcast binlog' - condition: always() - inputs: - 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: MauiAndroidAppNet6 - 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: 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 - includeRootFolder: true - displayName: Maui iOS IPA - artifactName: MauiiOSDefaultIPANet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOSDefault.ipa - includeRootFolder: true - displayName: Maui Blazor iOS IPA - artifactName: MauiBlazoriOSDefaultIPANet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.ipa - includeRootFolder: true - displayName: Maui iOS Podcast IPA - artifactName: MauiiOSPodcastIPANet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalystDefault.app - includeRootFolder: true - displayName: Maui MacCatalyst App - artifactName: MauiMacCatalystDefaultNet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalystDefault.app - includeRootFolder: true - displayName: Maui Blazor MacCatalyst App - artifactName: MauiBlazorMacCatalystDefaultNet6 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - script: rm -r -f ./bin - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - displayName: Clean MauiTesting bin directory - condition: succeededOrFailed() - - - script: rm -r -f ./bin - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - displayName: Clean MauiBlazorTesting bin directory - condition: succeededOrFailed() - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - osGroup: ${{ parameters.osGroup }} - osSubgroup: ${{ parameters.osSubgroup }} - archType: ${{ parameters.archType }} - buildConfig: ${{ parameters.buildConfig }} - runtimeFlavor: ${{ parameters.runtimeFlavor }} - helixQueues: ${{ parameters.helixQueues }} - targetRid: ${{ parameters.targetRid }} - nameSuffix: ${{ parameters.nameSuffix }} - platform: ${{ parameters.platform }} - shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - rootFolder: ${{ parameters.rootFolder }} - includeRootFolder: ${{ parameters.includeRootFolder }} - displayName: ${{ parameters.displayName }} - artifactName: ${{ parameters.artifactName }} - archiveExtension: ${{ parameters.archiveExtension }} - archiveType: ${{ parameters.archiveType }} - tarCompression: ${{ parameters.tarCompression }} diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml deleted file mode 100644 index 61cf711967f703..00000000000000 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps-net7.yml +++ /dev/null @@ -1,457 +0,0 @@ -parameters: - osGroup: '' - osSubgroup: '' - archType: '' - buildConfig: '' - runtimeFlavor: '' - helixQueues: '' - targetRid: '' - nameSuffix: '' - platform: '' - shouldContinueOnError: '' - rootFolder: '' - includeRootFolder: '' - displayName: '' - artifactName: '' - archiveExtension: '' - archiveType: '' - tarCompression: '' - - -steps: - # Uncomment to reenable package replacement - #- task: DownloadPipelineArtifact@2 - # displayName: Download runtime packages - # inputs: - # artifact: 'IntermediateArtifacts' - # path: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks - # patterns: | - # IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-!(*.symbols).nupkg - # IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-!(*.symbols).nupkg - # IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-!(*.symbols).nupkg - # IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-!(*.symbols).nupkg - - # # Other artifacts to include once they are being built - # # EX. IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg - - #- task: CopyFiles@2 - # displayName: Flatten packages - # inputs: - # sourceFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks - # contents: '*/Shipping/*.nupkg' - # cleanTargetFolder: false - # targetFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks - # flattenFolders: true - - #- script: | - # for file in *.nupkg - # do - # mv -v "$file" "${file%.nupkg}.zip" - # done - # displayName: Change nupkgs to zips - # workingDirectory: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks - - - ##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: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64.*.zip - # destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-arm64 - # overwriteExistingFiles: true - # cleanDestinationFolder: false - #- task: ExtractFiles@1 - # displayName: Extract android-x86 runtime - # inputs: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.android-x86.*.zip - # 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 - #- task: ExtractFiles@1 - # displayName: Extract ios-arm runtime - # inputs: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm.*.zip - # destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm - # overwriteExistingFiles: true - # cleanDestinationFolder: false - #- task: ExtractFiles@1 - # displayName: Extract ios-arm64 runtime - # inputs: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64.*.zip - # destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.ios-arm64 - # overwriteExistingFiles: true - # cleanDestinationFolder: false - #- task: ExtractFiles@1 - # displayName: Extract maccatalyst-x64 runtime - # inputs: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64.*.zip - # destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64 - # overwriteExistingFiles: true - # cleanDestinationFolder: false - #- task: ExtractFiles@1 - # displayName: Extract iossimulator-x64 runtime - # inputs: - # archiveFilePatterns: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64.*.zip - # destinationFolder: $(Build.SourcesDirectory)/MauiTesting/ArtifactPacks/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64 - # overwriteExistingFiles: true - # cleanDestinationFolder: false - - # Get the current maui nuget config so all things can be found and darc based package sources are kept up to date. - - script: | - echo '{}' > ./global.json - displayName: Create global.json - workingDirectory: $(Build.SourcesDirectory) - - - script: | - curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/main/NuGet.config' - curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh' - chmod -R a+rx . - cp $(Build.SourcesDirectory)/src/tests/Common/maui/rollbackfile-net7.json ./rollbackfile-net7.json - ./dotnet-install.sh --version 7.0.100-preview.7.22376.5 --install-dir . - ./dotnet --info - ./dotnet workload install maui --from-rollback-file rollbackfile-net7.json --configfile NuGet.config - displayName: Install MAUI workload - workingDirectory: $(Build.SourcesDirectory) - - - script: $(Build.SourcesDirectory)/eng/testing/performance/create-provisioning-profile.sh - displayName: Create iOS code signing and provisioning profile - - - script: | - ./dotnet new maui -n MauiTesting - cd MauiTesting - cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props ./Directory.Build.props - cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets ./Directory.Build.targets - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - displayName: Setup MAUI 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:MauiAndroid.binlog -f net7.0-android -c Release -r android-arm64 --no-restore --self-contained - mv ./bin/Release/net7.0-android/android-arm64/com.companyname.mauitesting-Signed.apk ./MauiAndroidDefault.apk - 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: | - $RetrievedMauiVersion = Get-ChildItem .\obj\Release\net7.0-android\android-arm64\linked\Microsoft.Maui.dll | Select-Object -ExpandProperty VersionInfo | Select-Object ProductVersion | Select-Object -ExpandProperty ProductVersion - $RetrievedMauiVersion - Write-Host "##vso[task.setvariable variable=mauiVersion;isOutput=true]$RetrievedMauiVersion" - name: getMauiVersion - displayName: Get and Save MAUI Version - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - chmod -R a+r . - # remove net7.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 - cp MauiTesting.csproj MauiTesting.csproj.bak - sed -i'' -e 's/net7.0-ios;net7.0-maccatalyst/net7.0-ios/g' MauiTesting.csproj - - ../dotnet publish -bl:MauiiOS.binlog -f net7.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.mauitesting - mv ./bin/Release/net7.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa - - cp MauiTesting.csproj.bak MauiTesting.csproj - displayName: Build MAUI Default iOS - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - chmod -R a+r . - # remove net7.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 - cp Microsoft.NetConf2021.Maui.csproj Microsoft.NetConf2021.Maui.csproj.bak - sed -i'' -e 's/net7.0-ios;net7.0-maccatalyst/net7.0-ios/g' Microsoft.NetConf2021.Maui.csproj - - ../../../dotnet build ../Web/Components/Podcast.Components.Maui.csproj - ../../../dotnet publish Microsoft.NetConf2021.Maui.csproj -bl:MauiiOSPodcast.binlog -f net7.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.netconf2021.maui - mv ./bin/Release/net7.0-ios/ios-arm64/publish/Microsoft.NetConf2021.Maui.ipa ./MauiiOSPodcast.ipa - - cp Microsoft.NetConf2021.Maui.csproj.bak Microsoft.NetConf2021.Maui.csproj - displayName: Build MAUI Podcast iOS - workingDirectory: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile - - - script: | - chmod -R a+r . - ../dotnet publish -bl:MauiMacCatalyst.binlog -f net7.0-maccatalyst -c Release - mv ./bin/Release/net7.0-maccatalyst/maccatalyst-x64/MauiTesting.app ./MauiMacCatalystDefault.app - displayName: Build MAUI MacCatalyst - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - - script: | - ./dotnet new maui-blazor -n MauiBlazorTesting - cd MauiBlazorTesting - cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props ./Directory.Build.props - cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets ./Directory.Build.targets - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - echo -e "using Microsoft.AspNetCore.Components; - #if ANDROID - using Android.App; - #endif - - namespace MauiBlazorTesting.Pages - { - public partial class Index - { - protected override void OnAfterRender(bool firstRender) - { - if (firstRender) - { - #if ANDROID - var activity = MainActivity.Context as Activity; - activity.ReportFullyDrawn(); - #else - System.Console.WriteLine(\"__MAUI_Blazor_WebView_OnAfterRender__\"); - #endif - } - } - } - }" > Pages/Index.razor.cs - - sed -i'' -e "s/{/{\npublic static Android.Content.Context Context { get; private set; }\npublic MainActivity() { Context = this; }/g" Platforms/Android/MainActivity.cs - 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 - cp MauiBlazorTesting.csproj MauiBlazorTesting.csproj.bak - sed -i'' -e 's/net7.0-ios;net7.0-maccatalyst/net7.0-ios/g' MauiBlazorTesting.csproj - - # NuGet.config file cannot be in the build directory currently due to https://github.com/dotnet/aspnetcore/issues/41397 - rm NuGet.config - - ../dotnet publish -bl:MauiBlazoriOS.binlog -f net7.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.mauiblazortesting - mv ./bin/Release/net7.0-ios/ios-arm64/publish/MauiBlazorTesting.ipa ./MauiBlazoriOSDefault.ipa - - # Restore NuGet.config - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - cp MauiBlazorTesting.csproj.bak MauiBlazorTesting.csproj - displayName: Build MAUI Blazor iOS - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - - - script: | - chmod -R a+r . - - # NuGet.config file cannot be in the build directory currently due to https://github.com/dotnet/aspnetcore/issues/41397 - rm NuGet.config - - ../dotnet publish -bl:MauiBlazorMacCatalyst.binlog -f net7.0-maccatalyst -c Release - - # Restore NuGet.config - cp $(Build.SourcesDirectory)/NuGet.config ./NuGet.config - - mv ./bin/Release/net7.0-maccatalyst/maccatalyst-x64/MauiBlazorTesting.app ./MauiBlazorMacCatalystDefault.app - displayName: Build MAUI Blazor MacCatalyst - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiAndroid binlog' - condition: always() - inputs: - 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() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiMacCatalyst binlog' - condition: always() - inputs: - 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() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiBlazorMacCatalyst binlog' - condition: always() - inputs: - pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog - artifactName: ${{ parameters.artifactName }} - - - task: PublishBuildArtifacts@1 - displayName: 'Publish MauiiOSPodcast binlog' - condition: always() - inputs: - 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 - includeRootFolder: true - displayName: Maui iOS IPA - artifactName: MauiiOSDefaultIPA - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOSDefault.ipa - includeRootFolder: true - displayName: Maui Blazor iOS IPA - artifactName: MauiBlazoriOSDefaultIPA - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.ipa - includeRootFolder: true - displayName: Maui iOS Podcast IPA - artifactName: MauiiOSPodcastIPA - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalystDefault.app - includeRootFolder: true - displayName: Maui MacCatalyst App - artifactName: MauiMacCatalystDefault - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalystDefault.app - includeRootFolder: true - displayName: Maui Blazor MacCatalyst App - artifactName: MauiBlazorMacCatalystDefault - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - - - script: rm -r -f ./bin - workingDirectory: $(Build.SourcesDirectory)/MauiTesting - displayName: Clean MauiTesting bin directory - condition: succeededOrFailed() - - - script: rm -r -f ./bin - workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting - displayName: Clean MauiBlazorTesting bin directory - condition: succeededOrFailed() - - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - osGroup: ${{ parameters.osGroup }} - osSubgroup: ${{ parameters.osSubgroup }} - archType: ${{ parameters.archType }} - buildConfig: ${{ parameters.buildConfig }} - runtimeFlavor: ${{ parameters.runtimeFlavor }} - helixQueues: ${{ parameters.helixQueues }} - targetRid: ${{ parameters.targetRid }} - nameSuffix: ${{ parameters.nameSuffix }} - platform: ${{ parameters.platform }} - shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - rootFolder: ${{ parameters.rootFolder }} - includeRootFolder: ${{ parameters.includeRootFolder }} - displayName: ${{ parameters.displayName }} - artifactName: ${{ parameters.artifactName }} - archiveExtension: ${{ parameters.archiveExtension }} - archiveType: ${{ parameters.archiveType }} - tarCompression: ${{ parameters.tarCompression }} diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 55111153f86094..0c8fce9101541a 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -67,7 +67,7 @@ jobs: # Test job depends on the corresponding build job ${{ if eq(parameters.downloadSpecificBuild.buildId, '') }}: dependsOn: - - ${{ if not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6', 'wasm')) }}: + - ${{ if not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'wasm')) }}: - ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if and(ne(parameters.liveLibrariesBuildConfig, ''), eq(parameters.skipLiveLibrariesDownload, 'false')) }}: - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} @@ -79,21 +79,15 @@ jobs: - ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.codeGenType) }} - ${{ if eq(parameters.runtimeType, 'AndroidMono')}}: - ${{ 'build_Android_arm64_release_AndroidMono' }} - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet7' }} - - ${{ if eq(parameters.runtimeType, 'AndroidMobileNet6')}}: - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet6' }} - ${{ if eq(parameters.runtimeType, 'iOSMono')}}: - ${{ 'build_iOS_arm64_release_iOSMono' }} - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet7' }} - - ${{ if eq(parameters.runtimeType, 'iOSMobileNet6')}}: - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet6' }} - ${{ if and(eq(parameters.osGroup, 'windows'), not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6'))) }}: + ${{ if and(eq(parameters.osGroup, 'windows'), not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono'))) }}: ${{ if eq(parameters.runtimeType, 'mono') }}: extraSetupParameters: -Architecture ${{ parameters.archType }} -MonoDotnet $(Build.SourcesDirectory)\.dotnet-mono ${{ if eq(parameters.runtimeType, 'coreclr') }}: extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }} - ${{ if and(ne(parameters.osGroup, 'windows'), not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6'))) }}: + ${{ if and(ne(parameters.osGroup, 'windows'), not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono'))) }}: ${{ if and(eq(parameters.runtimeType, 'mono'), ne(parameters.codeGenType, 'AOT')) }}: extraSetupParameters: --architecture ${{ parameters.archType }} --monodotnet $(Build.SourcesDirectory)/.dotnet-mono ${{ if and(eq(parameters.runtimeType, 'wasm'), ne(parameters.codeGenType, 'AOT')) }}: @@ -106,9 +100,9 @@ jobs: extraSetupParameters: --corerootdirectory $(Build.SourcesDirectory)/artifacts/tests/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.Release/Tests/Core_Root --architecture ${{ parameters.archType }} ${{ if and(eq(parameters.runtimeType, 'coreclr'), eq(parameters.osSubGroup, '_musl')) }}: extraSetupParameters: --corerootdirectory $(Build.SourcesDirectory)/artifacts/tests/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.Release/Tests/Core_Root --architecture ${{ parameters.archType }} --alpine - ${{ if in(parameters.runtimeType, 'AndroidMono', 'AndroidMobileNet6') }}: + ${{ if in(parameters.runtimeType, 'AndroidMono') }}: extraSetupParameters: -Architecture ${{ parameters.archType }} -AndroidMono - ${{ if in(parameters.runtimeType, 'iosMono', 'iOSMobileNet6') }}: + ${{ if in(parameters.runtimeType, 'iosMono') }}: extraSetupParameters: --architecture ${{ parameters.archType }} --iosmono --iosllvmbuild ${{ parameters.iOSLlvmBuild }} variables: @@ -148,7 +142,7 @@ jobs: displayName: 'live-built libraries' # Download coreclr - - ${{ if not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6', 'wasm')) }}: + - ${{ if not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'wasm')) }}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: unpackFolder: $(buildProductRootFolderPath) @@ -205,7 +199,7 @@ jobs: - script: "mkdir -p $(librariesDownloadDir)/bin/aot/sgen;mkdir -p $(librariesDownloadDir)/bin/aot/pack;cp -r $(librariesDownloadDir)/LinuxMonoAOT/artifacts/obj/mono/Linux.${{ parameters.archType }}.Release/mono/* $(librariesDownloadDir)/bin/aot/sgen;cp -r $(librariesDownloadDir)/LinuxMonoAOT/artifacts/bin/microsoft.netcore.app.runtime.linux-${{ parameters.archType }}/Release/* $(librariesDownloadDir)/bin/aot/pack" displayName: "Create aot directory (Linux)" - # Download AndroidMono and MauiAndroid + # Download artifacts for Android Testing - ${{ if eq(parameters.runtimeType, 'AndroidMono')}}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: @@ -214,53 +208,8 @@ jobs: artifactFileName: 'AndroidMonoarm64.tar.gz' artifactName: 'AndroidMonoarm64' displayName: 'Mono Android HelloWorld' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiAndroidApp.tar.gz' - artifactName: 'MauiAndroidApp' - displayName: 'Maui Android App' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiAndroidPodcast.tar.gz' - artifactName: 'MauiAndroidPodcast' - displayName: 'Maui Android Podcast' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiBlazorAndroidApp.tar.gz' - artifactName: 'MauiBlazorAndroidApp' - displayName: 'Maui Blazor Android App' - - # Download Maui Android net6 stuff - - ${{ if eq(parameters.runtimeType, 'AndroidMobileNet6')}}: - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiAndroidAppNet6.tar.gz' - artifactName: 'MauiAndroidAppNet6' - displayName: 'Maui Android App Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiAndroidPodcastNet6.tar.gz' - artifactName: 'MauiAndroidPodcastNet6' - displayName: 'Maui Android Podcast Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory) - cleanUnpackFolder: false - artifactFileName: 'MauiBlazorAndroidAppNet6.tar.gz' - artifactName: 'MauiBlazorAndroidAppNet6' - displayName: 'Maui Blazor Android App Net6' - - # Download iOSMono tests and MauiiOS/MacCatalyst + + # Download iOSMono tests - ${{ if eq(parameters.runtimeType, 'iOSMono') }}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: @@ -294,80 +243,6 @@ jobs: downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmzip' artifactName: 'iOSSampleAppLLVM' checkDownloadedFiles: true - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiiOSDefaultIPA - cleanUnpackFolder: false - artifactFileName: 'MauiiOSDefaultIPA.tar.gz' - artifactName: 'MauiiOSDefaultIPA' - displayName: 'Maui iOS IPA' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiMacCatalystDefault - cleanUnpackFolder: false - artifactFileName: 'MauiMacCatalystDefault.tar.gz' - artifactName: 'MauiMacCatalystDefault' - displayName: 'Maui MacCatalyst App' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiiOSPodcastIPA - cleanUnpackFolder: false - artifactFileName: 'MauiiOSPodcastIPA.tar.gz' - artifactName: 'MauiiOSPodcastIPA' - displayName: 'Maui iOS Podcast IPA' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiBlazoriOSDefaultIPA - cleanUnpackFolder: false - artifactFileName: 'MauiBlazoriOSDefaultIPA.tar.gz' - artifactName: 'MauiBlazoriOSDefaultIPA' - displayName: 'Maui Blazor iOS IPA' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiBlazorMacCatalystDefault - cleanUnpackFolder: false - artifactFileName: 'MauiBlazorMacCatalystDefault.tar.gz' - artifactName: 'MauiBlazorMacCatalystDefault' - displayName: 'Maui Blazor MacCatalyst App' - - - # Download Maui iOS net6 stuff - - ${{ if eq(parameters.runtimeType, 'iOSMobileNet6') }}: - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiiOSDefaultIPA - cleanUnpackFolder: false - artifactFileName: 'MauiiOSDefaultIPANet6.tar.gz' - artifactName: 'MauiiOSDefaultIPANet6' - displayName: 'Maui iOS IPA Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiMacCatalystDefault - cleanUnpackFolder: false - artifactFileName: 'MauiMacCatalystDefaultNet6.tar.gz' - artifactName: 'MauiMacCatalystDefaultNet6' - displayName: 'Maui MacCatalyst App Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiiOSPodcastIPA - cleanUnpackFolder: false - artifactFileName: 'MauiiOSPodcastIPANet6.tar.gz' - artifactName: 'MauiiOSPodcastIPANet6' - displayName: 'Maui iOS Podcast IPA Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiBlazoriOSDefaultIPA - cleanUnpackFolder: false - artifactFileName: 'MauiBlazoriOSDefaultIPANet6.tar.gz' - artifactName: 'MauiBlazoriOSDefaultIPANet6' - displayName: 'Maui Blazor iOS IPA Net6' - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/MauiBlazorMacCatalystDefault - cleanUnpackFolder: false - artifactFileName: 'MauiBlazorMacCatalystDefaultNet6.tar.gz' - artifactName: 'MauiBlazorMacCatalystDefaultNet6' - displayName: 'Maui Blazor MacCatalyst App Net6' # Create Core_Root - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) @@ -377,8 +252,8 @@ jobs: # Copy the runtime directory into the testhost folder to include OOBs. - script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\runtime\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\shared\\Microsoft.NETCore.App\\$(productVersion) /E /I /Y;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\$(productVersion)\\corerun.exe" displayName: "Create mono dotnet (Windows)" - condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'windows'), not(in('${{ parameters.runtimeType }}', 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6'))) + condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'windows'), not(in('${{ parameters.runtimeType }}', 'AndroidMono', 'iOSMono'))) - script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/runtime/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/shared/Microsoft.NETCore.App/$(productVersion) -rf;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/$(productVersion)/corerun" displayName: "Create mono dotnet (Linux)" - condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'windows'), not(in('${{ parameters.runtimeType }}', 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6'))) + condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'windows'), not(in('${{ parameters.runtimeType }}', 'AndroidMono', 'iOSMono'))) diff --git a/eng/testing/performance/android_scenarios.proj b/eng/testing/performance/android_scenarios.proj index f01d7c17c26438..5d22af65c6cc67 100644 --- a/eng/testing/performance/android_scenarios.proj +++ b/eng/testing/performance/android_scenarios.proj @@ -35,42 +35,6 @@ $(Python) test.py sod --scenario-name "%(Identity)" $(Python) post.py - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidPodcast.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - $(WorkItemDirectory) echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py --apk-name HelloAndroid.apk @@ -83,41 +47,5 @@ $(Python) test.py devicestartup --device-type android --package-path pub\HelloAndroid.apk --package-name net.dot.HelloAndroid --scenario-name "%(Identity)" --disable-animations $(Python) post.py - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6 - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)" --disable-animations - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6 --disable-animations - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)" --disable-animations - $(Python) post.py - diff --git a/eng/testing/performance/android_scenarios_net6.proj b/eng/testing/performance/android_scenarios_net6.proj deleted file mode 100644 index edd493db6481a8..00000000000000 --- a/eng/testing/performance/android_scenarios_net6.proj +++ /dev/null @@ -1,99 +0,0 @@ - - - true - 1.0.0-prerelease.21566.2 - %HELIX_CORRELATION_PAYLOAD%\microsoft.dotnet.xharness.cli\$(MicrosoftDotNetXHarnessCLIVersion)\tools\net6.0\any\Microsoft.DotNet.XHarness.CLI.dll - - - python3 - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk - - - - - %(Identity) - - - - - %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ - - - $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ - - - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidPodcast.apk - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6 - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)" --disable-animations - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6 --disable-animations - $(Python) post.py - - - $(WorkItemDirectory) - echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk - $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)" --disable-animations - $(Python) post.py - - - diff --git a/eng/testing/performance/ios_scenarios.proj b/eng/testing/performance/ios_scenarios.proj index 40dee2324c31d5..6b30417fdff479 100644 --- a/eng/testing/performance/ios_scenarios.proj +++ b/eng/testing/performance/ios_scenarios.proj @@ -60,132 +60,6 @@ $(Python) test.py devicestartup --device-type ios --package-path HelloiOS.app --package-name net.dot.HelloiOS --scenario-name "%(Identity)" ((result=$?)) - # Post commands - $(Python) post.py - exit $result - ]]> - - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiMacCatalystDefault ./app;$(Python) pre.py --name app - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --name MauiiOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --unzip --name MauiiOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --name MauiBlazoriOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --unzip --name MauiBlazoriOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiBlazorMacCatalystDefault ./app;$(Python) pre.py --name app - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --name MauiiOSPodcast.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --unzip --name MauiiOSPodcast.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - export PYTHONPATH=$ORIGPYPATH;$(HelixPostCommands) - - diff --git a/eng/testing/performance/ios_scenarios_net6.proj b/eng/testing/performance/ios_scenarios_net6.proj deleted file mode 100644 index 36c8cabc5560d1..00000000000000 --- a/eng/testing/performance/ios_scenarios_net6.proj +++ /dev/null @@ -1,168 +0,0 @@ - - - true - - - python3 - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk - $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup - - - - - %(Identity) - - - - - nollvm - llvm - - - - %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ - - - - $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ - - - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiMacCatalystDefault ./app;$(Python) pre.py --name app - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --name MauiiOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --unzip --name MauiiOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --name MauiBlazoriOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --unzip --name MauiBlazoriOSDefault.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiblazorios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiBlazorMacCatalystDefault ./app;$(Python) pre.py --name app - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --name MauiiOSPodcast.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory) - cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --unzip --name MauiiOSPodcast.ipa - $(Python) test.py sod --scenario-name "%(Identity)" - $(Python) post.py - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - $(WorkItemDirectory).zip - 00:15:00 - ios-device - - - - - - - - - export PYTHONPATH=$ORIGPYPATH;$(HelixPostCommands) - - - diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index 183f84f9fc8392..1590b5f1e36d09 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -162,14 +162,7 @@ if ($AndroidMono) { { mkdir $WorkItemDirectory } - if($Kind -ne "android_scenarios_net6") - { - Copy-Item -path "$SourceDirectory\androidHelloWorld\HelloAndroid.apk" $PayloadDirectory -Verbose - } - Copy-Item -path "$SourceDirectory\MauiAndroidDefault.apk" $PayloadDirectory -Verbose - Copy-Item -path "$SourceDirectory\MauiBlazorAndroidDefault.apk" $PayloadDirectory -Verbose - Copy-Item -path "$SourceDirectory\MauiAndroidPodcast.apk" $PayloadDirectory -Verbose - + Copy-Item -path "$SourceDirectory\androidHelloWorld\HelloAndroid.apk" $PayloadDirectory -Verbose $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' } diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 0ab69f8a3cde53..5af80ba888d62c 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -385,37 +385,13 @@ fi if [[ "$iosmono" == "true" ]]; then if [[ "$iosllvmbuild" == "True" ]]; then - if [[ "$kind" != "ios_scenarios_net6" ]]; then - # LLVM Mono .app - mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvm $payload_directory/iosHelloWorld - mkdir -p $payload_directory/iosHelloWorldZip/llvmzip && cp -rv $source_directory/iosHelloWorldZip/llvmzip $payload_directory/iosHelloWorldZip - fi + # LLVM Mono .app + mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvm $payload_directory/iosHelloWorld + mkdir -p $payload_directory/iosHelloWorldZip/llvmzip && cp -rv $source_directory/iosHelloWorldZip/llvmzip $payload_directory/iosHelloWorldZip else - # NoLLVM Mono .app, Maui iOS IPA, Maui Maccatalyst, Maui iOS Podcast IPA - if [[ "$kind" != "ios_scenarios_net6" ]]; then - mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvm $payload_directory/iosHelloWorld - mkdir -p $payload_directory/iosHelloWorldZip/nollvmzip && cp -rv $source_directory/iosHelloWorldZip/nollvmzip $payload_directory/iosHelloWorldZip - fi - mkdir -p $payload_directory/MauiMacCatalystDefault && cp -rv $source_directory/MauiMacCatalystDefault/MauiMacCatalystDefault.app $payload_directory/MauiMacCatalystDefault - mkdir -p $payload_directory/MauiBlazorMacCatalystDefault && cp -rv $source_directory/MauiBlazorMacCatalystDefault/MauiBlazorMacCatalystDefault.app $payload_directory/MauiBlazorMacCatalystDefault - cp -v $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.ipa $payload_directory/MauiiOSDefault.ipa - cp -v $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.ipa $payload_directory/MauiBlazoriOSDefault.ipa - cp -v $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.ipa $payload_directory/MauiiOSPodcast.ipa - - # Get the .app so we can resign in the xharness item - cp -v $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.ipa $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.zip - unzip -d $source_directory/MauiiOSDefaultIPA $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.zip - mv $source_directory/MauiiOSDefaultIPA/Payload/MauiTesting.app $payload_directory/ - - # Get the .app so we can resign in the xharness item for Maui Blazor - cp -v $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.ipa $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.zip - unzip -d $source_directory/MauiBlazoriOSDefaultIPA $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.zip - mv $source_directory/MauiBlazoriOSDefaultIPA/Payload/MauiBlazorTesting.app $payload_directory/ - - # Get the .app so we can resign in the xharness item for podcast - cp -v $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.ipa $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.zip - unzip -d $source_directory/MauiiOSPodcastIPA $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.zip - mv $source_directory/MauiiOSPodcastIPA/Payload/Microsoft.NetConf2021.Maui.app $payload_directory/ + # NoLLVM Mono .app + mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvm $payload_directory/iosHelloWorld + mkdir -p $payload_directory/iosHelloWorldZip/nollvmzip && cp -rv $source_directory/iosHelloWorldZip/nollvmzip $payload_directory/iosHelloWorldZip fi fi