Skip to content

Commit d3149d4

Browse files
TanayParikhTanayParikh
committed
Replicate changes from #67670 
1 parent d07b1ee commit d3149d4

File tree

3 files changed

+60
-27
lines changed

3 files changed

+60
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ steps:
259259
# NuGet.config file cannot be in the build directory currently due to https://github.com/dotnet/aspnetcore/issues/41397
260260
rm NuGet.config
261261
262-
../dotnet publish -bl:MauiBlazoriOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false
262+
../dotnet publish -bl:MauiBlazoriOS.binlog -f net6.0-ios --self-contained -r ios-arm64 -c Release /p:_RequireCodeSigning=false /p:ApplicationId=net.dot.mauiblazortesting
263263
mv ./bin/Release/net6.0-ios/ios-arm64/publish/MauiBlazorTesting.ipa ./MauiBlazoriOSDefault.ipa
264264
265265
# Restore NuGet.config

‎eng/testing/performance/ios_scenarios.proj‎

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
<LlvmPath>nollvm</LlvmPath>
1919
<LlvmPath Condition="'$(iOSLlvmBuild)' == 'True'">llvm</LlvmPath>
2020
</PropertyGroup>
21-
21+
2222
<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
2323
<ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
24-
24+
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
2727
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
2828
</PropertyGroup>
2929

