don't need export pfx functionality

.github/actions/spell-check/expect.txt

@@ -315,7 +315,6 @@ debugbreak
 declatory
 decryptor
 Dedup
-Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS

.pipelines/v2/templates/job-build-project.yml

@@ -344,11 +344,6 @@ jobs:
       flattenFolders: True
       OverWrite: True
 
-  # Check if all projects (located in src sub-folder) import common props
-  - pwsh: |-
-      & '.pipelines/verifyCommonProps.ps1' -sourceDir '$(build.sourcesdirectory)\src'
-    displayName: Audit shared common props for CSharp projects in src sub-folder
-
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'

.pipelines/verifyCommonProps.ps1

@@ -1,54 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$sourceDir
-)
-
-# scan all csharp project in the source directory
-function Get-CSharpProjects {
-    param (
-        [string]$path
-    )
-
-    # Get all .csproj files under the specified path
-    return Get-ChildItem -Path $path -Recurse -Filter *.csproj | Select-Object -ExpandProperty FullName
-}
-
-# Check if the project file imports 'Common.Dotnet.CsWinRT.props'
-function Test-ImportSharedCsWinRTProps {
-    param (
-        [string]$filePath
-    )
-
-    # Load the XML content of the .csproj file
-    [xml]$csprojContent = Get-Content -Path $filePath
-
-    
-    # Check if the Import element with Project attribute containing 'Common.Dotnet.CsWinRT.props' exists
-    return $csprojContent.Project.Import | Where-Object { $null -ne $_.Project -and $_.Project.EndsWith('Common.Dotnet.CsWinRT.props') }
-}
-
-# Call the function with the provided source directory
-$csprojFilesArray = Get-CSharpProjects -path $sourceDir
-
-$hasInvalidCsProj = $false
-
-# Enumerate the array of file paths and call Validate-ImportSharedCsWinRTProps for each file
-foreach ($csprojFile in $csprojFilesArray) {
-    # Skip if the file ends with 'TemplateCmdPalExtension.csproj'
-    if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
-        continue
-    }
-
-    $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
-    if (!$importExists) {
-        Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."
-        $hasInvalidCsProj = $true
-    }
-}
-
-if ($hasInvalidCsProj) {
-    exit 1
-}
-
-exit 0

src/Common.Dotnet.FuzzTest.props

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Some items may be set in Directory.Build.props in root -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- OneFuzz does not currently support testing with .NET 9.
-       As a temporary workaround, create a .NET 8 project and use file links 
-       to include the code that needs testing. -->
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-  </PropertyGroup>
-</Project>

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "leilzh@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "leilzh@microsoft.com",

src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj

@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
-
 	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -58,7 +58,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -99,7 +99,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -140,7 +140,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",

src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp

@@ -217,9 +217,10 @@ public:
         CmdPal::m_enabled.store(true);
 
         std::wstring packageName = L"Microsoft.CommandPalette";
-        std::wstring launchPath = L"x-cmdpal://background";
+        std::wstring launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette_8wekyb3d8bbwe!App";
 #ifdef IS_DEV_BRANDING
         packageName = L"Microsoft.CommandPalette.Dev";
+        launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App";
 #endif
 
         if (!package::GetRegisteredPackage(packageName, false).has_value())
