Added android podcast app testing and added XHARNESSPATH to the preco…

…mmands.

eng/performance/maui_scenarios_android.proj

@@ -27,6 +27,12 @@
       <ApkName>com.companyname.mauiandroiddefault-Signed</ApkName>
       <PackageName>com.companyname.mauiandroiddefault</PackageName>
     </MAUIAndroidScenario>
+    <MAUIAndroidScenario Include="Maui Android Podcast">
+      <ScenarioDirectoryName>mauiandroidpodcast</ScenarioDirectoryName>
+      <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
+      <ApkName>com.Microsoft.NetConf2021.Maui-Signed</ApkName>
+      <PackageName>com.Microsoft.NetConf2021.Maui</PackageName>
+    </MAUIAndroidScenario>
     <MAUIAndroidScenario Include="Maui Blazor Android Default">
       <ScenarioDirectoryName>mauiblazorandroid</ScenarioDirectoryName>
       <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
@@ -46,22 +52,22 @@
 <!-- We only run the android tests from Windows machines (at least for now) -->
   <ItemGroup>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
-      <PreCommands>xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
+      <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
       <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
       <Timeout>00:30</Timeout>
     </HelixWorkItem>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
-      <PreCommands>xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y; Rename-Item %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\; Remove-Item %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
+      <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y; Rename-Item %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\; Remove-Item %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
       <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
       <Timeout>00:30</Timeout>
     </HelixWorkItem>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
-      <PreCommands>xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
+      <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
       <Command>$(Python) test.py devicestartup --device-type android --package-path pub\%(HelixWorkItem.ApkName).apk --package-name %(HelixWorkItem.PackageName) --scenario-name &quot;%(Identity)&quot;</Command>
       <Timeout>00:30</Timeout>
     </HelixWorkItem>
     <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
-      <PreCommands>xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
+      <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)\%(HelixWorkItem.ApkName).apk %HELIX_WORKITEM_ROOT%\pub\ /Y</PreCommands>
       <Command>$(Python) test.py devicestartup --device-type android --package-path pub\%(HelixWorkItem.ApkName).apk --package-name %(HelixWorkItem.PackageName) --scenario-name &quot;%(Identity)&quot; --disable-animations</Command>
       <Timeout>00:30</Timeout>
     </HelixWorkItem>

src/scenarios/mauiandroid/pre.py

@@ -48,3 +48,5 @@
 
 os.remove(f"{output_file_partial_path}-Signed.aab")
 os.remove(f"{output_file_partial_path}.aab")
+
+# Copy the MauiVersion to a file so we have it on the machine (EXTRA_VERSIONS?)

src/scenarios/mauiandroidpodcast/post.py

@@ -0,0 +1,9 @@
+'''
+post cleanup script
+'''
+
+from shared.postcommands import clean_directories
+from performance.common import remove_directory
+
+remove_directory('dotnet-podcasts')
+clean_directories()

src/scenarios/mauiandroidpodcast/pre.py

@@ -0,0 +1,49 @@
+'''
+pre-command
+'''
+import sys
+import os
+import requests
+import subprocess
+from zipfile import ZipFile
+from performance.logger import setup_loggers, getLogger
+from shutil import copyfile
+from shared import const
+from shared.precommands import PreCommands
+from argparse import ArgumentParser
+from test import EXENAME
+
+setup_loggers(True)
+
+parser = ArgumentParser(add_help=False)
+parser.add_argument(
+        '-o', '--output',
+        dest='output_dir',
+        required=False,
+        type=str,
+        help='capture of the output directory')
+args, unknown_args = parser.parse_known_args()
+
+# Download what we need
+with open ("MauiNuGet.config", "wb") as f:
+    f.write(requests.get(f'https://raw.githubusercontent.com/dotnet/maui/net7.0/NuGet.config', allow_redirects=True).content)
+
+subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', 'net7.0', '--single-branch'])
+
+precommands = PreCommands()
+precommands.install_workload('maui', ['--from-rollback-file', f'https://aka.ms/dotnet/maui/net7.0.json', '--configfile', 'MauiNuGet.config'])
+precommands.existing(projectdir='./dotnet-podcasts',projectfile='./src/Mobile/Microsoft.NetConf2021.Maui.csproj')
+
+# Build the APK
+precommands._restore()
+precommands.execute(['--no-restore'])
+
+# Remove the aab files as we don't need them, this saves space
+output_file_partial_path = f"com.Microsoft.NetConf2021.Maui"
+if args.output_dir:
+    output_file_partial_path = os.path.join(args.output_dir, output_file_partial_path)
+
+os.remove(f"{output_file_partial_path}-Signed.aab")
+os.remove(f"{output_file_partial_path}.aab")
+
+# Copy the MauiVersion to a file so we have it on the machine (EXTRA_VERSIONS?)

src/scenarios/mauiandroidpodcast/test.py

@@ -0,0 +1,12 @@
+'''
+C# Console app
+'''
+from shared.runner import TestTraits, Runner
+
+EXENAME = 'MauiAndroidPodcast'
+
+if __name__ == "__main__":
+    traits = TestTraits(exename=EXENAME, 
+                        guiapp='false',
+                        )
+    Runner(traits).run()