Add Maui Blazor Desktop

eng/performance/scenarios.proj

@@ -76,6 +76,7 @@
     </HelixWorkItem>
   </ItemGroup>
 
+  <!-- SOD & Device Startup for Windows Desktop MAUI -->
   <ItemGroup>
     <HelixWorkItem Include="SOD - Desktop Maui Unpackaged" Condition="'$(TargetsWindows)' == 'true'">
       <PayloadDirectory>$(ScenariosDir)mauidesktop</PayloadDirectory>
@@ -89,6 +90,20 @@
     </HelixWorkItem>
   </ItemGroup>
 
+  <!-- SOD & Device Startup for Windows Desktop MAUI Blazor -->
+  <ItemGroup>
+    <HelixWorkItem Include="SOD - Desktop Maui Blazor Unpackaged" Condition="'$(TargetsWindows)' == 'true'">
+      <PayloadDirectory>$(ScenariosDir)mauiblazordesktop</PayloadDirectory>
+      <PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
+      <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Device Startup - Desktop Maui Blazor Default" Condition="'$(TargetsWindows)' == 'true'">
+      <PayloadDirectory>$(ScenariosDir)mauiblazordesktop</PayloadDirectory>
+      <PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
+      <Command>$(Python) test.py startup --scenario-name &quot;%(Identity)&quot;</Command>
+    </HelixWorkItem>
+  </ItemGroup>
+
   <!--
     This is useful for local testing to print the produced helix items
     To use this when you are changing how items are produced, uncomment the target

scripts/channel_map.py

