diff options
author | Parker Bibus <parkerbibus@microsoft.com> | 2022-07-18 19:30:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-18 19:30:02 +0300 |
commit | e4ccabb96b9f3e08461b9183db56eaacb49d247c (patch) | |
tree | f36ad440009e951aacdf73e67d32b7dc1c333fc8 /eng/testing | |
parent | f970923d92e67fa0f4f271dffb8958d29eb33e49 (diff) |
[PERF][MAUI] Add Maui runs for net7.0 (#71979)
* Part 1 of adding Net7.0: Duplicated building work and added the names in the obvious places they needed to be.
* Add net6 versions of android and iOS scenarios, removing Mono ones from them since we are not building mono for net6
* Finished duplicating net6 versions of stuff in perf.yml and perf-job.yml (Section that redownloads jobs for perf running)
* Renamed runtimetype to mobile for net6 stuff. Adding file copying to the setup files so mono is not copied for net6. Updated the runkind for net6 runs.
* Fix dependency names.
* Undo renaming of the build artifacts.
* Setup target and prop files for net6 and set them for the net6 pipeline.
* Added back in dotnet version download to download the latest version, and added specific dotnet calls back into the build perf maui apps.
* Remove mono startup testing from android net6 mobile testing.
* Lowered the number of BlazorMaui iOS startup iterations from 7 to 5.
* Set version to one in preview.6 to match the net7.0 versions used in rollback file.
* Add setting the result in the blazor ios device startup runs.
* Make the downloaded version more clear by adding Net6 to Net6 app download versions.
Diffstat (limited to 'eng/testing')
-rw-r--r-- | eng/testing/performance/android_scenarios_net6.proj | 99 | ||||
-rw-r--r-- | eng/testing/performance/ios_scenarios.proj | 1 | ||||
-rw-r--r-- | eng/testing/performance/ios_scenarios_net6.proj | 168 | ||||
-rw-r--r-- | eng/testing/performance/performance-setup.ps1 | 26 | ||||
-rwxr-xr-x | eng/testing/performance/performance-setup.sh | 14 |
5 files changed, 282 insertions, 26 deletions
diff --git a/eng/testing/performance/android_scenarios_net6.proj b/eng/testing/performance/android_scenarios_net6.proj new file mode 100644 index 00000000000..edd493db648 --- /dev/null +++ b/eng/testing/performance/android_scenarios_net6.proj @@ -0,0 +1,99 @@ +<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test"> + <PropertyGroup> + <IncludeXHarnessCli>true</IncludeXHarnessCli> + <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21566.2</MicrosoftDotNetXHarnessCLIVersion> + <XharnessPath>%HELIX_CORRELATION_PAYLOAD%\microsoft.dotnet.xharness.cli\$(MicrosoftDotNetXHarnessCLIVersion)\tools\net6.0\any\Microsoft.DotNet.XHarness.CLI.dll</XharnessPath> + </PropertyGroup> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <Python>python3</Python> + <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands> + </PropertyGroup> + + <ItemGroup> + <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)"> + <PayloadDirectory>%(Identity)</PayloadDirectory> + </HelixCorrelationPayload> + </ItemGroup> + + <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'"> + <ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory> + </PropertyGroup> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory> + </PropertyGroup> + + <ItemGroup> + <HelixWorkItem Include="SOD - Maui Android APK Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --apk-name MauiAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Blazor Android APK Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Android Podcast APK Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --apk-name MauiAndroidPodcast.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Android Extracted Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Blazor Android Extracted Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .; $(Python) pre.py --unzip --apk-name MauiBlazorAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Android Podcast Extracted Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .; $(Python) pre.py --unzip --apk-name MauiAndroidPodcast.apk</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui DefaultTesting"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui Blazor DefaultTesting"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui Podcast"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui DefaultTesting NoAnimation"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidDefault.apk .;$(Python) pre.py --apk-name MauiAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidDefault.apk --package-name com.companyname.mauitesting --scenario-name "%(Identity)" --disable-animations</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui Blazor DefaultTesting NoAnimation"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiblazorandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiBlazorAndroidDefault.apk .;$(Python) pre.py --apk-name MauiBlazorAndroidDefault.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiBlazorAndroidDefault.apk --package-name com.companyname.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-extra-delay 6 --disable-animations</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="Device Startup - Android Maui Podcast NoAnimation"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>echo on;set XHARNESSPATH=$(XharnessPath);cd $(ScenarioDirectory)mauiandroid;copy %HELIX_CORRELATION_PAYLOAD%\MauiAndroidPodcast.apk .;$(Python) pre.py --apk-name MauiAndroidPodcast.apk</PreCommands> + <Command>$(Python) test.py devicestartup --device-type android --package-path pub\MauiAndroidPodcast.apk --package-name com.Microsoft.NetConf2021.Maui --scenario-name "%(Identity)" --disable-animations</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + </ItemGroup> +</Project> diff --git a/eng/testing/performance/ios_scenarios.proj b/eng/testing/performance/ios_scenarios.proj index 6ebf833ff83..40dee2324c3 100644 --- a/eng/testing/performance/ios_scenarios.proj +++ b/eng/testing/performance/ios_scenarios.proj @@ -158,6 +158,7 @@ # Testing commands $(Python) test.py devicestartup --device-type ios --package-path MauiBlazorTesting.app --package-name net.dot.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-magic-string __MAUI_Blazor_WebView_OnAfterRender__ --startup-iterations 5 + ((result=$?)) # Post commands $(Python) post.py diff --git a/eng/testing/performance/ios_scenarios_net6.proj b/eng/testing/performance/ios_scenarios_net6.proj new file mode 100644 index 00000000000..36c8cabc556 --- /dev/null +++ b/eng/testing/performance/ios_scenarios_net6.proj @@ -0,0 +1,168 @@ +<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test"> + <PropertyGroup> + <IncludeXHarnessCli>true</IncludeXHarnessCli> + </PropertyGroup> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <Python>python3</Python> + <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands> + <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup</HelixPreCommands> + </PropertyGroup> + + <ItemGroup> + <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)"> + <PayloadDirectory>%(Identity)</PayloadDirectory> + </HelixCorrelationPayload> + </ItemGroup> + + <PropertyGroup> + <LlvmPath>nollvm</LlvmPath> + <LlvmPath Condition="'$(iOSLlvmBuild)' == 'True'">llvm</LlvmPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'"> + <ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory> + + </PropertyGroup> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory> + </PropertyGroup> + + <ItemGroup> + <HelixWorkItem Include="SOD - Maui MacCatalyst .app Size" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiMacCatalystDefault ./app;$(Python) pre.py --name app</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui iOS IPA Size" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --name MauiiOSDefault.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui iOS IPA Size Unzipped" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSDefault.ipa .;$(Python) pre.py --unzip --name MauiiOSDefault.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Blazor iOS IPA Size" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --name MauiBlazoriOSDefault.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Blazor iOS IPA Size Unzipped" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp $HELIX_CORRELATION_PAYLOAD/MauiBlazoriOSDefault.ipa .;$(Python) pre.py --unzip --name MauiBlazoriOSDefault.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui Blazor MacCatalyst .app Size" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiblazorios;cp -rf $HELIX_CORRELATION_PAYLOAD/MauiBlazorMacCatalystDefault ./app;$(Python) pre.py --name app</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui iOS Podcast IPA Size" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --name MauiiOSPodcast.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Maui iOS Podcast IPA Size Unzipped" Condition="'$(iOSLlvmBuild)' == 'False'"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)mauiios;cp $HELIX_CORRELATION_PAYLOAD/MauiiOSPodcast.ipa .;$(Python) pre.py --unzip --name MauiiOSPodcast.ipa</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default" Condition="'$(iOSLlvmBuild)' == 'False'"> + <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath> + <WorkItemTimeout>00:15:00</WorkItemTimeout> + <TestTarget>ios-device</TestTarget> + <CustomCommands> + <![CDATA[ + # PreCommands + export XHARNESSPATH=$XHARNESS_CLI_PATH + + cp -r $HELIX_CORRELATION_PAYLOAD/MauiTesting.app $(ScenarioDirectory)mauiios/MauiTesting.app + cp -f embedded.mobileprovision $(ScenarioDirectory)mauiios/MauiTesting.app + cd $(ScenarioDirectory)mauiios + sign MauiTesting.app + + $(Python) pre.py --name MauiTesting.app + + # Testing commands + $(Python) test.py devicestartup --device-type ios --package-path MauiTesting.app --package-name net.dot.mauitesting --scenario-name "%(Identity)" + ((result=$?)) + + # Post commands + $(Python) post.py + exit $result + ]]> + </CustomCommands> + </XHarnessAppBundleToTest> + <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Blazor Default" Condition="'$(iOSLlvmBuild)' == 'False'"> + <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath> + <WorkItemTimeout>00:15:00</WorkItemTimeout> + <TestTarget>ios-device</TestTarget> + <CustomCommands> + <![CDATA[ + # PreCommands + export XHARNESSPATH=$XHARNESS_CLI_PATH + + cp -r $HELIX_CORRELATION_PAYLOAD/MauiBlazorTesting.app $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app + cp -f embedded.mobileprovision $(ScenarioDirectory)mauiblazorios/MauiBlazorTesting.app + cd $(ScenarioDirectory)mauiblazorios + sign MauiBlazorTesting.app + + $(Python) pre.py --name MauiBlazorTesting.app + + # Testing commands + $(Python) test.py devicestartup --device-type ios --package-path MauiBlazorTesting.app --package-name net.dot.mauiblazortesting --scenario-name "%(Identity)" --use-fully-drawn-time --fully-drawn-magic-string __MAUI_Blazor_WebView_OnAfterRender__ --startup-iterations 5 + ((result=$?)) + + # Post commands + $(Python) post.py + exit $result + ]]> + </CustomCommands> + </XHarnessAppBundleToTest> + <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Podcast" Condition="'$(iOSLlvmBuild)' == 'False'"> + <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath> + <WorkItemTimeout>00:15:00</WorkItemTimeout> + <TestTarget>ios-device</TestTarget> + <CustomCommands> + <![CDATA[ + # PreCommands + export XHARNESSPATH=$XHARNESS_CLI_PATH + + cp -r $HELIX_CORRELATION_PAYLOAD/Microsoft.NetConf2021.Maui.app $(ScenarioDirectory)mauiios/Microsoft.NetConf2021.Maui.app + cp -f embedded.mobileprovision $(ScenarioDirectory)mauiios/Microsoft.NetConf2021.Maui.app + cd $(ScenarioDirectory)mauiios + sign Microsoft.NetConf2021.Maui.app + + $(Python) pre.py --name Microsoft.NetConf2021.Maui.app + + # Testing commands + $(Python) test.py devicestartup --device-type ios --package-path Microsoft.NetConf2021.Maui.app --package-name net.dot.netconf2021.maui --scenario-name "%(Identity)" + ((result=$?)) + + # Post commands + $(Python) post.py + exit $result + ]]> + </CustomCommands> + </XHarnessAppBundleToTest> + </ItemGroup> + <!-- + This target is to work around the XHarness command that depend on scripts in ORIGPYPATH + being run before we get to run our normal Post commands. AddXHarnessCLI is the XHarness + Target so we just make sure we add this after that. + --> + <Target Name="ResetPYTHONPATHBeforeXHarnessCommand" AfterTargets="AddXHarnessCLI"> + <PropertyGroup> + <HelixPostCommands>export PYTHONPATH=$ORIGPYPATH;$(HelixPostCommands)</HelixPostCommands> + </PropertyGroup> + </Target> +</Project> diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index 5f98261c0ff..99cbf657b87 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -155,29 +155,13 @@ if ($AndroidMono) { { mkdir $WorkItemDirectory } - - Copy-Item -path "$SourceDirectory\androidHelloWorld\HelloAndroid.apk" $PayloadDirectory -Verbose - Copy-Item -path "$SourceDirectory\MauiAndroidDefault.apk" $PayloadDirectory -Verbose - Copy-Item -path "$SourceDirectory\MauiBlazorAndroidDefault.apk" $PayloadDirectory -Verbose - Copy-Item -path "$SourceDirectory\MauiAndroidPodcast.apk" $PayloadDirectory -Verbose - $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' -} - -if ($iOSMono) { - if(!(Test-Path $WorkItemDirectory)) + if($Kind -ne "android_scenarios_net6") { - mkdir $WorkItemDirectory - } - if($iOSLlvmBuild) { - Copy-Item -path "$SourceDirectory\iosHelloWorld\llvm" $PayloadDirectory\iosHelloWorld\llvm -Recurse - } else { - Copy-Item -path "$SourceDirectory\iosHelloWorld\nollvm" $PayloadDirectory\iosHelloWorld\nollvm -Recurse - Copy-Item -path "$SourceDirectory\MauiiOSDefaultIPA" $PayloadDirectory\MauiiOSDefaultIPA -Recurse - Copy-Item -path "$SourceDirectory\MauiMacCatalystDefault\MauiMacCatalystDefault.app" $PayloadDirectory\MauiMacCatalystDefault -Recurse - Copy-Item -path "$SourceDirectory\MauiBlazoriOSDefaultIPA" $PayloadDirectory\MauiBlazoriOSDefaultIPA -Recurse - Copy-Item -path "$SourceDirectory\MauiBlazorMacCatalystDefault\MauiBlazorMacCatalystDefault.app" $PayloadDirectory\MauiBlazorMacCatalystDefault -Recurse - Copy-Item -path "$SourceDirectory\MauiiOSPodcastIPA" $PayloadDirectory\MauiiOSPodcastIPA -Recurse + Copy-Item -path "$SourceDirectory\androidHelloWorld\HelloAndroid.apk" $PayloadDirectory -Verbose } + Copy-Item -path "$SourceDirectory\MauiAndroidDefault.apk" $PayloadDirectory -Verbose + Copy-Item -path "$SourceDirectory\MauiBlazorAndroidDefault.apk" $PayloadDirectory -Verbose + Copy-Item -path "$SourceDirectory\MauiAndroidPodcast.apk" $PayloadDirectory -Verbose $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' } diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 667b225031e..3c9776f08bf 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -351,13 +351,17 @@ fi if [[ "$iosmono" == "true" ]]; then if [[ "$iosllvmbuild" == "True" ]]; then - # LLVM Mono .app - mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvm $payload_directory/iosHelloWorld - mkdir -p $payload_directory/iosHelloWorldZip/llvmzip && cp -rv $source_directory/iosHelloWorldZip/llvmzip $payload_directory/iosHelloWorldZip + if [[ "$kind" != "ios_scenarios_net6" ]]; then + # LLVM Mono .app + mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvm $payload_directory/iosHelloWorld + mkdir -p $payload_directory/iosHelloWorldZip/llvmzip && cp -rv $source_directory/iosHelloWorldZip/llvmzip $payload_directory/iosHelloWorldZip + fi else # NoLLVM Mono .app, Maui iOS IPA, Maui Maccatalyst, Maui iOS Podcast IPA - mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvm $payload_directory/iosHelloWorld - mkdir -p $payload_directory/iosHelloWorldZip/nollvmzip && cp -rv $source_directory/iosHelloWorldZip/nollvmzip $payload_directory/iosHelloWorldZip + if [[ "$kind" != "ios_scenarios_net6" ]]; then + mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvm $payload_directory/iosHelloWorld + mkdir -p $payload_directory/iosHelloWorldZip/nollvmzip && cp -rv $source_directory/iosHelloWorldZip/nollvmzip $payload_directory/iosHelloWorldZip + fi mkdir -p $payload_directory/MauiMacCatalystDefault && cp -rv $source_directory/MauiMacCatalystDefault/MauiMacCatalystDefault.app $payload_directory/MauiMacCatalystDefault mkdir -p $payload_directory/MauiBlazorMacCatalystDefault && cp -rv $source_directory/MauiBlazorMacCatalystDefault/MauiBlazorMacCatalystDefault.app $payload_directory/MauiBlazorMacCatalystDefault cp -v $source_directory/MauiiOSDefaultIPA/MauiiOSDefault.ipa $payload_directory/MauiiOSDefault.ipa |