@@ -268,7 +269,7 @@ public:
         if (!firstEnableCall)
         {
             Logger::trace("Not first attempt, try to launch");
-            LaunchApp(launchPath, L"", false /*no elevated*/, false /*error pop up*/);
+            LaunchApp(launchPath, L"RunFromPT", false /*no elevated*/, false /*error pop up*/);
         }
         else
         {
@@ -296,7 +297,7 @@ public:
         int retry = 0;
         do
         {
-            auto launch_result = LaunchApp(path, L"", false, retry < max_retry);
+            auto launch_result = LaunchApp(path, L"RunFromPT", false, retry < max_retry);
             if (launch_result)
             {
                 Logger::info(L"CmdPal launched successfully after {} retries.", retry);

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.1.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs

@@ -14,12 +14,11 @@ namespace TemplateCmdPalExtension;
 public class Program
 {
     [MTAThread]
-    public static void Main(string[] args)
+    public static async Task Main(string[] args)
     {
         if (args.Length > 0 && args[0] == "-RegisterProcessAsComServer")
         {
-            global::Shmuelie.WinRTServer.ComServer server = new();
-
+            await using global::Shmuelie.WinRTServer.ComServer server = new();
             ManualResetEvent extensionDisposedEvent = new(false);
             
             // We are instantiating an extension instance once above, and returning it every time the callback in RegisterExtension below is called.
@@ -32,8 +31,6 @@ public class Program
             // This will make the main thread wait until the event is signalled by the extension class.
             // Since we have single instance of the extension object, we exit as soon as it is disposed.
             extensionDisposedEvent.WaitOne();
-            server.Stop();
-            server.UnsafeDispose();
         }
         else
         {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandItemViewModel.cs

@@ -190,7 +190,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             contextItem.SlowInitializeProperties();
         });
 
-        if (!string.IsNullOrEmpty(model.Command?.Name))
+        if (!string.IsNullOrEmpty(model.Command.Name))
         {
             _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
             {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs

@@ -66,10 +66,8 @@ public sealed class CommandProviderWrapper
         DisplayName = provider.DisplayName;
         Icon = new(provider.Icon);
         Icon.InitializeProperties();
-
-        // Note: explicitly not InitializeProperties()ing the settings here. If
-        // we do that, then we'd regress GH #38321
         Settings = new(provider.Settings, this, _taskScheduler);
+        Settings.InitializeProperties();
 
         Logger.LogDebug($"Initialized command provider {ProviderId}");
     }
@@ -153,11 +151,9 @@ public sealed class CommandProviderWrapper
             Icon = new(model.Icon);
             Icon.InitializeProperties();
 
-            // Note: explicitly not InitializeProperties()ing the settings here. If
-            // we do that, then we'd regress GH #38321
             Settings = new(model.Settings, this, _taskScheduler);
+            Settings.InitializeProperties();
 
-            // We do need to explicitly initialize commands though
             InitializeCommands(commands, fallbacks, serviceProvider, pageContext);
 
             Logger.LogDebug($"Loaded commands from {DisplayName} ({ProviderId})");
@@ -198,6 +194,21 @@ public sealed class CommandProviderWrapper
         }
     }
 
+    /* This is a View/ExtensionHost piece
+     * public void AllowSetForeground(bool allow)
+    {
+        if (!IsExtension)
+        {
+            return;
+        }
+
+        var iextn = extensionWrapper?.GetExtensionObject();
+        unsafe
+        {
+            PInvoke.CoAllowSetForegroundWindow(iextn);
+        }
+    }*/
+
     public override bool Equals(object? obj) => obj is CommandProviderWrapper wrapper && isValid == wrapper.isValid;
 
     public override int GetHashCode() => _commandProvider.GetHashCode();

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs

@@ -2,25 +2,18 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread)
+public partial class CommandSettingsViewModel(ICommandSettings _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread)
 {
     private readonly ExtensionObject<ICommandSettings> _model = new(_unsafeSettings);
 
     public ContentPageViewModel? SettingsPage { get; private set; }
 
-    public bool Initialized { get; private set; }
-
-    public bool HasSettings =>
-        _model.Unsafe != null && // We have a settings model AND
-        (!Initialized || SettingsPage != null); // we weren't initialized, OR we were, and we do have a settings page
-
-    private void UnsafeInitializeProperties()
+    public void InitializeProperties()
     {
         var model = _model.Unsafe;
         if (model == null)
@@ -34,27 +27,4 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
             SettingsPage.InitializeProperties();
         }
     }
-
-    public void SafeInitializeProperties()
-    {
-        try
-        {
-            UnsafeInitializeProperties();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to load settings page", ex: ex);
-        }
-
-        Initialized = true;
-    }
-
-    public void DoOnUiThread(Action action)
-    {
-        Task.Factory.StartNew(
-            action,
-            CancellationToken.None,
-            TaskCreationOptions.None,
-            mainThread);
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs

@@ -6,7 +6,6 @@ using System.Text.Json;
 using AdaptiveCards.ObjectModel.WinUI3;
 using AdaptiveCards.Templating;
 using CommunityToolkit.Mvvm.Messaging;
-using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -29,67 +28,43 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
     public AdaptiveCardParseResult? Card { get; private set; }
 
-    private static string Serialize(string? s) =>
-        JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
-
-    private static bool TryBuildCard(
-        string templateJson,
-        string dataJson,
-        out AdaptiveCardParseResult? card,
-        out Exception? error)
-    {
-        card = null;
-        error = null;
-
-        try
-        {
-            var template = new AdaptiveCardTemplate(templateJson);
-            var cardJson = template.Expand(dataJson);
-            card = AdaptiveCard.FromJsonString(cardJson);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Error building card from template: {Message}", ex.Message);
-            error = ex;
-            return false;
-        }
-    }
-
     public override void InitializeProperties()
     {
         var model = _formModel.Unsafe;
-        if (model is null)
+        if (model == null)
         {
             return;
         }
 
-        TemplateJson = model.TemplateJson;
-        StateJson = model.StateJson;
-        DataJson = model.DataJson;
-
-        if (TryBuildCard(TemplateJson, DataJson, out var builtCard, out var renderingError))
+        try
         {
-            Card = builtCard;
-            UpdateProperty(nameof(Card));
-            return;
+            TemplateJson = model.TemplateJson;
+            StateJson = model.StateJson;
+            DataJson = model.DataJson;
+
+            AdaptiveCardTemplate template = new(TemplateJson);
+            var cardJson = template.Expand(DataJson);
+            Card = AdaptiveCard.FromJsonString(cardJson);
         }
-
-        var errorPayload = $$"""
-    {
-        "error_message": {{Serialize(renderingError!.Message)}},
-        "error_stack":   {{Serialize(renderingError.StackTrace)}},
-        "inner_exception": {{Serialize(renderingError.InnerException?.Message)}},
-        "template_json": {{Serialize(TemplateJson)}},
-        "data_json":     {{Serialize(DataJson)}}
-    }
-    """;
-
-        if (TryBuildCard(ErrorCardJson, errorPayload, out var errorCard, out var _))
+        catch (Exception e)
         {
-            Card = errorCard;
-            UpdateProperty(nameof(Card));
-            return;
+            // If we fail to parse the card JSON, then display _our own card_
+            // with the exception
+            AdaptiveCardTemplate template = new(ErrorCardJson);
+            var serializeString = (string? s) => JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
+
+            // todo: we could probably stick Card.Errors in there too
+            var dataJson = $$"""
+{
+    "error_message": {{serializeString(e.Message)}},
+    "error_stack": {{serializeString(e.StackTrace)}},
+    "inner_exception": {{serializeString(e.InnerException?.Message)}},
+    "template_json": {{serializeString(TemplateJson)}},
+    "data_json": {{serializeString(DataJson)}}
+}
+""";
+            var cardJson = template.Expand(dataJson);
+            Card = AdaptiveCard.FromJsonString(cardJson);
         }
 
         UpdateProperty(nameof(Card));

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs

@@ -61,8 +61,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
     private Task? _initializeItemsTask;
     private CancellationTokenSource? _cancellationTokenSource;
 
-    private ListItemViewModel? _lastSelectedItem;
-
     public override bool IsInitialized
     {
         get => base.IsInitialized; protected set
@@ -330,24 +328,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     }
 
     [RelayCommand]
-    private void UpdateSelectedItem(ListItemViewModel? item)
-    {
-        if (_lastSelectedItem != null)
-        {
-            _lastSelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
-        }
-
-        if (item != null)
-        {
-            SetSelectedItem(item);
-        }
-        else
-        {
-            ClearSelectedItem();
-        }
-    }
-
-    private void SetSelectedItem(ListItemViewModel item)
+    private void UpdateSelectedItem(ListItemViewModel item)
     {
         if (!item.SafeSlowInit())
         {
@@ -374,60 +355,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
                TextToSuggest = item.TextToSuggest;
            });
-
-        _lastSelectedItem = item;
-        _lastSelectedItem.PropertyChanged += SelectedItemPropertyChanged;
-    }
-
-    private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        var item = _lastSelectedItem;
-        if (item == null)
-        {
-            return;
-        }
-
-        // already on the UI thread here
-        switch (e.PropertyName)
-        {
-            case nameof(item.Command):
-            case nameof(item.SecondaryCommand):
-            case nameof(item.AllCommands):
-            case nameof(item.Name):
-                WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(item));
-                break;
-            case nameof(item.Details):
-                if (ShowDetails && item.HasDetails)
-                {
-                    WeakReferenceMessenger.Default.Send<ShowDetailsMessage>(new(item.Details));
-                }
-                else
-                {
-                    WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
-                }
-
-                break;
-            case nameof(item.TextToSuggest):
-                TextToSuggest = item.TextToSuggest;
-                break;
-        }
-    }
-
-    private void ClearSelectedItem()
-    {
-        // GH #322:
-        // For inexplicable reasons, if you try updating the command bar and
-        // the details on the same UI thread tick as updating the list, we'll
-        // explode
-        DoOnUiThread(
-           () =>
-           {
-               WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(null));
-
-               WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
-
-               TextToSuggest = string.Empty;
-           });
     }
 
     public override void InitializeProperties()

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs

