diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml
index f71cb098841faf..278648bc277afb 100644
--- a/eng/pipelines/coreclr/perf.yml
+++ b/eng/pipelines/coreclr/perf.yml
@@ -523,6 +523,8 @@ jobs:
- 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: MACiOSAndroidMaui
isOfficialBuild: false
diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml
index f6d03413a1f52d..5ca99a4e844114 100644
--- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml
+++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml
@@ -110,14 +110,16 @@ steps:
cleanDestinationFolder: false
- script: |
- curl -o ./rollback.json 'maui.blob.core.windows.net/metadata/rollbacks/main.json'
- ./dotnet.sh workload update --from-rollback-file ./rollback.json
- ./dotnet.sh workload install maui --skip-manifest-update
+ 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.2xx --quality signed --install-dir .
+ ./dotnet --info
+ ./dotnet workload install maui --from-rollback-file https://aka.ms/dotnet/maui/main.json --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
displayName: Install MAUI workload
workingDirectory: $(Build.SourcesDirectory)
- script: |
- ./dotnet.sh new maui -n MauiTesting
+ ./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
@@ -126,21 +128,21 @@ steps:
- script: |
chmod -R a+r .
- ../dotnet.sh publish -bl:MauiAndroid.binlog -f net6.0-android -c Release
+ ../dotnet publish -bl:MauiAndroid.binlog -f net6.0-android -c Release
mv ./bin/Release/net6.0-android/com.companyname.MauiTesting-Signed.apk ./MauiAndroidDefault.apk
displayName: Build MAUI Android
workingDirectory: $(Build.SourcesDirectory)/MauiTesting
- script: |
chmod -R a+r .
- ../dotnet.sh publish -bl:MauiiOS.binlog -f net6.0-ios -c Release
+ ../dotnet build -bl:MauiiOS.binlog -f net6.0-ios -c Release
mv ./bin/Release/net6.0-ios/iossimulator-x64/MauiTesting.app ./MauiiOSDefault.app
displayName: Build MAUI iOS
workingDirectory: $(Build.SourcesDirectory)/MauiTesting
- script: |
chmod -R a+r .
- ../dotnet.sh publish -bl:MauiMacCatalyst.binlog -f net6.0-maccatalyst -c Release
+ ../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
diff --git a/eng/testing/performance/android_scenarios.proj b/eng/testing/performance/android_scenarios.proj
index 0b55442e304a2e..fefff6deeefe08 100644
--- a/eng/testing/performance/android_scenarios.proj
+++ b/eng/testing/performance/android_scenarios.proj
@@ -56,7 +56,7 @@
$(WorkItemDirectory)
echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py
- $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.MauiTesting --scenario-name "%(Identity)"
+ $(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)"
$(Python) post.py
diff --git a/src/tests/Common/maui/MauiScenario.targets b/src/tests/Common/maui/MauiScenario.targets
index 841b09e6141c7d..6928f98fce542b 100644
--- a/src/tests/Common/maui/MauiScenario.targets
+++ b/src/tests/Common/maui/MauiScenario.targets
@@ -3,7 +3,7 @@
-
+
@@ -18,6 +18,10 @@
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-x86'" />
+
+