Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LoopedBard3 merged 5 commits into from
Jan 20, 2023
Merged

Add Maui Mobile Testing to the perf repo (port from release/7.0 Test) #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b97a007
Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…
LoopedBard3 Jan 3, 2023
0ef1134
Fix reporter.cs build error.
LoopedBard3 Jan 17, 2023
118fe95
Moved stopAppCmd so it is available even if there is an error beforeh…
LoopedBard3 Jan 18, 2023
8167f16
Fixed nitpicks including using proper function naming conventions, mi…
LoopedBard3 Jan 18, 2023
68a5509
Added in missing requests import and removed it from places it is no …
LoopedBard3 Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
channels:
- main

# Maui Android scenario benchmarks
- template: /eng/performance/build_machine_matrix.yml
parameters:
jobTemplate: /eng/performance/scenarios.yml
buildMachines:
- win-x64-android-arm64
isPublic: false
jobParameters:
kind: maui_scenarios_android
projectFile: maui_scenarios_android.proj
dotnetVersionsLinks:
main: https://aka.ms/dotnet/sdk/maui/net8.0.json

## Maui scenario benchmarks
#- template: /eng/performance/build_machine_matrix.yml
# parameters:
Expand Down
14 changes: 13 additions & 1 deletion eng/performance/build_machine_matrix.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
vmImage: windows-2019
machinePool: Tiger
queue: Windows.10.Arm64.Perf.Surf
${{ insert }}: ${{ parameters.jobParameters }}
${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
- template: ${{ parameters.jobTemplate }}
parameters:
osName: windows
architecture: x64
osVersion: 19H1
pool:
vmImage: 'windows-2022'
queue: Windows.10.Amd64.Pixel.Perf
machinePool: Pixel
${{ insert }}: ${{ parameters.jobParameters }}
82 changes: 82 additions & 0 deletions eng/performance/maui_scenarios_android.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

<Import Project="Scenarios.Common.props" />

<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>
<AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
<PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
<PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
<PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
</PropertyGroup>

<Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
<Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
<RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
</Target>

<ItemDefinitionGroup>
<HelixWorkItem>
<Timeout>00:30</Timeout>
</HelixWorkItem>
</ItemDefinitionGroup>

<ItemGroup>
<MAUIAndroidScenario Include="Maui Android Default">
<ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
<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>
<ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
<PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
</MAUIAndroidScenario>
</ItemGroup>


<ItemGroup>
<PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
<Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
</PreparePayloadWorkItem>
</ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
<ItemGroup>
<HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
<PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
</HelixWorkItem>
<HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
<PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
</HelixWorkItem>
<HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
<PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
</HelixWorkItem>
<HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
<PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
</HelixWorkItem>
</ItemGroup>


<Import Project="PreparePayloadWorkItems.targets" />

</Project>
38 changes: 30 additions & 8 deletions eng/performance/scenarios.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
pool: '' # required -- name of the Helix pool
queue: '' # required -- name of the Helix queue
container: '' # optional -- id of the container
channels: [] # required -- list of channels to download .NET from
channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
container: ${{ parameters.container }}
strategy:
matrix:
${{ each channel in parameters.channels }}:
${{ channel }}:
_Channel: ${{ channel }}
_Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
_BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
${{ if ne(length(parameters.channels), 0) }}:
${{ each channel in parameters.channels }}:
${{ channel }}:
_Channel: ${{ channel }}
_Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
_BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
${{ each versionPair in parameters.dotnetVersionsLinks }}:
${{ versionPair.key }}_Link:
_Channel: ${{ versionPair.key }}
_DotnetVersionLink: ${{ versionPair.value }}
_Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
_BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
steps:
- checkout: self
clean: true
- script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
displayName: Run ci_setup.py
- ${{ if ne(length(parameters.channels), 0) }}:
- script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
displayName: Run ci_setup.py
- ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
- powershell: |
$data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
$values = ConvertFrom-Json $data.content
$dotnet_version_check = $values.dotnet_version
$version_check = $values.version
$dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
Write-Host "Found dotnet version $dotnet_version"
displayName: Get dotnetVersion to use
- script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
displayName: Run ci_setup.py with dotnetVersionsLinks
- ${{ if eq(parameters.osName, 'windows') }}:
- script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
displayName: Copy python libraries and NuGet.config
Expand Down
20 changes: 12 additions & 8 deletions scripts/dotnet.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
if not commit_sha:
raise ValueError('.NET Commit sha was not defined.')

# Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
url = None
urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
if repository is None:
# The origin of the repo where the commit belongs to has changed
# between release. Here we attempt to naively guess the repo.
core_sdk_frameworks = ChannelMap.get_supported_frameworks()
repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
url = urlformat % ('dotnet', repo, commit_sha)
url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.
else:
owner, repo = get_repository(repository)
url = urlformat % (owner, repo, commit_sha)
url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

build_timestamp = None
sleep_time = 10 # Start with 10 second sleep timer
sleep_time = 10 # Start with 10 second sleep timer
for retrycount in range(5):
try:
with urlopen(url) as response:
getLogger().info("Commit: %s", url)
item = loads(response.read().decode('utf-8'))
build_timestamp = item['commit']['committer']['date']
break
patch = response.read().decode('utf-8')
dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
if dateMatch:
build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
break
except URLError as error:
getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
sleep(sleep_time)
Expand Down
69 changes: 29 additions & 40 deletions src/scenarios/mauiandroid/pre.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
'--apk-name',
dest='apk',
required=True,
type=str,
help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
getLogger().error('Cannot find %s' % (apkname))
exit(-1)
if args.unzip:
if not os.path.exists(apknamezip):
copyfile(apkname, apknamezip)

with ZipFile(apknamezip) as zip:
zip.extractall(os.path.join('.', PUBDIR))

assets_dir = os.path.join(PUBDIR, 'assets')
assets_zip = os.path.join(assets_dir, 'assets.zip')
with ZipFile(assets_zip) as zip:
zip.extractall(assets_dir)

os.remove(assets_zip)
else:
copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
output_dir=const.APPDIR,
bin_dir=const.BINDIR,
exename=EXENAME,
working_directory=sys.path[0],
no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")
8 changes: 6 additions & 2 deletions src/scenarios/mauiandroid/test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__":
versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

traits = TestTraits(exename=EXENAME,
guiapp='false',
)
Expand Down
9 changes: 9 additions & 0 deletions src/scenarios/mauiandroidpodcast/post.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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()
35 changes: 35 additions & 0 deletions src/scenarios/mauiandroidpodcast/pre.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")
16 changes: 16 additions & 0 deletions src/scenarios/mauiandroidpodcast/test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

traits = TestTraits(exename=EXENAME,
guiapp='false',
)
Runner(traits).run()
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)#2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