3030
<ItemGroup>
3131
<HelixWorkItem Include="SOD - iOS HelloWorld .app Size">
32-
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
33-
<PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath) ./app;$(Python) pre.py --name app</PreCommands>
34-
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
35-
<PostCommands>$(Python) post.py</PostCommands>
32+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
33+
<PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath) ./app;$(Python) pre.py --name app</PreCommands>
34+
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
35+
<PostCommands>$(Python) post.py</PostCommands>
3636
</HelixWorkItem>
3737
<HelixWorkItem Include="SOD - Maui MacCatalyst .app Size" Condition="'$(iOSLlvmBuild)' == 'False'">
3838
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
@@ -54,19 +54,19 @@
5454
</HelixWorkItem>
5555
<HelixWorkItem Include="SOD - Maui Blazor iOS IPA Size" Condition="'$(iOSLlvmBuild)' == 'False'">
5656
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
57-
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazoriOSDefaultIPA\MauiBlazoriOSDefault.ipa .;$(Python) pre.py --name MauiBlazoriOSDefault.ipa</PreCommands>
57+
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --name MauiBlazoriOSDefault.ipa</PreCommands>
5858
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
5959
<PostCommands>$(Python) post.py</PostCommands>
6060
</HelixWorkItem>
6161
<HelixWorkItem Include="SOD - Maui Blazor iOS IPA Size Unzipped" Condition="'$(iOSLlvmBuild)' == 'False'">
6262
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
63-
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazoriOSDefaultIPA\MauiBlazoriOSDefault.ipa .;$(Python) pre.py --unzip --name MauiBlazoriOSDefault.ipa</PreCommands>
63+
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --unzip --name MauiBlazoriOSDefault.ipa</PreCommands>
6464
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
6565
<PostCommands>$(Python) post.py</PostCommands>
6666
</HelixWorkItem>
6767
<HelixWorkItem Include="SOD - Maui Blazor MacCatalyst .app Size" Condition="'$(iOSLlvmBuild)' == 'False'">
6868
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
69-
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;xcopy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorMacCatalystDefault .\app/e/i;$(Python) pre.py --name app</PreCommands>
69+
<PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiBlazorMacCatalystDefault ./app;$(Python) pre.py --name app</PreCommands>
7070
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
7171
<PostCommands>$(Python) post.py</PostCommands>
7272
</HelixWorkItem>
@@ -82,12 +82,12 @@
8282
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
8383
<PostCommands>$(Python) post.py</PostCommands>
8484
</HelixWorkItem>
85-
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default" Condition="'$(iOSLlvmBuild)' == 'False'">
86-
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
87-
<WorkItemTimeout>00:05:00</WorkItemTimeout>
88-
<TestTarget>ios-device</TestTarget>
89-
<CustomCommands>
90-
<![CDATA[
85+
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default" Condition="'$(iOSLlvmBuild)' == 'False'">
86+
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
87+
<WorkItemTimeout>00:05:00</WorkItemTimeout>
88+
<TestTarget>ios-device</TestTarget>
89+
<CustomCommands>
90+
<![CDATA[
9191
# PreCommands
9292
export XHARNESSPATH=$XHARNESS_CLI_PATH
9393
@@ -102,16 +102,40 @@
102102
$(Python) test.py devicestartup --device-type ios --package-path MauiTesting.app --package-name net.dot.mauitesting --scenario-name "%(Identity)"
103103
104104
# Post commands
105-
$(Python) post.py
105+
$(Python) post.py
106+
]]>
107+
</CustomCommands>
108+
</XHarnessAppBundleToTest>
109+
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Blazor Default" Condition="'$(iOSLlvmBuild)' == 'False'">
110+
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
111+
<WorkItemTimeout>00:05:00</WorkItemTimeout>
112+
<TestTarget>ios-device</TestTarget>
113+
<CustomCommands>
114+
<![CDATA[
115+
# PreCommands
116+
export XHARNESSPATH=$XHARNESS_CLI_PATH
117+
118+
cp -r $HELIX_CORRELATION_PAYLOAD/MauiBlazorTesting.app $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app
119+
cp -f embedded.mobileprovision $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app
120+
cd $(ScenarioDirectory)mauiblazorios
121+
sign MauiBlazorTesting.app
122+
123+
$(Python) pre.py --name MauiBlazorTesting.app
124+
125+
# Testing commands
126+
$(Python) test.py devicestartup --device-type ios --package-path MauiBlazorTesting.app --package-name net.dot.mauiblazortesting --scenario-name "%(Identity)"
127+
128+
# Post commands
129+
$(Python) post.py
106130
]]>
107-
</CustomCommands>
108-
</XHarnessAppBundleToTest>
131+
</CustomCommands>
132+
</XHarnessAppBundleToTest>
109133
<XHarnessAppBundleToTest Include="Device Startup - iOS Maui Podcast" Condition="'$(iOSLlvmBuild)' == 'False'">
110-
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
111-
<WorkItemTimeout>00:05:00</WorkItemTimeout>
112-
<TestTarget>ios-device</TestTarget>
113-
<CustomCommands>
114-
<![CDATA[
134+
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
135+
<WorkItemTimeout>00:05:00</WorkItemTimeout>
136+
<TestTarget>ios-device</TestTarget>
137+
<CustomCommands>
138+
<![CDATA[
115139
# PreCommands
116140
export XHARNESSPATH=$XHARNESS_CLI_PATH
117141
@@ -126,9 +150,9 @@
126150
$(Python) test.py devicestartup --device-type ios --package-path Microsoft.NetConf2021.Maui.app --package-name net.dot.netconf2021.maui --scenario-name "%(Identity)"
127151
128152
# Post commands
129-
$(Python) post.py
153+
$(Python) post.py
130154
]]>
131-
</CustomCommands>
132-
</XHarnessAppBundleToTest>
155+
</CustomCommands>
156+
</XHarnessAppBundleToTest>
133157
</ItemGroup>
134158
</Project>

‎eng/testing/performance/performance-setup.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,21 @@ if [[ "$iosmono" == "true" ]]; then
357357
# NoLLVM Mono .app, Maui iOS IPA, Maui Maccatalyst, Maui iOS Podcast IPA
358358
mkdir -p $payload_directory/iosHelloWorld/nollvm && cp -rv $source_directory/iosHelloWorld/nollvm $payload_directory/iosHelloWorld/nollvm
359359
mkdir -p $payload_directory/MauiMacCatalystDefault && cp -rv $source_directory/MauiMacCatalystDefault/MauiMacCatalystDefault.app $payload_directory/MauiMacCatalystDefault
360+
mkdir -p $payload_directory/MauiBlazorMacCatalystDefault && cp -rv $source_directory/MauiBlazorMacCatalystDefault/MauiBlazorMacCatalystDefault.app $payload_directory/MauiBlazorMacCatalystDefault
360361
cp -v $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.ipa $payload_directory/MauiiOSDefault.ipa
362+
cp -v $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.ipa $payload_directory/MauiBlazoriOSDefault.ipa
361363
cp -v $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.ipa $payload_directory/MauiiOSPodcast.ipa
364+
362365
# Get the .app so we can resign in the xharness item
363366
cp -v $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.ipa $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.zip
364367
unzip -d $source_directory/MauiiOSDefaultIPA $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.zip
365368
mv $source_directory/MauiiOSDefaultIPA/Payload/MauiTesting.app $payload_directory/
369+
370+
# Get the .app so we can resign in the xharness item for Maui Blazor
371+
cp -v $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.ipa $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.zip
372+
unzip -d $source_directory/MauiBlazoriOSDefaultIPA $source_directory/MauiBlazoriOSDefaultIPA/MauiBlazoriOSDefault.zip
373+
mv $source_directory/MauiBlazoriOSDefaultIPA/Payload/MauiBlazorTesting.app $payload_directory/
374+
366375
# Get the .app so we can resign in the xharness item for podcast
367376
cp -v $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.ipa $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.zip
368377
unzip -d $source_directory/MauiiOSPodcastIPA $source_directory/MauiiOSPodcastIPA/MauiiOSPodcast.zip

0 commit comments

Comments
 (0)