part deux

PowerToys.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32014.148
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11222.15 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner.vcxproj", "{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -838,6 +838,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Remote
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests.csproj", "{DB34808A-FF91-D06E-A426-AFB5A8BD583B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deux", "Deux", "{023C058E-537A-4AB6-900A-36437EC17410}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{4F881A97-423A-4905-B219-677AD0184059}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CommandPalette.UI", "src\modules\Deux\UI\Microsoft.CommandPalette.UI\Microsoft.CommandPalette.UI.csproj", "{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -3056,6 +3062,18 @@ Global
 		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|ARM64.Build.0 = Release|ARM64
 		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|x64.ActiveCfg = Release|x64
 		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|x64.Build.0 = Release|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|x64.ActiveCfg = Debug|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|x64.Build.0 = Debug|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Debug|x64.Deploy.0 = Debug|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|ARM64.Build.0 = Release|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|ARM64.Deploy.0 = Release|ARM64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|x64.ActiveCfg = Release|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|x64.Build.0 = Release|x64
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB}.Release|x64.Deploy.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3389,6 +3407,9 @@ Global
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{2B3FB837-23DE-629F-82C6-42304E7083C9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{DB34808A-FF91-D06E-A426-AFB5A8BD583B} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{023C058E-537A-4AB6-900A-36437EC17410} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{4F881A97-423A-4905-B219-677AD0184059} = {023C058E-537A-4AB6-900A-36437EC17410}
+		{9EBE6DE4-58CD-CA14-7A21-B1E9DED261DB} = {4F881A97-423A-4905-B219-677AD0184059}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

src/modules/Deux/UI/Microsoft.CommandPalette.UI/App.xaml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application
+    x:Class="Microsoft.CommandPalette.UI.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.CommandPalette.UI">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

src/modules/Deux/UI/Microsoft.CommandPalette.UI/App.xaml.cs

@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.UI.Helpers;
+using Microsoft.CommandPalette.UI.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.CommandPalette.UI;
+
+/// <summary>
+/// Provides application-specific behavior to supplement the default Application class.
+/// </summary>
+public partial class App : Application
+{
+    private readonly ILogger logger;
+    private readonly GlobalErrorHandler _globalErrorHandler;
+
+    /// <summary>
+    /// Gets the current <see cref="App"/> instance in use.
+    /// </summary>
+    public static new App Current => (App)Application.Current;
+
+    public Window? AppWindow { get; private set; }
+
+    public ETWTrace EtwTrace { get; private set; } = new ETWTrace();
+
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/> instance to resolve application services.
+    /// </summary>
+    public IServiceProvider Services { get; }
+
+    public App(ILogger logger)
+    {
+        this.logger = logger;
+        _globalErrorHandler = new((CmdPalLogger)logger);
+
+#if !CMDPAL_DISABLE_GLOBAL_ERROR_HANDLER
+        _globalErrorHandler.Register(this);
+#endif
+
+        Services = ConfigureServices();
+
+        this.InitializeComponent();
+
+        // Ensure types used in XAML are preserved for AOT compilation
+        TypePreservation.PreserveTypes();
+
+        NativeEventWaiter.WaitForEventLoop(
+            "Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd", () =>
+            {
+                EtwTrace?.Dispose();
+                AppWindow?.Close();
+                Environment.Exit(0);
+            });
+    }
+
+    private IServiceProvider ConfigureServices()
+    {
+        var services = new ServiceCollection();
+
+        // Register root services
+        services.AddSingleton(logger);
+        services.AddSingleton(TaskScheduler.FromCurrentSynchronizationContext());
+
+        // Register services
+        return services.BuildServiceProvider();
+    }
+
+    /// <summary>
+    /// Invoked when the application is launched.
+    /// </summary>
+    /// <param name="args">Details about the launch request and process.</param>
+    protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+    {
+        AppWindow = new MainWindow(logger);
+        AppWindow.Activate();
+    }
+}

src/modules/Deux/UI/Microsoft.CommandPalette.UI/Assets/Dev/icon.svg

@@ -0,0 +1,31 @@
+<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4303_1230)">
+<g clip-path="url(#clip1_4303_1230)">
+<path d="M68.6048 46.5117C69.1572 47.4784 69.1288 48.6715 68.5311 49.6108L47.5311 82.6108C47.1611 83.1921 46.6024 83.6283 45.9488 83.8462L9.94876 95.8462C8.84743 96.2133 7.63315 95.9121 6.83113 95.0728C6.0291 94.2334 5.7833 93.0067 6.20004 91.9232L18.4781 60.0001L42.7686 49.9034L67.059 43.8066L68.6048 46.5117Z" fill="url(#paint0_linear_4303_1230)"/>
+<path d="M56.8013 0.488769C57.5681 0.989947 58.0639 1.81404 58.1475 2.72632L60.9281 33.0774L67.059 43.8065L18.4781 60H3.00002C2.01162 60 1.08665 59.5132 0.527081 58.6984C-0.0324852 57.8837 -0.154834 56.8456 0.199979 55.9231L16.3538 13.9231C16.6756 13.0863 17.3548 12.4374 18.2053 12.1539L54.2115 0.153915C55.0806 -0.135737 56.0344 -0.0124095 56.8013 0.488769Z" fill="url(#paint1_linear_4303_1230)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.3538 1.92306C52.7994 0.764487 53.9125 0 55.1539 0H75C75.9884 0 76.9134 0.486845 77.4729 1.30159C78.0325 2.11634 78.1549 3.15442 77.8001 4.07694L67.0604 32H93C94.225 32 95.327 32.7448 95.7837 33.8815C96.2404 35.0182 95.9602 36.3184 95.0757 37.166L47.0757 83.166C46.0614 84.138 44.5084 84.276 43.3386 83.4979C42.1688 82.7199 41.6957 81.2343 42.2 79.9231L54.4781 48H39C38.0116 48 37.0866 47.5132 36.5271 46.6984C35.9675 45.8837 35.8452 44.8456 36.2 43.9231L52.3538 1.92306Z" fill="url(#paint2_radial_4303_1230)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_4303_1230" x1="29.3743" y1="43.8066" x2="44.9485" y2="96.2016" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A41DC"/>
+<stop offset="0.75" stop-color="#A931D8"/>
+<stop offset="0.841927" stop-color="#7A41DC"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4303_1230" x1="24.8802" y1="3.90205e-07" x2="43.9581" y2="59.4288" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A41DC"/>
+<stop offset="0.75" stop-color="#A931D8"/>
+<stop offset="0.841927" stop-color="#7A41DC"/>
+</linearGradient>
+<radialGradient id="paint2_radial_4303_1230" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0001) rotate(79.3315) scale(69.4504 51.0523)">
+<stop stop-color="#FAB500"/>
+<stop offset="1" stop-color="#FE8401"/>
+</radialGradient>
+<clipPath id="clip0_4303_1230">
+<rect width="96" height="96" fill="white"/>
+</clipPath>
+<clipPath id="clip1_4303_1230">
+<rect width="96" height="96" fill="white"/>
+</clipPath>
+</defs>
+</svg>