LoopedBard3
merged 5 commits into

from

Jan 20, 2023
 Merged


Add Maui Mobile Testing to the perf repo (port from release/7.0 Test)
#2813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
b97a007

Add Maui Mobile Testing to the perf repo (port from release/7.0 testi…


LoopedBard3 Jan 3, 2023
0ef1134

Fix reporter.cs build error.


LoopedBard3 Jan 17, 2023
118fe95

Moved stopAppCmd so it is available even if there is an error beforeh…


LoopedBard3 Jan 18, 2023
8167f16

Fixed nitpicks including using proper function naming conventions, mi…


LoopedBard3 Jan 18, 2023
68a5509

Added in missing requests import and removed it from places it is no …


LoopedBard3 Jan 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


13 changes: 13 additions & 0 deletions
azure-pipelines.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,6 +273,19 @@ jobs:
 channels:
 - main

 # Maui Android scenario benchmarks
 - template: /eng/performance/build_machine_matrix.yml
 parameters:
 jobTemplate: /eng/performance/scenarios.yml
 buildMachines:
 - win-x64-android-arm64
 isPublic: false
 jobParameters:
 kind: maui_scenarios_android
 projectFile: maui_scenarios_android.proj
 dotnetVersionsLinks:
 main: https://aka.ms/dotnet/sdk/maui/net8.0.json

 ## Maui scenario benchmarks
 #- template: /eng/performance/build_machine_matrix.yml
 # parameters:
Expand Down

14 changes: 13 additions & 1 deletion
eng/performance/build_machine_matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,4 +91,16 @@ jobs:
 vmImage: windows-2019
 machinePool: Tiger
 queue: Windows.10.Arm64.Perf.Surf
 ${{ insert }}: ${{ parameters.jobParameters }}
 ${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-x64-android-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 Pixel only used in private builds currently
 - template: ${{ parameters.jobTemplate }}
 parameters:
 osName: windows
 architecture: x64
 osVersion: 19H1
 pool:
 vmImage: 'windows-2022'
 queue: Windows.10.Amd64.Pixel.Perf
 machinePool: Pixel
 ${{ insert }}: ${{ parameters.jobParameters }}

82 changes: 82 additions & 0 deletions
eng/performance/maui_scenarios_android.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

 <Import Project="Scenarios.Common.props" />

 <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>
 <AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
 <PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
 <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 </PropertyGroup>

 <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
 <Message Text="Removing Dotnet Packs from Correlation Staging" Importance="high" />
 <RemoveDir Directories="$(CorrelationPayloadDirectory)dotnet\packs" />
 </Target>

 <ItemDefinitionGroup>
 <HelixWorkItem>
 <Timeout>00:30</Timeout>
 </HelixWorkItem>
 </ItemDefinitionGroup>

 <ItemGroup>
 <MAUIAndroidScenario Include="Maui Android Default">
 <ScenarioDirectoryName>mauiandroid</ScenarioDirectoryName>
 <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
 <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>
 <ApkName>com.companyname.mauiblazorandroiddefault-Signed</ApkName>
 <PackageName>com.companyname.mauiblazorandroiddefault</PackageName>
 </MAUIAndroidScenario>
 </ItemGroup>


 <ItemGroup>
 <PreparePayloadWorkItem Include="@(MAUIAndroidScenario)">
 <Command>$(Python) pre.py publish -f $(PERFLAB_Framework)-android -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName) -r android-arm64 --self-contained</Command>
 <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
 </PreparePayloadWorkItem>
 </ItemGroup>


<!-- We only run the android tests from Windows machines (at least for now) -->
 <ItemGroup>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) APK Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'SOD - %(Identity) Extracted Size')">
 <PreCommands>echo on; xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /Y; ren %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).apk %(HelixWorkItem.ApkName).zip; powershell.exe -nologo -noprofile -command "&amp; {Expand-Archive %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip -DestinationPath %HELIX_WORKITEM_ROOT%\pub\}"; del %HELIX_WORKITEM_ROOT%\pub\%(HelixWorkItem.ApkName).zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity)')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 <HelixWorkItem Include="@(MAUIAndroidScenario -> 'Device Startup - %(Identity) NoAnimation')">
 <PreCommands>echo on; set XHARNESSPATH=$(XharnessPath); xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName) %HELIX_WORKITEM_ROOT%\pub\ /E /I /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>
 </HelixWorkItem>
 </ItemGroup>


 <Import Project="PreparePayloadWorkItems.targets" />