@@ -18,8 +18,6 @@ public partial class ProviderSettingsViewModel(
     IServiceProvider _serviceProvider) : ObservableObject
 {
     private readonly SettingsModel _settings = _serviceProvider.GetService<SettingsModel>()!;
-    private readonly Lock _initializeSettingsLock = new();
-    private Task? _initializeSettingsTask;
 
     public string DisplayName => _provider.DisplayName;
 
@@ -36,9 +34,6 @@ public partial class ProviderSettingsViewModel(
 
     public IconInfoViewModel Icon => _provider.Icon;
 
-    [ObservableProperty]
-    public partial bool LoadingSettings { get; set; } = _provider.Settings?.HasSettings ?? false;
-
     public bool IsEnabled
     {
         get => _providerSettings.IsEnabled;
@@ -61,60 +56,15 @@ public partial class ProviderSettingsViewModel(
         }
     }
 
-    /// <summary>
-    /// Gets a value indicating whether returns true if we have a settings page
-    /// that's initialized, or we are still working on initializing that
-    /// settings page. If we don't have a settings object, or that settings
-    /// object doesn't have a settings page, then we'll return false.
-    /// </summary>
-    public bool HasSettings
+    private void Provider_CommandsChanged(CommandProviderWrapper sender, CommandPalette.Extensions.IItemsChangedEventArgs args)
     {
-        get
-        {
-            if (_provider.Settings == null)
-            {
-                return false;
-            }
-
-            if (_provider.Settings.Initialized)
-            {
-                return _provider.Settings.HasSettings;
-            }
-
-            // settings still need to be loaded.
-            return LoadingSettings;
-        }
+        OnPropertyChanged(nameof(ExtensionSubtext));
+        OnPropertyChanged(nameof(TopLevelCommands));
     }
 
-    /// <summary>
-    /// Gets will return the settings page, if we have one, and have initialized it.
-    /// If we haven't initialized it, this will kick off a thread to start
-    /// initializing it.
-    /// </summary>
-    public ContentPageViewModel? SettingsPage
-    {
-        get
-        {
-            if (_provider.Settings == null)
-            {
-                return null;
-            }
+    public bool HasSettings => _provider.Settings != null && _provider.Settings.SettingsPage != null;
 
-            if (_provider.Settings.Initialized)
-            {
-                LoadingSettings = false;
-                return _provider.Settings.SettingsPage;
-            }
-
-            // Don't load the settings if we're already working on it
-            lock (_initializeSettingsLock)
-            {
-                _initializeSettingsTask ??= Task.Run(InitializeSettingsPage);
-            }
-
-            return null;
-        }
-    }
+    public ContentPageViewModel? SettingsPage => HasSettings ? _provider?.Settings?.SettingsPage : null;
 
     [field: AllowNull]
     public List<TopLevelViewModel> TopLevelCommands
@@ -140,30 +90,4 @@ public partial class ProviderSettingsViewModel(
     }
 
     private void Save() => SettingsModel.SaveSettings(_settings);
-
-    private void InitializeSettingsPage()
-    {
-        if (_provider.Settings == null)
-        {
-            return;
-        }
-
-        _provider.Settings.SafeInitializeProperties();
-        _provider.Settings.DoOnUiThread(() =>
-        {
-            // Changing these properties will try to update XAML, and that has
-            // to be handled on the UI thread, so we need to raise them on the
-            // UI thread
-            LoadingSettings = false;
-            OnPropertyChanged(nameof(HasSettings));
-            OnPropertyChanged(nameof(LoadingSettings));
-            OnPropertyChanged(nameof(SettingsPage));
-        });
-    }
-
-    private void Provider_CommandsChanged(CommandProviderWrapper sender, CommandPalette.Extensions.IItemsChangedEventArgs args)
-    {
-        OnPropertyChanged(nameof(ExtensionSubtext));
-        OnPropertyChanged(nameof(TopLevelCommands));
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -45,9 +44,6 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     public async Task<bool> LoadBuiltinsAsync()
     {
-        var s = new Stopwatch();
-        s.Start();
-
         _builtInCommands.Clear();
 
         // Load built-In commands first. These are all in-proc, and
@@ -57,48 +53,53 @@ public partial class TopLevelCommandManager : ObservableObject,
         {
             CommandProviderWrapper wrapper = new(provider, _taskScheduler);
             _builtInCommands.Add(wrapper);
-            var commands = await LoadTopLevelCommandsFromProvider(wrapper);
-            lock (TopLevelCommands)
-            {
-                foreach (var c in commands)
-                {
-                    TopLevelCommands.Add(c);
-                }
-            }
+            await LoadTopLevelCommandsFromProvider(wrapper);
         }
 
-        s.Stop();
-
-        Logger.LogDebug($"Loading built-ins took {s.ElapsedMilliseconds}ms");
-
         return true;
     }
 
     // May be called from a background thread
-    private async Task<IEnumerable<TopLevelViewModel>> LoadTopLevelCommandsFromProvider(CommandProviderWrapper commandProvider)
+    private async Task LoadTopLevelCommandsFromProvider(CommandProviderWrapper commandProvider)
     {
         WeakReference<IPageContext> weakSelf = new(this);
 
         await commandProvider.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
         var settings = _serviceProvider.GetService<SettingsModel>()!;
-
-        List<TopLevelViewModel> commands = [];
-
-        foreach (var item in commandProvider.TopLevelItems)
+        var makeAndAdd = (ICommandItem? i, bool fallback) =>
         {
-            commands.Add(item);
-        }
+            var commandItemViewModel = new CommandItemViewModel(new(i), weakSelf);
+            var topLevelViewModel = new TopLevelViewModel(commandItemViewModel, fallback, commandProvider.ExtensionHost, commandProvider.ProviderId, settings, _serviceProvider);
 
-        foreach (var item in commandProvider.FallbackItems)
-        {
-            commands.Add(item);
-        }
+            lock (TopLevelCommands)
+            {
+                TopLevelCommands.Add(topLevelViewModel);
+            }
+        };
+
+        await Task.Factory.StartNew(
+            () =>
+            {
+                lock (TopLevelCommands)
+                {
+                    foreach (var item in commandProvider.TopLevelItems)
+                    {
+                        TopLevelCommands.Add(item);
+                    }
+
+                    foreach (var item in commandProvider.FallbackItems)
+                    {
+                        TopLevelCommands.Add(item);
+                    }
+                }
+            },
+            CancellationToken.None,
+            TaskCreationOptions.None,
+            _taskScheduler);
 
         commandProvider.CommandsChanged -= CommandProvider_CommandsChanged;
         commandProvider.CommandsChanged += CommandProvider_CommandsChanged;
-
-        return commands;
     }
 
     // By all accounts, we're already on a background thread (the COM call
@@ -238,71 +239,25 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     private async Task StartExtensionsAndGetCommands(IEnumerable<IExtensionWrapper> extensions)
     {
-        var timer = new Stopwatch();
-        timer.Start();
-
-        // Start all extensions in parallel
-        var startTasks = extensions.Select(StartExtensionWithTimeoutAsync);
-
-        // Wait for all extensions to start
-        var wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper != null).Select(w => w!).ToList();
-
-        foreach (var wrapper in wrappers)
+        // TODO This most definitely needs a lock
+        foreach (var extension in extensions)
         {
-            _extensionCommandProviders.Add(wrapper!);
-        }
-
-        // Load the commands from the providers in parallel
-        var loadTasks = wrappers.Select(LoadCommandsWithTimeoutAsync);
-
-        var commandSets = (await Task.WhenAll(loadTasks)).Where(results => results != null).Select(r => r!).ToList();
-
-        lock (TopLevelCommands)
-        {
-            foreach (var commands in commandSets)
+            Logger.LogDebug($"Starting {extension.PackageFullName}");
+            try
             {
-                foreach (var c in commands)
-                {
-                    TopLevelCommands.Add(c);
-                }
+                // start it ...
+                await extension.StartExtensionAsync();
+
+                // ... and fetch the command provider from it.
+                CommandProviderWrapper wrapper = new(extension, _taskScheduler);
+                _extensionCommandProviders.Add(wrapper);
+                await LoadTopLevelCommandsFromProvider(wrapper);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex.ToString());
             }
         }
-
-        timer.Stop();
-        Logger.LogDebug($"Loading extensions took {timer.ElapsedMilliseconds} ms");
-    }
-
-    private async Task<CommandProviderWrapper?> StartExtensionWithTimeoutAsync(IExtensionWrapper extension)
-    {
-        Logger.LogDebug($"Starting {extension.PackageFullName}");
-        try
-        {
-            await extension.StartExtensionAsync().WaitAsync(TimeSpan.FromSeconds(10));
-            return new CommandProviderWrapper(extension, _taskScheduler);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to start extension {extension.PackageFullName}: {ex}");
-            return null; // Return null for failed extensions
-        }
-    }
-
-    private async Task<IEnumerable<TopLevelViewModel>?> LoadCommandsWithTimeoutAsync(CommandProviderWrapper wrapper)
-    {
-        try
-        {
-            return await LoadTopLevelCommandsFromProvider(wrapper!).WaitAsync(TimeSpan.FromSeconds(10));
-        }
-        catch (TimeoutException)
-        {
-            Logger.LogError($"Loading commands from {wrapper!.ExtensionHost?.Extension?.PackageFullName} timed out");
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to load commands for extension {wrapper!.ExtensionHost?.Extension?.PackageFullName}: {ex}");
-        }
-
-        return null;
     }
 
     private void ExtensionService_OnExtensionRemoved(IExtensionService sender, IEnumerable<IExtensionWrapper> extensions)

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -73,12 +73,26 @@ public partial class App : Application
     /// 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)
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         AppWindow = new MainWindow();
 
-        var activatedEventArgs = Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent().GetActivatedEventArgs();
-        ((MainWindow)AppWindow).HandleLaunch(activatedEventArgs);
+        var cmdArgs = Environment.GetCommandLineArgs();
+
+        var runFromPT = false;
+        foreach (var arg in cmdArgs)
+        {
+            if (arg == "RunFromPT")
+            {
+                runFromPT = true;
+                break;
+            }
+        }
+
+        if (!runFromPT)
+        {
+            AppWindow.Activate();
+        }
     }
 
     /// <summary>

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -124,12 +124,14 @@ public sealed partial class ListPage : Page,
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS is too aggressive at pruning methods bound in XAML")]
     private void ItemsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        var vm = ViewModel;