@@ -4,14 +4,16 @@ class ChannelMap():
     channel_map = {
         'release/6.0': {
             'tfm': 'net6.0',
-            'branch': 'release/6.0',
+            'branch': '6.0.4xx',
+            'quality': 'daily'
         },'6.0': {
             'tfm': 'net6.0',
-            'branch': 'release/6.0',
+            'branch': '6.0.4xx',
+            'quality': 'daily'
         },
         'main': {
             'tfm': 'net6.0',
-            'branch': 'main',
+            'branch': '6.0',
             'quality': 'daily'
         },
         'master': {

scripts/dotnet.py

@@ -773,7 +773,7 @@ def install(
     # run, we will be testing the "wrong" version, ie, not the version we specified.
     if (not versions) and channels:
         for channel in channels:
-            cmdline_args = common_cmdline_args + ['-Channel', channel if channel != "release/6.0" else "6.0"]
+            cmdline_args = common_cmdline_args + ['-Channel', channel if channel != "release/6.0" else "6.0.4xx"]
             if ChannelMap.get_quality_from_channel(channel) is not None:
                 cmdline_args += ['-Quality', ChannelMap.get_quality_from_channel(channel)]
             RunCommand(cmdline_args, verbose=verbose, retry=1).run(

src/scenarios/mauiblazordesktop/post.py

@@ -0,0 +1,9 @@
+'''
+post cleanup script
+'''
+
+from shared.postcommands import PostCommands, clean_directories
+
+postcommands = PostCommands()
+clean_directories()
+postcommands.uninstall_workload('maui')

src/scenarios/mauiblazordesktop/pre.py

@@ -0,0 +1,86 @@
+'''
+pre-command: Example call 'python .\pre.py publish -f net6.0-windows10.0.19041.0 -c Release'
+'''
+import shutil
+import subprocess
+import sys
+import os
+from performance.logger import setup_loggers, getLogger
+from shared.codefixes import insert_after
+from shared.precommands import PreCommands
+from shared import const
+from test import EXENAME
+import requests
+import winreg
+
+setup_loggers(True)
+NugetURL = 'https://raw.githubusercontent.com/dotnet/maui/main/NuGet.config'
+WebViewURL = 'https://go.microsoft.com/fwlink/p/?LinkId=2124703' # Obtained from https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section
+WebViewInstalled = False
+NugetFile = requests.get(NugetURL)
+open('./Nuget.config', 'wb').write(NugetFile.content)
+
+lmkey = r"SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"
+cukey = r"Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"
+with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as hklm_hive:
+    try:
+        with winreg.OpenKey(hklm_hive, lmkey) as openkey:
+            pvvalue = winreg.QueryValueEx(openkey, 'pv')[0]
+            if pvvalue and pvvalue != '' and pvvalue != '0.0.0.0':
+                WebViewInstalled = True
+                getLogger().info(f"WebView Found; pvvalue(version) {pvvalue}")
+    except:
+        getLogger().warning("WebView not verified in Local_Machine Registry")
+if not WebViewInstalled:
+    try:
+        with winreg.ConnectRegistry(None, winreg.HKEY_CURRENT_USER) as hkcu_hive:
+            with winreg.OpenKey(hkcu_hive, cukey) as openkey:
+                pvvalue = winreg.QueryValueEx(openkey, 'pv')[0]
+                if pvvalue and pvvalue != '' and pvvalue != '0.0.0.0':
+                    WebViewInstalled = True
+                    getLogger().info(f"WebView Found; pvvalue(version) {pvvalue}")
+    except:
+        getLogger().warning("WebView not verified in Current_Machine Registry")
+if not WebViewInstalled:
+    getLogger().info("Installing WebView2")
+    WebViewInstallFile = requests.get(WebViewURL)
+    open('./MicrosoftEdgeWebview2Setup.exe', 'wb').write(WebViewInstallFile.content)
+    subprocess.run(['powershell', '-Command', r'Start-Process "./MicrosoftEdgeWebview2Setup.exe" -Wait'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as hklm_hive:
+        try:
+            with winreg.OpenKey(hklm_hive, lmkey) as openkey:
+                pvvalue = winreg.QueryValueEx(openkey, 'pv')[0]
+                if pvvalue and pvvalue != '' and pvvalue != '0.0.0.0':
+                    WebViewInstalled = True
+                    getLogger().info(f"WebView Found; pvvalue(version) {pvvalue}")
+        except:
+            getLogger().warning("WebView not verified in Local_Machine Registry")
+    if not WebViewInstalled:
+        try:
+            with winreg.ConnectRegistry(None, winreg.HKEY_CURRENT_USER) as hkcu_hive:
+                with winreg.OpenKey(hkcu_hive, cukey) as openkey:
+                    pvvalue = winreg.QueryValueEx(openkey, 'pv')[0]
+                    if pvvalue and pvvalue != '' and pvvalue != '0.0.0.0':
+                        WebViewInstalled = True
+                        getLogger().info(f"WebView Found; pvvalue(version) {pvvalue}")
+        except:
+            getLogger().warning("WebView not verified in Current_Machine Registry.")
+            getLogger().error("Blazor cannot run without WebView installed, exiting execution.")
+            sys.exit(-1)
+else:
+    getLogger().info("WebViewAlreadyInstalled")
+
+
+precommands = PreCommands()
+precommands.install_workload('maui', ['--from-rollback-file', 'https://aka.ms/dotnet/maui/net6.0.json', '--configfile', './Nuget.config'])
+precommands.new(template='maui-blazor',
+                output_dir=const.APPDIR,
+                bin_dir=const.BINDIR,
+                exename=EXENAME,
+                working_directory=sys.path[0],
+                no_restore=False)
+
+subprocess.run(["dotnet", "add", "./app", "package", "Microsoft.WindowsAppSDK"]) # Add the package reference for the Microsoft.WindowsAppSDK for self-contained running
+shutil.copy2(os.path.join(const.SRCDIR, 'Replacement.Index.razor.cs'), os.path.join(const.APPDIR, 'Pages', 'Index.razor.cs'))
+precommands.add_startup_logging(os.path.join('Pages', 'Index.razor.cs'), "if (firstRender) {")
+precommands.execute(['/p:Platform=x64','/p:WindowsAppSDKSelfContained=True','/p:WindowsPackageType=None','/p:WinUISDKReferences=False','/p:PublishReadyToRun=true'])

src/scenarios/mauiblazordesktop/src/Replacement.Index.razor.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Components;
+using System.Diagnostics.Tracing;
+namespace MauiBlazorDesktopTesting.Pages
+{
+    public partial class Index
+    {
+        protected override void OnAfterRender(bool firstRender)
+        {
+            if (firstRender) {
+                 // Startup logging is added here via the setup script.
+            }
+        }
+    }
+}

src/scenarios/mauiblazordesktop/test.py

@@ -0,0 +1,26 @@
+import os
+import subprocess
+from shared.runner import TestTraits, Runner
+
+EXENAME = 'MauiBlazorDesktopTesting'
+
+def main():
+    traits = TestTraits(exename=EXENAME,
+                        guiapp='true',
+                        startupmetric='WinUIBlazor',
+                        timeout=30,
+                        measurementdelay='6',
+                        runwithoutexit='false',
+                        processwillexit="false",
+                        )
+    runner = Runner(traits)
+    runner.run()
+
+
+if __name__ == "__main__":
+    result = subprocess.run(['powershell', '-Command', r'Get-ChildItem .\pub\Microsoft.Maui.dll | Select-Object -ExpandProperty VersionInfo | Select-Object ProductVersion | Select-Object -ExpandProperty ProductVersion'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+    os.environ["MAUI_VERSION"] = result.stdout.decode('utf-8').strip()
+    print(f'Env: MAUI_VERSION: {os.environ["MAUI_VERSION"]}')
+    if("sha" not in os.environ["MAUI_VERSION"] and "azdo" not in os.environ["MAUI_VERSION"]):
+        raise ValueError(f"MAUI_VERSION does not contain sha and azdo indicating failure to retrieve or set the value. MAUI_VERSION: {os.environ['MAUI_VERSION']}")
+    main()

src/tools/ScenarioMeasurement/Startup/Startup.cs

@@ -21,7 +21,8 @@ enum MetricType
         InnerLoopMsBuild,
         DotnetWatch,
         DeviceTimeToMain,
-        WinUI
+        WinUI,
+        WinUIBlazor
     }
 
     public class InnerLoopMarkerEventSource : EventSource
@@ -277,6 +278,9 @@ static void checkArg(string arg, string name)
                 case MetricType.WinUI:
                     parser = new WinUIParser();
                     break;
+                case MetricType.WinUIBlazor:    
+                    parser = new WinUIBlazorParser();
+                    break;
             }
 
             var pids = new List<int>();

src/tools/ScenarioMeasurement/Startup/WinUIBlazorParser.cs

@@ -0,0 +1,103 @@
+using Microsoft.Diagnostics.Tracing;
+using Reporting;
+using System;
+using System.Collections.Generic;
+
+namespace ScenarioMeasurement
+{
+    public class WinUIBlazorParser : IParser
+    {
+        const String WinUIProvider = "Microsoft-Windows-XAML";
+        const String PerfProvider = "PerfLabGenericEventSource";
+
+        public void EnableKernelProvider(ITraceSession kernel)
+        {
+            kernel.EnableKernelProvider(TraceSessionManager.KernelKeyword.Process, TraceSessionManager.KernelKeyword.Thread, TraceSessionManager.KernelKeyword.ContextSwitch);
+        }
+
+        public void EnableUserProviders(ITraceSession user)
+        {
+            user.EnableUserProvider(WinUIProvider, TraceEventLevel.Verbose);
+            user.EnableUserProvider(PerfProvider, TraceEventLevel.Verbose);
+        }
+
+        public IEnumerable<Counter> Parse(string mergeTraceFile, string processName, IList<int> pids, string commandLine)
+        {
+            var baseStartup = new List<double>();
+            var delayedStartup = new List<double>();
+            var threadTimes = new List<double>();
+            double threadTime = 0;
+            var ins = new Dictionary<int, double>();
+            double start = -1;
+            int? pid = null;
+            bool frameStopCaught = false;
+            using (var source = new ETWTraceEventSource(mergeTraceFile))
+            {
+                source.Kernel.ProcessStart += evt =>
+                {
+                    if (processName.Equals(evt.ProcessName, StringComparison.OrdinalIgnoreCase) && pids.Contains(evt.ProcessID) && evt.CommandLine.Trim() == commandLine.Trim())
+                    {
+                        if (pid.HasValue)
+                        {
+                            // Processes might be reentrant. For now this traces the first (outermost) process of a given name.
+                            return;
+                        }
+                        pid = evt.ProcessID;
+                        start = evt.TimeStampRelativeMSec;
+                    }
+                };
+
+                source.Kernel.ThreadCSwitch += evt =>
+                {
+                    if (!pid.HasValue) // we're currently in a measurement interval
+                        return;
+
+                    if (evt.NewProcessID != pid && evt.OldProcessID != pid)
+                        return; // but this isn't our process
+
+                    if (evt.OldProcessID == pid) // this is a switch out from our process
+                    {
+                        if (ins.TryGetValue(evt.OldThreadID, out var value)) // had we ever recorded a switch in for this thread? 
+                        {
+                            threadTime += evt.TimeStampRelativeMSec - value;
+                            ins.Remove(evt.OldThreadID);
+                        }
+                    }
+                    else // this is a switch in to our process
+                    {
+                        ins[evt.NewThreadID] = evt.TimeStampRelativeMSec;
+                    }
+                };
+
+                source.Dynamic.AddCallbackForProviderEvent(WinUIProvider, "Frame/Stop", evt =>
+                {
+                    if (!frameStopCaught && pid.HasValue && evt.ProcessID == pid && evt.ProcessName.Equals(processName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        baseStartup.Add(evt.TimeStampRelativeMSec - start);
+                        frameStopCaught = true;
+                    }
+                });
+
+                source.Dynamic.AddCallbackForProviderEvent(PerfProvider, "Startup", evt =>
+                {
+                    if (pid.HasValue && evt.ProcessID == pid && evt.ProcessName.Equals(processName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        delayedStartup.Add(evt.TimeStampRelativeMSec - start);
+                        threadTimes.Add(threadTime);
+                        pid = null;
+                        threadTime = 0;
+                        start = 0;
+                        frameStopCaught = false;
+                    }
+                });
+
+                source.Process();
+            }
+            return new[] {
+                new Counter() { Name = "WinUI Inner Blazor Startup", MetricName = "ms", DefaultCounter=true, TopCounter=true, Results = delayedStartup.ToArray() },
+                new Counter() { Name = "WinUI Startup", MetricName = "ms", DefaultCounter=false, TopCounter=true, Results = baseStartup.ToArray() },
+                new Counter() { Name = "Time on Thread", MetricName = "ms", TopCounter=true, Results = threadTimes.ToArray() }
+            };
+        }
+    }
+}