</Project>

38 changes: 30 additions & 8 deletions
eng/performance/scenarios.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ parameters:
 pool: '' # required -- name of the Helix pool
 queue: '' # required -- name of the Helix queue
 container: '' # optional -- id of the container
 channels: [] # required -- list of channels to download .NET from
 channels: [] # optional (must have dotnetVersionsLinks if not used) -- list of channels to download .NET from
 dotnetVersionsLinks: [] # optional alternative to channels that uses 'channel: link' values to scrape the link's json for dotnet_version or version
 projectFile: '' # required -- project file to build (current choices: scenarios.proj/sdk_scenarios.proj )
 machinePool: '' # required -- Name of perf machine pool (Tiger, Owl, etc)

Expand DownExpand Up@@ -81,16 +82,37 @@ jobs:
 container: ${{ parameters.container }}
 strategy:
 matrix:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.channels), 0) }}:
 ${{ each channel in parameters.channels }}:
 ${{ channel }}:
 _Channel: ${{ channel }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 ${{ if ne(length(parameters.dotnetVersionsLinks), 0) }}:
 ${{ each versionPair in parameters.dotnetVersionsLinks }}:
 ${{ versionPair.key }}_Link:
 _Channel: ${{ versionPair.key }}
 _DotnetVersionLink: ${{ versionPair.value }}
 _Configs: CompilationMode=Tiered RunKind="${{ parameters.kind }}"
 _BuildConfig: ${{ parameters.architecture }}_$(_Channel)_Linked_${{ parameters.kind }} # needs to be unique to avoid logs overwriting in mc.dot.net
 steps:
 - checkout: self
 clean: true
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ if ne(length(parameters.channels), 0) }}:
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py
 - ${{ elseif ne(length(parameters.dotnetVersionsLinks), 0) }}:
 - powershell: |
 $data = Invoke-WebRequest -Uri "$(_DotnetVersionLink)"
 $values = ConvertFrom-Json $data.content
 $dotnet_version_check = $values.dotnet_version
 $version_check = $values.version
 $dotnet_version = if ($dotnet_version_check) {$dotnet_version_check} Else {$version_check}
 Write-Host "##vso[task.setvariable variable=DotnetVersion;]$dotnet_version"
 Write-Host "Found dotnet version $dotnet_version"
 displayName: Get dotnetVersion to use
 - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet
 displayName: Run ci_setup.py with dotnetVersionsLinks
 - ${{ if eq(parameters.osName, 'windows') }}:
 - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
 displayName: Copy python libraries and NuGet.config