-        var li = ItemsList.SelectedItem as ListItemViewModel;
-        _ = Task.Run(() =>
+        if (ItemsList.SelectedItem is ListItemViewModel item)
         {
-            vm?.UpdateSelectedItemCommand.Execute(li);
-        });
+            var vm = ViewModel;
+            _ = Task.Run(() =>
+            {
+                vm?.UpdateSelectedItemCommand.Execute(item);
+            });
+        }
 
         // There's mysterious behavior here, where the selection seemingly
         // changes to _nothing_ when we're backspacing to a single character.

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml

@@ -1,4 +1,4 @@
-<winuiex:WindowEx
+<Window
     x:Class="Microsoft.CmdPal.UI.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,13 +6,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="using:Microsoft.CmdPal.UI.Pages"
     xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
-    xmlns:winuiex="using:WinUIEx"
-    Width="800"
-    Height="480"
-    MinWidth="320"
-    MinHeight="240"
     Activated="MainWindow_Activated"
     Closed="MainWindow_Closed"
     mc:Ignorable="d">
     <pages:ShellPage x:Name="RootShellPage" />
-</winuiex:WindowEx>
+</Window>

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs

@@ -19,25 +19,21 @@ using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Input;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.Windows.AppLifecycle;
-using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Graphics;
 using Windows.UI;
 using Windows.UI.WindowManagement;
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
 using WinRT;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
 
 namespace Microsoft.CmdPal.UI;
 
-public sealed partial class MainWindow : WindowEx,
+public sealed partial class MainWindow : Window,
     IRecipient<DismissMessage>,
     IRecipient<ShowWindowMessage>,
     IRecipient<HideWindowMessage>,
@@ -86,6 +82,7 @@ public sealed partial class MainWindow : WindowEx,
 
         this.SetIcon();
         AppWindow.Title = RS_.GetString("AppName");
+        AppWindow.Resize(new SizeInt32 { Width = 1000, Height = 620 });
         PositionCentered();
         SetAcrylic();
 
@@ -235,16 +232,6 @@ public sealed partial class MainWindow : WindowEx,
         PositionCentered(display);
 
         PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_SHOW);
-
-        // instead of showing the window, uncloak it from DWM
-        // This will make it visible to the user, without the animation or frames for
-        // loading XAML with composition
-        unsafe
-        {
-            BOOL value = false;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
-        }
-
         PInvoke.SetForegroundWindow(hwnd);
         PInvoke.SetActiveWindow(hwnd);
     }
@@ -302,7 +289,7 @@ public sealed partial class MainWindow : WindowEx,
         ShowHwnd(message.Hwnd, settings.SummonOn);
     }
 
-    public void Receive(HideWindowMessage message) => HideWindow();
+    public void Receive(HideWindowMessage message) => PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
 
     public void Receive(QuitMessage message) =>
 
@@ -310,21 +297,7 @@ public sealed partial class MainWindow : WindowEx,
         DispatcherQueue.TryEnqueue(() => Close());
 
     public void Receive(DismissMessage message) =>
-        HideWindow();
-
-    private void HideWindow()
-    {
-        // Hide our window
-
-        // Instead of hiding the window, cloak it from DWM
-        // This will make it invisible to the user, such that we can show it again
-        // by uncloaking it, which avoids an unnecessary "flicker in" that XAML does
-        unsafe
-        {
-            BOOL value = true;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
-        }
-    }
+        PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
 
     internal void MainWindow_Closed(object sender, WindowEventArgs args)
     {
@@ -413,9 +386,7 @@ public sealed partial class MainWindow : WindowEx,
                 return;
             }
 
-            // This will DWM cloak our window:
-            HideWindow();
-
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
             PowerToysTelemetry.Log.WriteEvent(new CmdPalDismissedOnLostFocus());
         }
 
@@ -425,40 +396,6 @@ public sealed partial class MainWindow : WindowEx,
         }
     }
 
-    public void HandleLaunch(AppActivationArguments? activatedEventArgs)
-    {
-        if (activatedEventArgs == null)
-        {
-            Summon(string.Empty);
-            return;
-        }
-
-        if (activatedEventArgs.Kind == Microsoft.Windows.AppLifecycle.ExtendedActivationKind.Protocol)
-        {
-            if (activatedEventArgs.Data is IProtocolActivatedEventArgs protocolArgs)
-            {
-                if (protocolArgs.Uri.ToString() is string uri)
-                {
-                    // was the URI "x-cmdpal://background" ?
-                    if (uri.StartsWith("x-cmdpal://background", StringComparison.OrdinalIgnoreCase))
-                    {
-                        // we're running, we don't want to activate our window. bail
-                        return;
-                    }
-                    else if (uri.StartsWith("x-cmdpal://settings", StringComparison.OrdinalIgnoreCase))
-                    {
-                        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
-                        return;
-                    }
-                }
-
-                return;
-            }
-        }
-
-        Activate();
-    }
-
     public void Summon(string commandId) =>
 
         // The actual showing and hiding of the window will be done by the
@@ -467,6 +404,11 @@ public sealed partial class MainWindow : WindowEx,
         // know till the message is being handled.
         WeakReferenceMessenger.Default.Send<HotkeySummonMessage>(new(commandId, _hwnd));
 
+#pragma warning disable SA1310 // Field names should not contain underscore
+    private const uint DOT_KEY = 0xBE;
+    private const uint WM_HOTKEY = 0x0312;
+#pragma warning restore SA1310 // Field names should not contain underscore
+
     private void UnregisterHotkeys()
     {
         _keyboardListener.ClearHotkeys();
@@ -537,24 +479,10 @@ public sealed partial class MainWindow : WindowEx,
         var isRootHotkey = string.IsNullOrEmpty(commandId);
         PowerToysTelemetry.Log.WriteEvent(new CmdPalHotkeySummoned(isRootHotkey));
 
-        var isVisible = this.Visible;
-        unsafe
-        {
-            // We need to check if our window is cloaked or not. A cloaked window is still
-            // technically visible, because SHOW/HIDE != iconic (minimized) != cloaked
-            // (these are all separate states)
-            long attr = 0;
-            PInvoke.DwmGetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAKED, &attr, sizeof(long));
-            if (attr == 1 /* DWM_CLOAKED_APP */)
-            {
-                isVisible = false;
-            }
-        }
-
         // Note to future us: the wParam will have the index of the hotkey we registered.
         // We can use that in the future to differentiate the hotkeys we've pressed
         // so that we can bind hotkeys to individual commands
-        if (!isVisible || !isRootHotkey)
+        if (!this.Visible || !isRootHotkey)
         {
             Activate();
 
@@ -562,16 +490,7 @@ public sealed partial class MainWindow : WindowEx,
         }
         else if (isRootHotkey)
         {
-            // If there's a debugger attached...
-            if (System.Diagnostics.Debugger.IsAttached)
-            {
-                // ... then manually hide our window. When debugged, we won't get the cool cloaking,
-                // but that's the price to pay for having the HWND not light-dismiss while we're debugging.
-                PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
-                return;
-            }
-
-            HideWindow();
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
         }
     }
 
