Skip to content

Commit 53eeda3

Browse files
committed
Update Maui Workload Install Process for Perf (dotnet#64692)
* Add dotnet install and run to test if new dotnet version can be installed similar to how it is done in the Maui repo. * Download and use local dotnet version. * Use updated dotnet for more of the pipeline. * Test with made runtime packs and and add ios arm pack substitution. * Try building instead of publishing. * Reenable everything for full test run. * Package name now seems to default to lower case, at least for maui.
1 parent f530206 commit 53eeda3

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

eng/pipelines/coreclr/perf.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,8 @@ jobs:
523523
- Build_Android_x64_release_Maui_Packs_Mono
524524
- Build_MacCatalyst_x64_release_Maui_Packs_Mono
525525
- Build_iOSSimulator_x64_release_Maui_Packs_Mono
526+
- Build_iOS_arm_release_Maui_Packs_Mono
527+
- Build_iOS_arm64_release_Maui_Packs_Mono
526528
buildArgs: -s mono -c $(_BuildConfig)
527529
nameSuffix: MACiOSAndroidMaui
528530
isOfficialBuild: false

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,16 @@ steps:
110110
cleanDestinationFolder: false
111111

112112
- script: |
113-
curl -o ./rollback.json 'maui.blob.core.windows.net/metadata/rollbacks/main.json'
114-
./dotnet.sh workload update --from-rollback-file ./rollback.json
115-
./dotnet.sh workload install maui --skip-manifest-update
113+
curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
114+
chmod -R a+rx .
115+
./dotnet-install.sh --channel 6.0.2xx --quality signed --install-dir .
116+
./dotnet --info
117+
./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
116118
displayName: Install MAUI workload
117119
workingDirectory: $(Build.SourcesDirectory)
118120
119121
- script: |
120-
./dotnet.sh new maui -n MauiTesting
122+
./dotnet new maui -n MauiTesting
121123
cd MauiTesting
122124
cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.props ./Directory.Build.props
123125
cp $(Build.SourcesDirectory)/src/tests/Common/maui/MauiScenario.targets ./Directory.Build.targets
@@ -126,21 +128,21 @@ steps:
126128
127129
- script: |
128130
chmod -R a+r .
129-
../dotnet.sh publish -bl:MauiAndroid.binlog -f net6.0-android -c Release
131+
../dotnet publish -bl:MauiAndroid.binlog -f net6.0-android -c Release
130132
mv ./bin/Release/net6.0-android/com.companyname.MauiTesting-Signed.apk ./MauiAndroidDefault.apk
131133
displayName: Build MAUI Android
132134
workingDirectory: $(Build.SourcesDirectory)/MauiTesting
133135
134136
- script: |
135137
chmod -R a+r .
136-
../dotnet.sh publish -bl:MauiiOS.binlog -f net6.0-ios -c Release
138+
../dotnet build -bl:MauiiOS.binlog -f net6.0-ios -c Release
137139
mv ./bin/Release/net6.0-ios/iossimulator-x64/MauiTesting.app ./MauiiOSDefault.app
138140
displayName: Build MAUI iOS
139141
workingDirectory: $(Build.SourcesDirectory)/MauiTesting
140142
141143
- script: |
142144
chmod -R a+r .
143-
../dotnet.sh publish -bl:MauiMacCatalyst.binlog -f net6.0-maccatalyst -c Release
145+
../dotnet publish -bl:MauiMacCatalyst.binlog -f net6.0-maccatalyst -c Release
144146
mv ./bin/Release/net6.0-maccatalyst/maccatalyst-x64/MauiTesting.app ./MauiMacCatalystDefault.app
145147
displayName: Build MAUI MacCatalyst
146148
workingDirectory: $(Build.SourcesDirectory)/MauiTesting

eng/testing/performance/android_scenarios.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<HelixWorkItem Include="Startup - Android Maui">
5757
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
5858
<PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py</PreCommands>
59-
<Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.MauiTesting --scenario-name &quot;%(Identity)&quot;</Command>
59+
<Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name &quot;%(Identity)&quot;</Command>
6060
<PostCommands>$(Python) post.py</PostCommands>
6161
</HelixWorkItem>
6262
</ItemGroup>

src/tests/Common/maui/MauiScenario.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Message Text="Used runtime pack: %(ResolvedRuntimePack.PackageDirectory)" Importance="high" />
44
</Target>
55

6-
<!-- Use local targeting pack for NetCoreAppCurrent. -->
6+
<!--Use local targeting pack for NetCoreAppCurrent.-->
77
<Target Name="UpdateTargetingAndRuntimePack"
88
AfterTargets="ResolveFrameworkReferences">
99
<PropertyGroup>
@@ -18,6 +18,10 @@
1818
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-x86'" />
1919
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.android-x64"
2020
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'android-x64'" />
21+
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.ios-arm"
22+
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'ios-arm'" />
23+
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
24+
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'ios-arm64'" />
2125
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
2226
Condition="'%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App' and '%(ResolvedRuntimePack.RuntimeIdentifier)' == 'maccatalyst-x64'" />
2327
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)/Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"

0 commit comments

Comments
 (0)