Expand Down

20 changes: 12 additions & 8 deletions
scripts/dotnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,14 @@
"""

import ssl
import datetime
from argparse import Action, ArgumentParser, ArgumentTypeError, ArgumentError
from collections import namedtuple
from glob import iglob
from json import loads
from logging import getLogger
from os import chmod, environ, listdir, makedirs, path, pathsep, system
from re import search
from re import search, match, MULTILINE
from shutil import rmtree
from stat import S_IRWXU
from subprocess import CalledProcessError, check_output
Expand DownExpand Up@@ -619,27 +620,30 @@ def get_commit_date(
 if not commit_sha:
 raise ValueError('.NET Commit sha was not defined.')

 # Example URL: https://github.com/dotnet/runtime/commit/2d76178d5faa97be86fc8d049c7dbcbdf66dc497.patch
 url = None
 urlformat = 'https://api.github.com/repos/%s/%s/commits/%s'
 if repository is None:
 # The origin of the repo where the commit belongs to has changed
 # between release. Here we attempt to naively guess the repo.
 core_sdk_frameworks = ChannelMap.get_supported_frameworks()
 repo = 'core-sdk' if framework in core_sdk_frameworks else 'cli'
 url = urlformat % ('dotnet', repo, commit_sha)
 url = f'https://github.com/dotnet/{repo}/commit/{commit_sha}.patch'
Comment thread
LoopedBard3 marked this conversation as resolved.

 else:
 owner, repo = get_repository(repository)
 url = urlformat % (owner, repo, commit_sha)
 url = f'https://github.com/{owner}/{repo}/commit/{commit_sha}.patch'

 build_timestamp = None
 sleep_time = 10 # Start with 10 second sleep timer
 sleep_time = 10 # Start with 10 second sleep timer
 for retrycount in range(5):
 try:
 with urlopen(url) as response:
 getLogger().info("Commit: %s", url)
 item = loads(response.read().decode('utf-8'))
 build_timestamp = item['commit']['committer']['date']
 break
 patch = response.read().decode('utf-8')
 dateMatch = search(r'^Date: (.+)$', patch, MULTILINE)
 if dateMatch:
 build_timestamp = datetime.datetime.strptime(dateMatch.group(1), '%a, %d %b %Y %H:%M:%S %z').astimezone(datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 getLogger().info(f"Got UTC timestamp {build_timestamp} from {dateMatch.group(1)}")
 break
 except URLError as error:
 getLogger().warning(f"URL Error trying to get commit date from {url}; Reason: {error.reason}; Attempt {retrycount}")
 sleep(sleep_time)
Expand Down

69 changes: 29 additions & 40 deletions
src/scenarios/mauiandroid/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,48 +2,37 @@
pre-command
'''
import sys
import os
from zipfile import ZipFile
from performance.logger import setup_loggers, getLogger
from shutil import copyfile
from shared import const
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.precommands import PreCommands
from shared.const import PUBDIR
from argparse import ArgumentParser
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from test import EXENAME

setup_loggers(True)

parser = ArgumentParser()
parser.add_argument('--unzip', help='Unzip APK and report extracted tree', action='store_true', default=False)
parser.add_argument(
 '--apk-name',
 dest='apk',
 required=True,
 type=str,
 help='Name of the APK to setup')
args = parser.parse_args()

if not os.path.exists(PUBDIR):
 os.mkdir(PUBDIR)
apkname = args.apk
apknamezip = '%s.zip' % (apkname)
if not os.path.exists(apkname):
 getLogger().error('Cannot find %s' % (apkname))
 exit(-1)
if args.unzip:
 if not os.path.exists(apknamezip):
 copyfile(apkname, apknamezip)

 with ZipFile(apknamezip) as zip:
 zip.extractall(os.path.join('.', PUBDIR))

 assets_dir = os.path.join(PUBDIR, 'assets')
 assets_zip = os.path.join(assets_dir, 'assets.zip')
 with ZipFile(assets_zip) as zip:
 zip.extractall(assets_dir)

 os.remove(assets_zip)
else:
 copyfile(apkname, os.path.join(PUBDIR, apkname))



precommands = PreCommands()
install_versioned_maui(precommands)

# Setup the Maui folder
precommands.new(template='maui',
 output_dir=const.APPDIR,
 bin_dir=const.BINDIR,
 exename=EXENAME,
 working_directory=sys.path[0],
 no_restore=False)

# Build the APK
precommands.execute(['--no-restore', '--source', 'MauiNuGet.config'])

# Remove the aab files as we don't need them, this saves space
output_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

8 changes: 6 additions & 2 deletions
src/scenarios/mauiandroid/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
'''
C# Console app
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidDefault'

if __name__ == "__main__":
if __name__ == "__main__": 
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
Expand Down

9 changes: 9 additions & 0 deletions
src/scenarios/mauiandroidpodcast/post.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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()

35 changes: 35 additions & 0 deletions
src/scenarios/mauiandroidpodcast/pre.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
'''
pre-command
'''
import subprocess
from performance.logger import setup_loggers, getLogger
from shared.precommands import PreCommands
from shared.mauisharedpython import remove_aab_files, install_versioned_maui
from shared.versionmanager import versions_write_json, get_version_from_dll_powershell
from shared import const

setup_loggers(True)
precommands = PreCommands()
install_versioned_maui(precommands)

branch = f'{precommands.framework[:6]}'
subprocess.run(['git', 'clone', 'https://github.com/microsoft/dotnet-podcasts.git', '-b', branch, '--single-branch', '--depth', '1'])
subprocess.run(['powershell', '-Command', r'Remove-Item -Path .\\dotnet-podcasts\\.git -Recurse -Force']) # Git files have permission issues, do their deletion separately

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_dir = const.PUBDIR
if precommands.output:
 output_dir = precommands.output
remove_aab_files(output_dir)

# Copy the MauiVersion to a file so we have it on the machine
maui_version = get_version_from_dll_powershell(rf".\{const.APPDIR}\obj\Release\{precommands.framework}\{precommands.runtime_identifier}\linked\Microsoft.Maui.dll")
version_dict = { "mauiVersion": maui_version }
versions_write_json(version_dict, rf"{output_dir}\versions.json")
print(f"Versions: {version_dict}")

16 changes: 16 additions & 0 deletions
src/scenarios/mauiandroidpodcast/test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
'''
Mobile Maui App
'''
from shared.const import PUBDIR
from shared.runner import TestTraits, Runner
from shared.versionmanager import versions_read_json_file_save_env

EXENAME = 'MauiAndroidPodcast'

if __name__ == "__main__":
 versions_read_json_file_save_env(rf".\{PUBDIR}\versions.json")

 traits = TestTraits(exename=EXENAME, 
 guiapp='false',
 )
 Runner(traits).run()
Loading