@@ -583,10 +502,7 @@ public sealed partial class MainWindow : WindowEx,
     {
         switch (uMsg)
         {
-            // Prevent the window from maximizing when double-clicking the title bar area
-            case PInvoke.WM_NCLBUTTONDBLCLK:
-                return (LRESULT)IntPtr.Zero;
-            case PInvoke.WM_HOTKEY:
+            case WM_HOTKEY:
                 {
                     var hotkeyIndex = (int)wParam.Value;
                     if (hotkeyIndex < _hotkeys.Count)
@@ -602,6 +518,22 @@ public sealed partial class MainWindow : WindowEx,
 
                         var hotkey = _hotkeys[hotkeyIndex];
                         HandleSummon(hotkey.CommandId);
+
+                        // var isRootHotkey = string.IsNullOrEmpty(hotkey.CommandId);
+
+                        // // Note to future us: the wParam will have the index of the hotkey we registered.
+                        // // We can use that in the future to differentiate the hotkeys we've pressed
+                        // // so that we can bind hotkeys to individual commands
+                        // if (!this.Visible || !isRootHotkey)
+                        // {
+                        //     Activate();
+
+                        // Summon(hotkey.CommandId);
+                        // }
+                        // else if (isRootHotkey)
+                        // {
+                        //     PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_HIDE);
+                        // }
                     }
 
                     return (LRESULT)IntPtr.Zero;

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -66,7 +66,7 @@
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
-	<PackageReference Include="WinUIEx" />
+
     <PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt

@@ -25,8 +25,6 @@ SHCreateStreamOnFileEx
 CoAllowSetForegroundWindow
 SHCreateStreamOnFileEx
 SHLoadIndirectString
-WM_HOTKEY
-WM_NCLBUTTONDBLCLK
 
 Shell_NotifyIcon
 LoadIcon
@@ -38,8 +36,3 @@ ExtractIconEx
 WM_RBUTTONUP
 WM_LBUTTONUP
 WM_LBUTTONDBLCLK
-
-MessageBox
-DwmGetWindowAttribute
-DwmSetWindowAttribute
-DWM_CLOAKED_APP

src/modules/cmdpal/Microsoft.CmdPal.UI/Package-Dev.appxmanifest

@@ -70,13 +70,6 @@
             DisplayName="ms-resource:StartupTaskNameDev" />
         </uap5:Extension>
 
-        <uap:Extension Category="windows.protocol">
-          <uap:Protocol Name="x-cmdpal">
-            <uap:Logo>Assets\StoreLogo.png</uap:Logo>
-            <uap:DisplayName>Command Palette Dev URI scheme</uap:DisplayName>
-          </uap:Protocol>
-        </uap:Extension>
-
       </Extensions>
 
     </Application>

src/modules/cmdpal/Microsoft.CmdPal.UI/Package.appxmanifest

@@ -70,14 +70,6 @@
             DisplayName="ms-resource:StartupTaskName" />
         </uap5:Extension>
 
-
-        <uap:Extension Category="windows.protocol">
-          <uap:Protocol Name="x-cmdpal">
-            <uap:Logo>Assets\StoreLogo.png</uap:Logo>
-            <uap:DisplayName>Command Palette URI scheme</uap:DisplayName>
-          </uap:Protocol>
-        </uap:Extension>
-
       </Extensions>
 
     </Application>

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -418,20 +418,18 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     {
         _ = DispatcherQueue.TryEnqueue(() =>
         {
-            OpenSettings();
+            // Also hide our details pane about here, if we had one
+            HideDetails();
+
+            if (_settingsWindow == null)
+            {
+                _settingsWindow = new SettingsWindow();
+            }
+
+            _settingsWindow.Activate();
         });
     }
 
-    public void OpenSettings()
-    {
-        if (_settingsWindow == null)
-        {
-            _settingsWindow = new SettingsWindow();
-        }
-
-        _settingsWindow.Activate();
-    }
-
     public void Receive(ShowDetailsMessage message)
     {
         // TERRIBLE HACK TODO GH #245

src/modules/cmdpal/Microsoft.CmdPal.UI/Program.cs

@@ -2,14 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Runtime.InteropServices;
 using ManagedCommon;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.Windows.AppLifecycle;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Microsoft.CmdPal.UI;
 
@@ -34,33 +30,7 @@ internal sealed class Program
             return 0;
         }
 
-        try
-        {
-            Logger.InitializeLogger("\\CmdPal\\Logs\\");
-        }
-        catch (COMException e)
-        {
-            // This is unexpected. For the sake of debugging:
-            // pop a message box
-            PInvoke.MessageBox(
-                (HWND)IntPtr.Zero,
-                $"Failed to initialize the logger. COMException: \r{e.Message}",
-                "Command Palette",
-                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
-            return 0;
-        }
-        catch (Exception e2)
-        {
-            // This is unexpected. For the sake of debugging:
-            // pop a message box
-            PInvoke.MessageBox(
-                (HWND)IntPtr.Zero,
-                $"Failed to initialize the logger. Unknown Exception: \r{e2.Message}",
-                "Command Palette",
-                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
-            return 0;
-        }
-
+        Logger.InitializeLogger("\\CmdPal\\Logs\\");
         Logger.LogDebug($"Starting at {DateTime.UtcNow}");
         PowerToysTelemetry.Log.WriteEvent(new CmdPalProcessStarted());
 
@@ -109,9 +79,7 @@ internal sealed class Program
             if (thisApp.AppWindow is not null and
                 MainWindow mainWindow)
             {
-                mainWindow.HandleLaunch(args);
-
-                // mainWindow.Summon(string.Empty);
+                mainWindow.Summon(string.Empty);
             }
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json

@@ -2,8 +2,7 @@
   "profiles": {
     "Microsoft.CmdPal.UI (Package)": {
       "commandName": "MsixPackage",
-      "nativeDebugging": false,
-      "doNotLaunchApp": false
+      "nativeDebugging": false
     },
     "Microsoft.CmdPal.UI (Unpackaged)": {
       "commandName": "Project"

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml

@@ -113,24 +113,7 @@
                                     Visibility="{x:Bind ViewModel.HasSettings}" />
 
                                 <Frame x:Name="SettingsFrame" Visibility="{x:Bind ViewModel.HasSettings}">
-
-                                    <controls:SwitchPresenter
-                                        HorizontalAlignment="Stretch"
-                                        TargetType="x:Boolean"
-                                        Value="{x:Bind ViewModel.LoadingSettings, Mode=OneWay}">
-                                        <controls:Case Value="True">
-                                            <ProgressRing
-                                                Width="36"
-                                                Height="36"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                IsIndeterminate="True" />
-                                        </controls:Case>
-                                        <controls:Case Value="False">
-                                            <cmdpalUI:ContentPage ViewModel="{x:Bind ViewModel.SettingsPage, Mode=OneWay}" />
-                                        </controls:Case>
-                                    </controls:SwitchPresenter>
-
+                                    <cmdpalUI:ContentPage ViewModel="{x:Bind ViewModel.SettingsPage, Mode=OneWay}" />
                                 </Frame>
 
                                 <TextBlock

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<winuiex:WindowEx
+<Window
     x:Class="Microsoft.CmdPal.UI.Settings.SettingsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,18 +7,13 @@
     xmlns:local="using:Microsoft.CmdPal.UI.Settings"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:winuiex="using:WinUIEx"
     Title="SettingsWindow"
-    Width="1280"
-    Height="720"
-    MinWidth="480"
-    MinHeight="480"
     Activated="Window_Activated"
     Closed="Window_Closed"
     mc:Ignorable="d">
-    <winuiex:WindowEx.SystemBackdrop>
+    <Window.SystemBackdrop>
         <MicaBackdrop />
-    </winuiex:WindowEx.SystemBackdrop>
+    </Window.SystemBackdrop>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -42,10 +37,10 @@
                 Height="16"
                 Source="ms-appx:///Assets/icon.svg" />
             <TextBlock
-                x:Uid="CmdPalSettingsHeader"
                 Margin="12,0,0,0"
                 VerticalAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}" />
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="Command Palette Settings" />
         </StackPanel>
         <NavigationView
             x:Name="NavView"
@@ -105,4 +100,4 @@
             </Grid>
         </NavigationView>
     </Grid>
-</winuiex:WindowEx>
+</Window>

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs

@@ -11,12 +11,11 @@ using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Graphics;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
 
 namespace Microsoft.CmdPal.UI.Settings;
 
-public sealed partial class SettingsWindow : WindowEx,
+public sealed partial class SettingsWindow : Window,
     IRecipient<NavigateToExtensionSettingsMessage>,
     IRecipient<QuitMessage>
 {
@@ -71,6 +70,7 @@ public sealed partial class SettingsWindow : WindowEx,
 
     private void PositionCentered()
     {
+        AppWindow.Resize(new SizeInt32 { Width = 1280, Height = 720 });
         var displayArea = DisplayArea.GetFromWindowId(AppWindow.Id, DisplayAreaFallback.Nearest);
         if (displayArea is not null)
         {

src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<winuiex:WindowEx
+<Window
     x:Class="Microsoft.CmdPal.UI.ToastWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,18 +7,17 @@
     xmlns:local="using:Microsoft.CmdPal.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:winuiex="using:WinUIEx"
     Title="Command Palette Toast"
     mc:Ignorable="d">
-    <winuiex:WindowEx.SystemBackdrop>
+    <Window.SystemBackdrop>
         <DesktopAcrylicBackdrop />
-    </winuiex:WindowEx.SystemBackdrop>
+    </Window.SystemBackdrop>
     <Grid x:Name="ToastGrid">
         <!--  This padding is used to calculate the dimensions of the ToastWindow  -->
         <TextBlock
             x:Name="ToastText"
-            Padding="12,12,24,20"
+            Padding="16,16,36,24"
             Text="{x:Bind ViewModel.ToastMessage, Mode=OneWay}"
             TextAlignment="Center" />
     </Grid>
-</winuiex:WindowEx>
+</Window>

src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs

@@ -17,12 +17,11 @@ using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.UI.HiDpi;
 using Windows.Win32.UI.WindowsAndMessaging;
-using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
 
 namespace Microsoft.CmdPal.UI;
 
-public sealed partial class ToastWindow : WindowEx,
+public sealed partial class ToastWindow : Window,
     IRecipient<QuitMessage>
 {
     private readonly HWND _hwnd;
@@ -65,7 +64,19 @@ public sealed partial class ToastWindow : WindowEx,
 
     private void PositionCentered()
     {
-        this.SetWindowSize(ToastText.ActualWidth, ToastText.ActualHeight);
+        var intSize = new SizeInt32
+        {
+            Width = Convert.ToInt32(ToastText.ActualWidth),
+            Height = Convert.ToInt32(ToastText.ActualHeight),
+        };
+
+        var scaleAdjustment = GetScaleFactor(_hwnd);
+        var scaled = new SizeInt32
+        {
+            Width = (int)Math.Round(intSize.Width * scaleAdjustment),
+            Height = (int)Math.Round(intSize.Height * scaleAdjustment),
+        };
+        AppWindow.Resize(scaled);
 
         var displayArea = DisplayArea.GetFromWindowId(AppWindow.Id, DisplayAreaFallback.Nearest);
         if (displayArea is not null)
@@ -75,7 +86,7 @@ public sealed partial class ToastWindow : WindowEx,
 
             var monitorHeight = displayArea.WorkArea.Height;
             var windowHeight = AppWindow.Size.Height;
-            centeredPosition.Y = monitorHeight - (windowHeight + 8); // Align with other shell toasts, like the volume indicator.
+            centeredPosition.Y = monitorHeight - (windowHeight * 2);
             AppWindow.Move(centeredPosition);
         }
     }

src/modules/cmdpal/README.md

@@ -9,7 +9,7 @@ By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>.
 
 The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂. 
 
-The official API documentation can be found [on this docs site](https://learn.microsoft.com/windows/powertoys/command-palette/extensibility-overview).
+The official API documentation can be found [on this docs site](TODO! Add docs link when we have one)
 
 We've also got samples, so that you can see how the APIs in-action. 
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs

@@ -12,7 +12,7 @@ using Microsoft.CmdPal.Ext.Apps.Utils;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-public sealed partial class AppCache : IDisposable
+public sealed class AppCache : IDisposable
 {
     private Win32ProgramFileSystemWatchers _win32ProgramRepositoryHelper;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/ReparsePoint.cs

@@ -319,7 +319,7 @@ public static class ReparsePoint
 
         public static AppExecutionAliasMetadata FromPersistedRepresentationIntPtr(IntPtr reparseDataBufferPtr, AppExecutionAliasReparseTagBufferLayoutVersion version)
         {
-            var dataOffset = Marshal.SizeOf<AppExecutionAliasReparseTagHeader>();
+            var dataOffset = Marshal.SizeOf(typeof(AppExecutionAliasReparseTagHeader));
             var dataBufferPtr = reparseDataBufferPtr + dataOffset;
 
             string? packageFullName = null;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/FileSystemWatcherWrapper.cs

@@ -8,7 +8,7 @@ using System.IO;
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
 // File System Watcher Wrapper class which implements the IFileSystemWatcherWrapper interface
-public sealed partial class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
+public sealed class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
 {
     public FileSystemWatcherWrapper()
     {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs

@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Storage;
 /// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps.
 /// This repository will also monitor for changes to the PackageCatalog and update the repository accordingly
 /// </summary>
-internal sealed partial class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
+internal sealed class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
 {
     private readonly IPackageCatalog _packageCatalog;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs

@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
-internal sealed partial class Win32ProgramFileSystemWatchers : IDisposable
+internal sealed class Win32ProgramFileSystemWatchers : IDisposable
 {
     public string[] PathsToWatch { get; set; }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramRepository.cs

@@ -14,7 +14,7 @@ using Win32Program = Microsoft.CmdPal.Ext.Apps.Programs.Win32Program;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
-internal sealed partial class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
+internal sealed class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
 {
     private static readonly IFileSystem FileSystem = new FileSystem();
     private static readonly IPath Path = FileSystem.Path;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs

@@ -2,10 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Globalization;
 using System.IO;
-using System.Text;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -13,14 +10,8 @@ using Windows.Storage.Streams;
 
 namespace Microsoft.CmdPal.Ext.Indexer;
 
-internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System.IDisposable
+internal sealed partial class FallbackOpenFileItem : FallbackCommandItem
 {
-    private readonly CompositeFormat fallbackItemSearchPageTitleCompositeFormat = CompositeFormat.Parse(Resources.Indexer_fallback_searchPage_title);
-
-    private readonly SearchEngine _searchEngine = new();
-
-    private uint _queryCookie = 10;
-
     public FallbackOpenFileItem()
         : base(new NoOpCommand(), Resources.Indexer_Find_Path_fallback_display_title)
     {
@@ -30,20 +21,8 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
 
     public override void UpdateQuery(string query)
     {
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            Command = new NoOpCommand();
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            Icon = null;
-            MoreCommands = null;
-
-            return;
-        }
-
         if (Path.Exists(query))
         {
-            // Exit 1: The query is a direct path to a file. Great! Return it.
             var item = new IndexerItem() { FullPath = query, FileName = Path.GetFileName(query) };
             var listItemForUs = new IndexerListItem(item, IncludeBrowseCommand.AsDefault);
             Command = listItemForUs.Command;
@@ -64,65 +43,12 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
             catch
             {
             }
-
-            return;
         }
         else
         {
-            _queryCookie++;
-
-            try
-            {
-                _searchEngine.Query(query, _queryCookie);
-                var results = _searchEngine.FetchItems(0, 20, _queryCookie, out var _);
-
-                if (results.Count == 0 || ((results[0] as IndexerListItem) == null))
-                {
-                    // Exit 2: We searched for the file, and found nothing. Oh well.
-                    // Hide ourselves.
-                    Title = string.Empty;
-                    Subtitle = string.Empty;
-                    Command = new NoOpCommand();
-                    return;
-                }
-
-                if (results.Count == 1)
-                {
-                    // Exit 3: We searched for the file, and found exactly one thing. Awesome!
-                    // Return it.
-                    Title = results[0].Title;
-                    Subtitle = results[0].Subtitle;
-                    Icon = results[0].Icon;
-                    Command = results[0].Command;
-                    MoreCommands = results[0].MoreCommands;
-
-                    return;
-                }
-
-                // Exit 4: We found more than one result. Make our command take
-                // us to the file search page, prepopulated with this search.
-                var indexerPage = new IndexerPage(query, _searchEngine, _queryCookie, results);
-                Title = string.Format(CultureInfo.CurrentCulture, fallbackItemSearchPageTitleCompositeFormat, query);
-                Icon = Icons.FileExplorer;
-                Subtitle = Resources.Indexer_Subtitle;
-                Command = indexerPage;
-
-                return;
-            }
-            catch
-            {
-                Title = string.Empty;
-                Subtitle = string.Empty;
-                Icon = null;
-                Command = new NoOpCommand();
-                MoreCommands = null;
-            }
+            Title = string.Empty;
+            Subtitle = string.Empty;
+            Command = new NoOpCommand();
         }
     }
-
-    public void Dispose()
-    {
-        _searchEngine.Dispose();
-        GC.SuppressFinalize(this);
-    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs

@@ -4,22 +4,25 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Ext.Indexer.Data;
+using Microsoft.CmdPal.Ext.Indexer.Indexer;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Storage.Streams;
 
 namespace Microsoft.CmdPal.Ext.Indexer;
 
 internal sealed partial class IndexerPage : DynamicListPage, IDisposable
 {
     private readonly List<IListItem> _indexerListItems = [];
-    private readonly SearchEngine _searchEngine;
-    private readonly bool disposeSearchEngine = true;
 
-    private uint _queryCookie;
+    private SearchQuery _searchQuery = new();
 
-    private string initialQuery = string.Empty;
+    private uint _queryCookie = 10;
 
     public IndexerPage()
     {
@@ -27,31 +30,16 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         Icon = Icons.FileExplorer;
         Name = Resources.Indexer_Title;
         PlaceholderText = Resources.Indexer_PlaceholderText;
-        _searchEngine = new();
-        _queryCookie = 10;
-    }
-
-    public IndexerPage(string query, SearchEngine searchEngine, uint queryCookie, IList<IListItem> firstPageData)
-    {
-        Icon = Icons.FileExplorer;
-        Name = Resources.Indexer_Title;
-        _searchEngine = searchEngine;
-        _queryCookie = queryCookie;
-        _indexerListItems.AddRange(firstPageData);
-        initialQuery = query;
-        SearchText = query;
-        disposeSearchEngine = false;
     }
 
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
-        if (oldSearch != newSearch && newSearch != initialQuery)
+        if (oldSearch != newSearch)
         {
             _ = Task.Run(() =>
             {
                 Query(newSearch);
                 LoadMore();
-                initialQuery = string.Empty;
             });
         }
     }
@@ -61,9 +49,7 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
     public override void LoadMore()
     {
         IsLoading = true;
-        var results = _searchEngine.FetchItems(_indexerListItems.Count, 20, _queryCookie, out var hasMore);
-        _indexerListItems.AddRange(results);
-        HasMoreItems = hasMore;
+        FetchItems(20);
         IsLoading = false;
         RaiseItemsChanged(_indexerListItems.Count);
     }
@@ -72,16 +58,70 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
     {
         ++_queryCookie;
         _indexerListItems.Clear();
+        _searchQuery.SearchResults.Clear();
+        _searchQuery.CancelOutstandingQueries();
 
-        _searchEngine.Query(query, _queryCookie);
+        if (query == string.Empty)
+        {
+            return;
+        }
+
+        Stopwatch stopwatch = new();
+        stopwatch.Start();
+
+        _searchQuery.Execute(query, _queryCookie);
+
+        stopwatch.Stop();
+        Logger.LogDebug($"Query time: {stopwatch.ElapsedMilliseconds} ms, query: \"{query}\"");
+    }
+
+    private void FetchItems(int limit)
+    {
+        if (_searchQuery != null)
+        {
+            var cookie = _searchQuery.Cookie;
+            if (cookie == _queryCookie)
+            {
+                var index = 0;
+                SearchResult result;
+
+                var hasMoreItems = _searchQuery.FetchRows(_indexerListItems.Count, limit);
+
+                while (!_searchQuery.SearchResults.IsEmpty && _searchQuery.SearchResults.TryDequeue(out result) && ++index <= limit)
+                {
+                    IconInfo icon = null;
+                    try
+                    {
+                        var stream = ThumbnailHelper.GetThumbnail(result.LaunchUri).Result;
+                        if (stream != null)
+                        {
+                            var data = new IconData(RandomAccessStreamReference.CreateFromStream(stream));
+                            icon = new IconInfo(data, data);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Failed to get the icon.", ex);
+                    }
+
+                    _indexerListItems.Add(new IndexerListItem(new IndexerItem
+                    {
+                        FileName = result.ItemDisplayName,
+                        FullPath = result.LaunchUri,
+                    })
+                    {
+                        Icon = icon,
+                    });
+                }
+
+                HasMoreItems = hasMoreItems;
+            }
+        }
     }
 
     public void Dispose()
     {
-        if (disposeSearchEngine)
-        {
-            _searchEngine.Dispose();
-            GC.SuppressFinalize(this);
-        }
+        _searchQuery = null;
+        GC.SuppressFinalize(this);
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs

@@ -123,15 +123,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Search for &quot;{0}&quot; in files.
-        /// </summary>
-        internal static string Indexer_fallback_searchPage_title {
-            get {
-                return ResourceManager.GetString("Indexer_fallback_searchPage_title", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This file doesn&apos;t exist.
         /// </summary>
@@ -177,42 +168,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Always on.
-        /// </summary>
-        internal static string Indexer_Settings_FallbackCommand_AlwaysOn {
-            get {
-                return ResourceManager.GetString("Indexer_Settings_FallbackCommand_AlwaysOn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only when file path exist.
-        /// </summary>
-        internal static string Indexer_Settings_FallbackCommand_FilePathExist {
-            get {
-                return ResourceManager.GetString("Indexer_Settings_FallbackCommand_FilePathExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shows file search results on the top-level search results.
-        /// </summary>
-        internal static string Indexer_Settings_FallbackCommand_Mode {
-            get {
-                return ResourceManager.GetString("Indexer_Settings_FallbackCommand_Mode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Always off.
-        /// </summary>
-        internal static string Indexer_Settings_FallbackCommand_Off {
-            get {
-                return ResourceManager.GetString("Indexer_Settings_FallbackCommand_Off", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search files on this device.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx

@@ -156,25 +156,10 @@
   <data name="Indexer_PlaceholderText" xml:space="preserve">
     <value>Search for files and folders...</value>
   </data>
-  <data name="Indexer_Settings_FallbackCommand_AlwaysOn" xml:space="preserve">
-    <value>Always on</value>
-  </data>
-  <data name="Indexer_Settings_FallbackCommand_Mode" xml:space="preserve">
-    <value>Shows file search results on the top-level search results</value>
-  </data>
-  <data name="Indexer_Settings_FallbackCommand_Off" xml:space="preserve">
-    <value>Always off</value>
-  </data>
-  <data name="Indexer_Settings_FallbackCommand_FilePathExist" xml:space="preserve">
-    <value>Only when file path exist</value>
-  </data>
   <data name="Indexer_Subtitle" xml:space="preserve">
     <value>Search files on this device</value>
   </data>
   <data name="Indexer_Title" xml:space="preserve">
     <value>Search files</value>
   </data>
-  <data name="Indexer_fallback_searchPage_title" xml:space="preserve">
-    <value>Search for "{0}" in files</value>
-  </data>
 </root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/SearchEngine.cs

@@ -1,95 +0,0 @@
-// 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 System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Indexer.Data;
-using Microsoft.CmdPal.Ext.Indexer.Indexer;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Storage.Streams;
-
-namespace Microsoft.CmdPal.Ext.Indexer;
-
-public sealed partial class SearchEngine : IDisposable
-{
-    private SearchQuery _searchQuery = new();
-
-    public void Query(string query, uint queryCookie)
-    {
-        // _indexerListItems.Clear();
-        _searchQuery.SearchResults.Clear();
-        _searchQuery.CancelOutstandingQueries();
-
-        if (query == string.Empty)
-        {
-            return;
-        }
-
-        Stopwatch stopwatch = new();
-        stopwatch.Start();
-
-        _searchQuery.Execute(query, queryCookie);
-
-        stopwatch.Stop();
-        Logger.LogDebug($"Query time: {stopwatch.ElapsedMilliseconds} ms, query: \"{query}\"");
-    }
-
-    public IList<IListItem> FetchItems(int offset, int limit, uint queryCookie, out bool hasMore)
-    {
-        hasMore = false;
-        var results = new List<IListItem>();
-        if (_searchQuery != null)
-        {
-            var cookie = _searchQuery.Cookie;
-            if (cookie == queryCookie)
-            {
-                var index = 0;
-                SearchResult result;
-
-                // var hasMoreItems = _searchQuery.FetchRows(_indexerListItems.Count, limit);
-                var hasMoreItems = _searchQuery.FetchRows(offset, limit);
-
-                while (!_searchQuery.SearchResults.IsEmpty && _searchQuery.SearchResults.TryDequeue(out result) && ++index <= limit)
-                {
-                    IconInfo icon = null;
-                    try
-                    {
-                        var stream = ThumbnailHelper.GetThumbnail(result.LaunchUri).Result;
-                        if (stream != null)
-                        {
-                            var data = new IconData(RandomAccessStreamReference.CreateFromStream(stream));
-                            icon = new IconInfo(data, data);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError("Failed to get the icon.", ex);
-                    }
-
-                    results.Add(new IndexerListItem(new IndexerItem
-                    {
-                        FileName = result.ItemDisplayName,
-                        FullPath = result.LaunchUri,
-                    })
-                    {
-                        Icon = icon,
-                    });
-                }
-
-                hasMore = hasMoreItems;
-            }
-        }
-
-        return results;
-    }
-
-    public void Dispose()
-    {
-        _searchQuery = null;
-        GC.SuppressFinalize(this);
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs

@@ -32,7 +32,6 @@ internal sealed partial class FallbackSystemCommandItem : FallbackCommandItem
     {
         if (string.IsNullOrWhiteSpace(query))
         {
-            Command = null;
             Title = string.Empty;
             Subtitle = string.Empty;
             return;
@@ -59,7 +58,6 @@ internal sealed partial class FallbackSystemCommandItem : FallbackCommandItem
 
         if (result == null)
         {
-            Command = null;
             Title = string.Empty;
             Subtitle = string.Empty;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Pages/SystemCommandPage.cs

@@ -10,12 +10,12 @@ namespace Microsoft.CmdPal.Ext.System.Pages;
 
 public sealed partial class SystemCommandPage : ListPage
 {
-    private readonly SettingsManager _settingsManager;
+    private SettingsManager _settingsManager;
 
     public SystemCommandPage(SettingsManager settingsManager)
     {
-        Title = Resources.Microsoft_plugin_ext_system_page_title;
-        Name = Resources.Microsoft_plugin_command_name_open;
+        Title = Resources.Microsoft_plugin_ext_system_page_name;
+        Name = Resources.Microsoft_plugin_ext_system_page_name;
         Icon = IconHelpers.FromRelativePath("Assets\\SystemCommand.svg");
         _settingsManager = settingsManager;
         ShowDetails = true;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs

@@ -205,7 +205,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to System Commands.
+        ///   Looks up a localized string similar to Windows System Command.
         /// </summary>
         public static string Microsoft_plugin_ext_system_page_name {
             get {
@@ -213,15 +213,6 @@ namespace Microsoft.CmdPal.Ext.System {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Windows System Commands.
-        /// </summary>
-        public static string Microsoft_plugin_ext_system_page_title {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_ext_system_page_title", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Adapter name.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx

@@ -160,11 +160,8 @@
   <data name="Microsoft_plugin_ext_settings_hideDisconnectedNetworkInfo" xml:space="preserve">
     <value>Hide disconnected network info</value>
   </data>
-  <data name="Microsoft_plugin_ext_system_page_title" xml:space="preserve">
-    <value>Windows System Commands</value>
-  </data>
   <data name="Microsoft_plugin_ext_system_page_name" xml:space="preserve">
-    <value>System Commands</value>
+    <value>Windows System Command</value>
   </data>
   <data name="Microsoft_plugin_sys_AdapterName" xml:space="preserve">
     <value>Adapter name</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs

@@ -14,7 +14,7 @@ public partial class SystemCommandExtensionProvider : CommandProvider
     private readonly ICommandItem[] _commands;
     private static readonly SettingsManager _settingsManager = new();
     public static readonly SystemCommandPage Page = new(_settingsManager);
-    private readonly FallbackSystemCommandItem _fallbackSystemItem = new(_settingsManager);
+    private readonly FallbackSystemCommandItem _fallbackFileItem = new(_settingsManager);
 
     public SystemCommandExtensionProvider()
     {
@@ -23,7 +23,7 @@ public partial class SystemCommandExtensionProvider : CommandProvider
         _commands = [
             new CommandItem(Page)
             {
-                Title = Resources.Microsoft_plugin_ext_system_page_title,
+                Title = Resources.Microsoft_plugin_ext_system_page_name,
                 Icon = Page.Icon,
                 MoreCommands = [new CommandContextItem(_settingsManager.Settings.SettingsPage)],
             },
@@ -38,5 +38,5 @@ public partial class SystemCommandExtensionProvider : CommandProvider
         return _commands;
     }
 
-    public override IFallbackCommandItem[] FallbackCommands() => [_fallbackSystemItem];
+    public override IFallbackCommandItem[] FallbackCommands() => [_fallbackFileItem];
 }

src/modules/registrypreview/RegistryPreview.FuzzTests/OneFuzzConfig.json

@@ -20,7 +20,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -61,7 +61,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",

src/modules/registrypreview/RegistryPreview.FuzzTests/RegistryPreview.FuzzTests.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 
   <PropertyGroup>
-    <Platforms>x64;ARM64</Platforms>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+	<Platforms>x64;ARM64</Platforms>
+	<LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml

@@ -27,17 +27,12 @@
                     Severity="Informational" />
 
                 <controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+
                     <tkcontrols:SettingsCard x:Uid="CmdPal_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
                         <controls:ShortcutControl
                             MinWidth="{StaticResource SettingActionControlMinWidth}"
                             HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
                             IsEnabled="False" />
-                        <tkcontrols:SettingsCard.Description>
-                            <HyperlinkButton
-                                x:Name="CmdPalSettingsDeeplink"
-                                x:Uid="CmdPal_DeeplinkContent"
-                                Click="CmdPalSettingsDeeplink_Click" />
-                        </tkcontrols:SettingsCard.Description>
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs

@@ -2,10 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Diagnostics;
-using System.IO;
-using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
@@ -33,37 +29,5 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             ViewModel.RefreshEnabledState();
         }
-
-        private void LaunchApp(string appPath)
-        {
-            try
-            {
-                string dir = Path.GetDirectoryName(appPath);
-
-                var processStartInfo = new ProcessStartInfo
-                {
-                    FileName = appPath,
-                    Arguments = string.Empty,
-                    WorkingDirectory = dir,
-                    UseShellExecute = true,
-                    Verb = "open",
-                    CreateNoWindow = false,
-                };
-
-                Process process = Process.Start(processStartInfo) ?? throw new InvalidOperationException("Failed to start the process.");
-                process.WaitForInputIdle();
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Failed to launch CmdPal settings: {ex.Message}");
-            }
-        }
-
-        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            // Launch CmdPal settings window
-            string launchPath = "x-cmdpal://settings";
-            LaunchApp(launchPath);
-        }
     }
 }

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -4996,8 +4996,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="CmdPal_ActivationShortcut.Header" xml:space="preserve">
     <value>Activation shortcut</value>
   </data>
-  <data name="CmdPal_DeeplinkContent.Content" xml:space="preserve">
-    <value>Open Command Palette settings to customize the activation shortcut</value>
+  <data name="CmdPal_ActivationShortcut.Description" xml:space="preserve">
+    <value>Go to Command Palette settings to customize the activation shortcut.</value>
   </data>
   <data name="Help_chromaCIE" xml:space="preserve">
     <value>chroma (CIE LCh)</value>