From dbe430bc44f40f116498fc05876b3eca3eefe63a Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Mar 2022 14:32:10 -0700 Subject: [PATCH 01/32] Prepare for testing. --- eng/pipelines/coreclr/perf.yml | 710 ++++++++++++++++----------------- 1 file changed, 355 insertions(+), 355 deletions(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 812abe68d894f0..9540192097a10e 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -110,381 +110,381 @@ jobs: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'Schedule')) }}: - # build coreclr and libraries - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml - buildConfig: release - platforms: - - Linux_x64 - - windows_x64 - - windows_x86 - - Linux_musl_x64 - jobParameters: - testGroup: perf + ## build coreclr and libraries + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml + # buildConfig: release + # platforms: + # - Linux_x64 + # - windows_x64 + # - windows_x86 + # - Linux_musl_x64 + # jobParameters: + # testGroup: perf - # build mono on wasm - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: Release - runtimeFlavor: mono - platforms: - - Browser_wasm - jobParameters: - buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) - nameSuffix: wasm - isOfficialBuild: false - extraStepsTemplate: /eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml - extraStepsParameters: - configForBuild: Release + ## build mono on wasm + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/common/global-build-job.yml + # buildConfig: Release + # runtimeFlavor: mono + # platforms: + # - Browser_wasm + # jobParameters: + # buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + # nameSuffix: wasm + # isOfficialBuild: false + # extraStepsTemplate: /eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml + # extraStepsParameters: + # configForBuild: Release - # build mono for AOT - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Linux_x64 - jobParameters: - buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) - nameSuffix: AOT - isOfficialBuild: false - extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml - extraStepsParameters: - rootFolder: '$(Build.SourcesDirectory)/artifacts/' - includeRootFolder: true - displayName: AOT Mono Artifacts - artifactName: LinuxMonoAOTx64 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz + ## build mono for AOT + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/common/global-build-job.yml + # buildConfig: release + # runtimeFlavor: mono + # platforms: + # - Linux_x64 + # jobParameters: + # buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + # nameSuffix: AOT + # isOfficialBuild: false + # extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml + # extraStepsParameters: + # rootFolder: '$(Build.SourcesDirectory)/artifacts/' + # includeRootFolder: true + # displayName: AOT Mono Artifacts + # artifactName: LinuxMonoAOTx64 + # archiveExtension: '.tar.gz' + # archiveType: tar + # tarCompression: gz - # build mono Android scenarios - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Android_arm64 - jobParameters: - buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) - nameSuffix: AndroidMono - isOfficialBuild: false - extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-sample-apps.yml - extraStepsParameters: - rootFolder: '$(Build.SourcesDirectory)/artifacts/' - includeRootFolder: true - displayName: Android Mono Artifacts - artifactName: AndroidMonoarm64 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz + ## build mono Android scenarios + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/common/global-build-job.yml + # buildConfig: release + # runtimeFlavor: mono + # platforms: + # - Android_arm64 + # jobParameters: + # buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) + # nameSuffix: AndroidMono + # isOfficialBuild: false + # extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-sample-apps.yml + # extraStepsParameters: + # rootFolder: '$(Build.SourcesDirectory)/artifacts/' + # includeRootFolder: true + # displayName: Android Mono Artifacts + # artifactName: AndroidMonoarm64 + # archiveExtension: '.tar.gz' + # archiveType: tar + # tarCompression: gz - # build mono iOS scenarios - - 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+libs+host+packs -c $(_BuildConfig) - nameSuffix: iOSMono - isOfficialBuild: false - extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-sample-apps.yml - extraStepsParameters: - rootFolder: '$(Build.SourcesDirectory)/artifacts/' - includeRootFolder: true - displayName: iOS Mono Artifacts - artifactName: iOSMonoarm64 - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz + ## build mono iOS scenarios + #- 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+libs+host+packs -c $(_BuildConfig) + # nameSuffix: iOSMono + # isOfficialBuild: false + # extraStepsTemplate: /eng/pipelines/coreclr/templates/build-perf-sample-apps.yml + # extraStepsParameters: + # rootFolder: '$(Build.SourcesDirectory)/artifacts/' + # includeRootFolder: true + # displayName: iOS Mono Artifacts + # artifactName: iOSMonoarm64 + # archiveExtension: '.tar.gz' + # archiveType: tar + # tarCompression: gz - # build mono - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/mono/templates/build-job.yml - runtimeFlavor: mono - buildConfig: release - platforms: - - Linux_x64 + ## build mono + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/mono/templates/build-job.yml + # runtimeFlavor: mono + # buildConfig: release + # platforms: + # - Linux_x64 - # run mono and maui 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_MACiOSAndroidMaui.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 and maui 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_MACiOSAndroidMaui.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 - 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_MACiOSAndroidMaui.outputs['getMauiVersion.mauiVersion'] ] - jobParameters: - testGroup: perf - runtimeType: iOSMono - projectFile: ios_scenarios.proj - runKind: ios_scenarios - runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perfpixel4a' - iosLlvmBuild: False - additionalSetupParameters: "-MauiVersion $env:mauiVersion" + ## run mono iOS scenarios and maui iOS 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_MACiOSAndroidMaui.outputs['getMauiVersion.mauiVersion'] ] + # jobParameters: + # testGroup: perf + # runtimeType: iOSMono + # projectFile: ios_scenarios.proj + # runKind: ios_scenarios + # runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml + # logicalmachine: 'perfpixel4a' + # iosLlvmBuild: False + # additionalSetupParameters: "-MauiVersion $env:mauiVersion" - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Windows_x64 - jobParameters: - testGroup: perf - runtimeType: iOSMono - projectFile: ios_scenarios.proj - runKind: ios_scenarios - runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perfpixel4a' - iosLlvmBuild: True + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: mono + # platforms: + # - Windows_x64 + # jobParameters: + # testGroup: perf + # runtimeType: iOSMono + # projectFile: ios_scenarios.proj + # runKind: ios_scenarios + # runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml + # logicalmachine: 'perfpixel4a' + # iosLlvmBuild: True - # run mono microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Linux_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - runtimeType: mono - projectFile: microbenchmarks.proj - runKind: micro_mono - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' + ## run mono microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: mono + # platforms: + # - Linux_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # runtimeType: mono + # projectFile: microbenchmarks.proj + # runKind: micro_mono + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' - # run mono interpreter perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Linux_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - runtimeType: mono - codeGenType: 'Interpreter' - projectFile: microbenchmarks.proj - runKind: micro_mono - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' + ## run mono interpreter perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: mono + # platforms: + # - Linux_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # runtimeType: mono + # codeGenType: 'Interpreter' + # projectFile: microbenchmarks.proj + # runKind: micro_mono + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' - # run mono wasm interpreter (default) microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml # NOTE: should we move this file out of coreclr tempelates because it contains mono jobs? - buildConfig: release - runtimeFlavor: wasm - platforms: - - Linux_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - skipLiveLibrariesDownload: true - runtimeType: wasm - codeGenType: 'wasm' - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - javascriptEngine: 'v8' + ## run mono wasm interpreter (default) microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml # NOTE: should we move this file out of coreclr tempelates because it contains mono jobs? + # buildConfig: release + # runtimeFlavor: wasm + # platforms: + # - Linux_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # skipLiveLibrariesDownload: true + # runtimeType: wasm + # codeGenType: 'wasm' + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' + # javascriptEngine: 'v8' - #run mono wasm aot microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobtemplate: /eng/pipelines/coreclr/templates/perf-job.yml # note: should we move this file out of coreclr tempelates because it contains mono jobs? - buildconfig: release - runtimeflavor: wasm - platforms: - - linux_x64 - jobparameters: - testgroup: perf - livelibrariesbuildconfig: Release - skipLiveLibrariesDownload: true - runtimetype: wasm - codegentype: 'aot' - projectfile: microbenchmarks.proj - runkind: micro - runjobtemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - javascriptEngine: 'v8' + ##run mono wasm aot microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobtemplate: /eng/pipelines/coreclr/templates/perf-job.yml # note: should we move this file out of coreclr tempelates because it contains mono jobs? + # buildconfig: release + # runtimeflavor: wasm + # platforms: + # - linux_x64 + # jobparameters: + # testgroup: perf + # livelibrariesbuildconfig: Release + # skipLiveLibrariesDownload: true + # runtimetype: wasm + # codegentype: 'aot' + # projectfile: microbenchmarks.proj + # runkind: micro + # runjobtemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' + # javascriptEngine: 'v8' - # run mono aot microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml # NOTE: should we move this file out of coreclr tempelates because it contains mono jobs? - buildConfig: release - runtimeFlavor: aot - platforms: - - Linux_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - runtimeType: mono - codeGenType: 'AOT' - projectFile: microbenchmarks.proj - runKind: micro_mono - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' + ## run mono aot microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml # NOTE: should we move this file out of coreclr tempelates because it contains mono jobs? + # buildConfig: release + # runtimeFlavor: aot + # platforms: + # - Linux_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # runtimeType: mono + # codeGenType: 'AOT' + # projectFile: microbenchmarks.proj + # runKind: micro_mono + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' - # run coreclr perftiger microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - Linux_x64 - - windows_x64 - - windows_x86 - - Linux_musl_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' + ## run coreclr perftiger microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - Linux_x64 + # - windows_x64 + # - windows_x86 + # - Linux_musl_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' - # run coreclr perftiger microbenchmarks pgo perf jobs - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - pgoRunType: -NoPgo + ## run coreclr perftiger microbenchmarks pgo perf jobs + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - windows_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' + # pgoRunType: -NoPgo - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - pgoRunType: -DynamicPgo + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - windows_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' + # pgoRunType: -DynamicPgo - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perftiger' - pgoRunType: -FullPgo + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - windows_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perftiger' + # pgoRunType: -FullPgo - # run coreclr perfowl microbenchmarks perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - Linux_x64 - - windows_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: microbenchmarks.proj - runKind: micro - runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml - logicalmachine: 'perfowl' + ## run coreclr perfowl microbenchmarks perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - Linux_x64 + # - windows_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: microbenchmarks.proj + # runKind: micro + # runJobTemplate: /eng/pipelines/coreclr/templates/run-performance-job.yml + # logicalmachine: 'perfowl' - # run coreclr crossgen perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: coreclr - platforms: - - Linux_x64 - - windows_x64 - - windows_x86 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - projectFile: crossgen_perf.proj - runKind: crossgen_scenarios - runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - logicalmachine: 'perftiger' + ## run coreclr crossgen perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: coreclr + # platforms: + # - Linux_x64 + # - windows_x64 + # - windows_x86 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # projectFile: crossgen_perf.proj + # runKind: crossgen_scenarios + # runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml + # logicalmachine: 'perftiger' - # run mono wasm blazor perf job - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml - buildConfig: release - runtimeFlavor: wasm - platforms: - - Linux_x64 - jobParameters: - testGroup: perf - liveLibrariesBuildConfig: Release - skipLiveLibrariesDownload: true - runtimeType: wasm - projectFile: blazor_perf.proj - runKind: blazor_scenarios - runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml - additionalSetupParameters: '--latestdotnet' - logicalmachine: 'perftiger' + ## run mono wasm blazor perf job + #- template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + # buildConfig: release + # runtimeFlavor: wasm + # platforms: + # - Linux_x64 + # jobParameters: + # testGroup: perf + # liveLibrariesBuildConfig: Release + # skipLiveLibrariesDownload: true + # runtimeType: wasm + # projectFile: blazor_perf.proj + # runKind: blazor_scenarios + # runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml + # additionalSetupParameters: '--latestdotnet' + # logicalmachine: 'perftiger' # Uncomment to reenable package replacement ## build maui runtime packs From 4830c36c21337c8a05f0227e55dd15fe3c12d553 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Mar 2022 14:41:04 -0700 Subject: [PATCH 02/32] Updated sed and moved maccatalyst to before ios build where the maccatalyst target is removed. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 4c778155107018..380183b4d4d70f 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -172,11 +172,18 @@ steps: displayName: Get and Save MAUI Version workingDirectory: $(Build.SourcesDirectory)/MauiTesting + - 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: | 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 + sed -i'' 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 4b0f4bc15bb65d3abcff5b762f8589f16cd79a31 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Mar 2022 15:30:12 -0700 Subject: [PATCH 03/32] See if the sed worked properly and is what is causing the error. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 380183b4d4d70f..c0f053d8e88ac0 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -184,7 +184,7 @@ steps: # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 cp MauiTesting.csproj MauiTesting.csproj.bak sed -i'' 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' MauiTesting.csproj - + cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 9adc73bd7df8712127e0244be58eebf833f6b83b Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Mar 2022 16:12:16 -0700 Subject: [PATCH 04/32] Try line without escapes. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index c0f053d8e88ac0..b496d039a7190c 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -183,7 +183,7 @@ steps: 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'' 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' MauiTesting.csproj + sed -i'' 's/([>;])net[0-9]+.[0-9]-maccatalyst([;<])/\1\2/' MauiTesting.csproj cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 51cf19c2ed5e2af8acca3eb72f7a108306a78b34 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 29 Mar 2022 09:25:33 -0700 Subject: [PATCH 05/32] Specify the expression and the file explicitly. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index b496d039a7190c..30207ff20c4659 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -183,7 +183,7 @@ steps: 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'' 's/([>;])net[0-9]+.[0-9]-maccatalyst([;<])/\1\2/' MauiTesting.csproj + sed -i'' -e 's/([>;])net[0-9]+.[0-9]-maccatalyst([;<])/\1\2/' -f MauiTesting.csproj cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From a4e3034791e756c9a39859592326ec6d39de011e Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 29 Mar 2022 10:55:39 -0700 Subject: [PATCH 06/32] Revert "Try line without escapes." This reverts commit d7bde988542ed08c3a485070ef532f82ac5038ef. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 30207ff20c4659..63919dd33eb69a 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -183,7 +183,7 @@ steps: 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/([>;])net[0-9]+.[0-9]-maccatalyst([;<])/\1\2/' -f MauiTesting.csproj + sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' -f MauiTesting.csproj cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 6a4fa020c854a9bd03ae84edeb38fc2085447efa Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 29 Mar 2022 11:34:25 -0700 Subject: [PATCH 07/32] Don't use -f for the file. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 63919dd33eb69a..55ea6f78323cf5 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -183,7 +183,7 @@ steps: 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/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' -f MauiTesting.csproj + sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' MauiTesting.csproj cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 69a44afbe2814bea1d3e4f9b264a3a5cb158aef1 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 29 Mar 2022 16:37:25 -0700 Subject: [PATCH 08/32] Try adding /g and add an echo of the command. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 55ea6f78323cf5..3e66ad8a1bf9ec 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -183,7 +183,8 @@ steps: 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/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/' MauiTesting.csproj + echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj + sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 2049cf4c780ca2efcdb272c845c3d5fa56fdc02d Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Thu, 31 Mar 2022 16:18:28 -0700 Subject: [PATCH 09/32] Disable runtime build and try multiple sed lines to figure out what is wrong. --- eng/pipelines/common/global-build-job.yml | 12 ++--- .../templates/build-perf-maui-apps.yml | 50 ++++++++++++------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 3105bf8fed2ba7..54ce25469820bc 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -154,12 +154,12 @@ jobs: inputs: filePath: $(Build.SourcesDirectory)/eng/pipelines/mono/update-machine-certs.ps1 - # Build - - ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}: - - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) - displayName: Build product - ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: - continueOnError: ${{ parameters.shouldContinueOnError }} + ## Build + #- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}: + # - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) + # displayName: Build product + # ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: + # continueOnError: ${{ parameters.shouldContinueOnError }} - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: | diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 3e66ad8a1bf9ec..d7f25a80a83197 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -186,6 +186,22 @@ steps: echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj + + echo sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj + sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj + cat MauiTesting.csproj + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + cat MauiTesting.csproj + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + cat MauiTesting.csproj + + + + ls -aR ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa @@ -193,26 +209,26 @@ steps: displayName: Build MAUI 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 + #- 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 - mv ./bin/Release/net6.0-ios/ios-arm64/publish/Microsoft.NetConf2021.Maui.ipa ./MauiiOSPodcast.ipa + # ../../../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 + # 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 + # 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: | + # 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 - task: PublishBuildArtifacts@1 displayName: 'Publish MauiAndroid binlog' From ca1b32ac79d80a8f3e4a2fa3c3cd90be55f52a0f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 11:27:13 -0700 Subject: [PATCH 10/32] Remove -i for echo testing. --- 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 d7f25a80a83197..0a39d22bad95b5 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -191,8 +191,8 @@ steps: sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj cat MauiTesting.csproj - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' cat MauiTesting.csproj echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' From 490f4dccd03ea6234d62e1599ee3f930edfb0909 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 12:47:36 -0700 Subject: [PATCH 11/32] Remove second -i for echo input. --- 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 0a39d22bad95b5..f03a01434a521f 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -195,8 +195,8 @@ steps: echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' cat MauiTesting.csproj - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' cat MauiTesting.csproj From 25d70e359947cfcaba0d40d8613cb8e7afb5e489 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 13:24:00 -0700 Subject: [PATCH 12/32] See if there are any hidden characters. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index f03a01434a521f..eda97fcd9d8f7b 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -185,7 +185,7 @@ steps: cp MauiTesting.csproj MauiTesting.csproj.bak echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj - cat MauiTesting.csproj + cat -vA MauiTesting.csproj echo sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj From c9fc230a93e2414baa6ebdcaee8ff2b9a5cfe86f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 13:49:56 -0700 Subject: [PATCH 13/32] Change cat -vA to cat -vET --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index eda97fcd9d8f7b..90d7e764a1d49b 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -185,7 +185,7 @@ steps: cp MauiTesting.csproj MauiTesting.csproj.bak echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj - cat -vA MauiTesting.csproj + cat -vET MauiTesting.csproj echo sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj From 119c9ca795e21ad16d9f7f1756083f495cb1eee3 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 14:18:09 -0700 Subject: [PATCH 14/32] Add format-hex of the mauitesting.csproj file to see if there are weird characters and further sped up testing runs. --- eng/pipelines/common/global-build-job.yml | 6 +-- .../templates/build-perf-maui-apps.yml | 52 +++++++++++-------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 54ce25469820bc..938d5b97000809 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -117,9 +117,9 @@ jobs: - ${{ variable }} steps: - - checkout: self - clean: true - fetchDepth: $(checkoutFetchDepth) + #- checkout: self + # clean: true + # fetchDepth: $(checkoutFetchDepth) - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 90d7e764a1d49b..ac71b96b870efa 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -133,14 +133,14 @@ steps: 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: | + # 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 @@ -152,15 +152,15 @@ steps: 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 + #- 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. @@ -172,20 +172,26 @@ steps: displayName: Get and Save MAUI Version workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - 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 + - powershell: | + Format-Hex MauiTesting.csproj + name: getHex + displayName: Hex thing workingDirectory: $(Build.SourcesDirectory)/MauiTesting + #- 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: | chmod -R a+r . # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 cp MauiTesting.csproj MauiTesting.csproj.bak echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj - cat -vET MauiTesting.csproj + cat MauiTesting.csproj echo sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj From bc872f555a0c57cb21e93e8dd546873430a20984 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 14:29:07 -0700 Subject: [PATCH 15/32] MauiVersion doesn't exist atm. --- .../coreclr/templates/build-perf-maui-apps.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index ac71b96b870efa..3400fe67a9a411 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -164,13 +164,13 @@ steps: # 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 + #- 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 - powershell: | Format-Hex MauiTesting.csproj From 2ba42c58e358aae9031abf90f601481605ef51df Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:04:56 -0700 Subject: [PATCH 16/32] Try the sed earlier and what not. --- eng/pipelines/common/global-build-job.yml | 17 +++++++++++++++++ .../coreclr/templates/build-perf-maui-apps.yml | 10 ---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 938d5b97000809..d5e3ae33010bfb 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -121,6 +121,23 @@ jobs: # clean: true # fetchDepth: $(checkoutFetchDepth) + - script: | + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + cat MauiTesting.csproj + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + cat MauiTesting.csproj + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + cat MauiTesting.csproj + displayname: SEDTesting + - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 3400fe67a9a411..51b9faf1a948d2 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -197,16 +197,6 @@ steps: sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj cat MauiTesting.csproj - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - cat MauiTesting.csproj - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - cat MauiTesting.csproj - - - ls -aR ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 304177993aa51f5e78cf04f5f8144f6935c87f95 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:07:24 -0700 Subject: [PATCH 17/32] Fix spacing issue. --- eng/pipelines/common/global-build-job.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index d5e3ae33010bfb..2d36d0f33bbb6d 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,20 +122,17 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - script: | - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - cat MauiTesting.csproj + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - cat MauiTesting.csproj + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - cat MauiTesting.csproj + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' displayname: SEDTesting - ${{ if eq(parameters.isOfficialBuild, true) }}: From 5cdd3b951292f1e1ec0b35342f8eaca52ce4ced5 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:09:11 -0700 Subject: [PATCH 18/32] Fix for real? --- eng/pipelines/common/global-build-job.yml | 14 -------------- .../coreclr/templates/build-perf-maui-apps.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 2d36d0f33bbb6d..938d5b97000809 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -121,20 +121,6 @@ jobs: # clean: true # fetchDepth: $(checkoutFetchDepth) - - script: | - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - displayname: SEDTesting - - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 51b9faf1a948d2..eeff150c34579a 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -110,6 +110,21 @@ steps: # overwriteExistingFiles: true # cleanDestinationFolder: false + + - script: | + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + displayname: SEDTesting + # 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/main/NuGet.config' From f94dfb6e951d4640e3ebcd8e9d693e80c6d7a79b Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:09:55 -0700 Subject: [PATCH 19/32] Revert "Fix for real?" This reverts commit 5cdd3b951292f1e1ec0b35342f8eaca52ce4ced5. --- eng/pipelines/common/global-build-job.yml | 14 ++++++++++++++ .../coreclr/templates/build-perf-maui-apps.yml | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 938d5b97000809..443f284769f72f 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -121,6 +121,20 @@ jobs: # clean: true # fetchDepth: $(checkoutFetchDepth) + - script: | + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + displayName: SEDTesting + - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index eeff150c34579a..51b9faf1a948d2 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -110,21 +110,6 @@ steps: # overwriteExistingFiles: true # cleanDestinationFolder: false - - - script: | - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - displayname: SEDTesting - # 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/main/NuGet.config' From c9a43ae9157720d338839d06c147628dff0c39f1 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:31:02 -0700 Subject: [PATCH 20/32] Another attempt... --- eng/pipelines/common/global-build-job.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 443f284769f72f..75aa1e1d752ee9 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -121,7 +121,7 @@ jobs: # clean: true # fetchDepth: $(checkoutFetchDepth) - - script: | + - bash: | echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' @@ -133,6 +133,12 @@ jobs: echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' displayName: SEDTesting - ${{ if eq(parameters.isOfficialBuild, true) }}: From c621a364a9fa2259ec8e1eca3967eef6cffef9f6 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:58:25 -0700 Subject: [PATCH 21/32] Back to incremental testing. --- eng/pipelines/common/global-build-job.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 75aa1e1d752ee9..49b0b44eb0ce78 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,23 +122,9 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/' - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' - - echo echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\\([>;]\\)net[0-9]\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' displayName: SEDTesting - ${{ if eq(parameters.isOfficialBuild, true) }}: From 9714884ace3ae16c57b37449c8dc867ac0498b62 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 15:59:08 -0700 Subject: [PATCH 22/32] Add g to change all --- eng/pipelines/common/global-build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 49b0b44eb0ce78..3150193e0b8feb 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -123,7 +123,7 @@ jobs: - bash: | echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/' + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/g' displayName: SEDTesting From c092c945406a8ed96776b4d25de33d89ef07e39e Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 16:17:36 -0700 Subject: [PATCH 23/32] Add a bunch of test cases. --- eng/pipelines/common/global-build-job.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 3150193e0b8feb..6a97bbc7051ecc 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,9 +122,26 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[6]/NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[6]/NOT/g' + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g' + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net([0-9])/NOT\1/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net([0-9])/NOT\1/g' + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net\([0-9]\)/NOT\1/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net\([0-9]\)/NOT\1/g' + + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + + displayName: SEDTesting - ${{ if eq(parameters.isOfficialBuild, true) }}: From 1535feef3ba591060dc9bb82b412c6320d25facc Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 16:31:05 -0700 Subject: [PATCH 24/32] Next iteration. --- eng/pipelines/common/global-build-job.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 6a97bbc7051ecc..e72d1d04fc1113 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,21 +122,20 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net/NOT/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[6]/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[6]/NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net([0-9])/NOT\1/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net([0-9])/NOT\1/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]/NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]/NOT/g' + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]-mac/NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]-mac/NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net\([0-9]\)/NOT\1/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net\([0-9]\)/NOT\1/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]+/NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]+/NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' From 336dd3c3d086c895c628d53c7f774dca53854ee0 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 16:40:36 -0700 Subject: [PATCH 25/32] Another iteration... --- eng/pipelines/common/global-build-job.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index e72d1d04fc1113..16bbed753df4cf 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,20 +122,17 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]/NOT/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]/NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]-mac/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]\.[0-9]-mac/NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.\d+-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.\d+-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]+/NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/net[0-9]+/NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\+\.\d\+-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\+\.\d\+-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([>;]\)/\1NOT\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([>;]\)/\1NOT\2/g' echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' From a632f3ebbc5e0b9324fe6579a065dfc712b138f9 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 4 Apr 2022 16:53:17 -0700 Subject: [PATCH 26/32] Iteration 3? --- eng/pipelines/common/global-build-job.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 16bbed753df4cf..a379ff3ac6b801 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -125,14 +125,17 @@ jobs: echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.\d+-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.\d+-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.[0-9]-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\+\.\d\+-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\+\.\d\+-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([>;]\)/\1NOT\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([>;]\)/\1NOT\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT\2/g' + + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g' echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' From 3fda89aed05c88db73e8ee52588f544d2cf4944f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 09:13:26 -0700 Subject: [PATCH 27/32] Add extended regex and fix incorrect grouping number. --- eng/pipelines/common/global-build-job.yml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index a379ff3ac6b801..671862d8db6d6c 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,23 +122,23 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d+\.[0-9]-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d+\.[0-9]-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' displayName: SEDTesting From 0af9a9c21f012d026f61ea0bfd0ba197272ec2d4 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 10:14:58 -0700 Subject: [PATCH 28/32] Iteration 5? --- eng/pipelines/common/global-build-job.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 671862d8db6d6c..b8cd4e273b24ec 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,23 +122,17 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\.[0-9]-mac/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-mac/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-mac/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d+\.[0-9]-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]-maccatalyst/\1NOT/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst/\1NOT/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1NOT\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1NOT\2/g' - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst/\1NOT/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net\d\.\d-maccatalyst\([<;]\)/\1NOT\2/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\+\.[0-9]-maccatalyst([;<])/\1\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\+\.[0-9]-maccatalyst([;<])/\1\2/g' displayName: SEDTesting From 307dcf750be9dd017632448bb9b7ec61b8c7e00f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 10:40:49 -0700 Subject: [PATCH 29/32] Final testing iter? --- eng/pipelines/common/global-build-job.yml | 15 ++------------- .../coreclr/templates/build-perf-maui-apps.yml | 8 ++------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index b8cd4e273b24ec..8136e01337ab4b 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,19 +122,8 @@ jobs: # fetchDepth: $(checkoutFetchDepth) - bash: | - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-mac/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-mac/\1NOT/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]-maccatalyst/\1NOT/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]-maccatalyst/\1NOT/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1NOT\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1NOT\2/g' - - echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\+\.[0-9]-maccatalyst([;<])/\1\2/g'" - echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]\+\.[0-9]-maccatalyst([;<])/\1\2/g' - - + echo echo "'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g'" + echo 'net6.0-android;net6.0-ios;net6.0-maccatalyst' | sed -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' displayName: SEDTesting - ${{ if eq(parameters.isOfficialBuild, true) }}: diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 51b9faf1a948d2..b1cceb5ea19459 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -189,12 +189,8 @@ steps: chmod -R a+r . # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 cp MauiTesting.csproj MauiTesting.csproj.bak - echo sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj - sed -i'' -e 's/\([>;]\)net[0-9]\+\.[0-9]-maccatalyst\([;<]\)/\1\2/g' MauiTesting.csproj - cat MauiTesting.csproj - - echo sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj - sed -i'' -e 's/\\([>;]\\)net[0-9]\\+\\.[0-9]-maccatalyst\\([;<]\\)/\\1\\2/g' MauiTesting.csproj + echo "sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj" + sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj ls -aR From 98cbb6e832395177d09d55f8a6d09d5857cd9512 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 11:10:27 -0700 Subject: [PATCH 30/32] Change script to bash. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index b1cceb5ea19459..5164c4b4978a4f 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -185,7 +185,7 @@ steps: # displayName: Build MAUI MacCatalyst # workingDirectory: $(Build.SourcesDirectory)/MauiTesting - - script: | + - bash: | chmod -R a+r . # remove net6.0-maccatalyst to work around https://github.com/dotnet/sdk/issues/21877 cp MauiTesting.csproj MauiTesting.csproj.bak From f7154d5a21264200682d51ce9925439dfe1ab19f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 14:07:12 -0700 Subject: [PATCH 31/32] More file sed testing. --- .../coreclr/templates/build-perf-maui-apps.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 5164c4b4978a4f..50ac33bb398dc1 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -193,6 +193,18 @@ steps: sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj + echo "sed -i'' -E -e 's/\([>;]\)net[0-9]+\.[0-9]+-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj" + sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + cat MauiTesting.csproj + + echo "sed -i'' -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1\2/g' MauiTesting.csproj" + sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + cat MauiTesting.csproj + + echo "sed -i'' -E -e 's/\([>;]\)net[0-9]\.[0-9]-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj" + sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + cat MauiTesting.csproj + ls -aR ../dotnet publish -bl:MauiiOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiTesting.ipa ./MauiiOSDefault.ipa From 279476acbfa67e0155417d2b337d72d112b858dc Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 5 Apr 2022 15:11:18 -0700 Subject: [PATCH 32/32] Add missing backslashes. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 50ac33bb398dc1..4970f986a05c46 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -194,15 +194,15 @@ steps: cat MauiTesting.csproj echo "sed -i'' -E -e 's/\([>;]\)net[0-9]+\.[0-9]+-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj" - sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + sed -i'' -E -e 's/\([>;]\)net[0-9]+\.[0-9]+-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj echo "sed -i'' -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1\2/g' MauiTesting.csproj" - sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + sed -i'' -E -e 's/([>;])net[0-9]\.[0-9]-maccatalyst([<;])/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj echo "sed -i'' -E -e 's/\([>;]\)net[0-9]\.[0-9]-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj" - sed -i'' -E -e 's/([>;])net[0-9]+\.[0-9]+-maccatalyst([<;])/\1\2/g' MauiTesting.csproj + sed -i'' -E -e 's/\([>;]\)net[0-9]+\.[0-9]+-maccatalyst\([<;]\)/\1\2/g' MauiTesting.csproj cat MauiTesting.csproj ls -aR