shell:appsfolder launch does not respect the command line

2026-01-08 05:17:03 +01:00 · 2025-05-15 10:50:08 +08:00
57 changed files with 161 additions and 513 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1535,7 +1535,6 @@ SMALLICON
 smartphone
 SMTO
 SNAPPROCESS
-snk
 snwprintf
 softline
 SOURCECLIENTAREAONLY
--- a/.pipelines/272MSSharedLibSN2048.snk
+++ b/.pipelines/272MSSharedLibSN2048.snk
--- a/.pipelines/ESRPSigning_sdk.json
+++ b/.pipelines/ESRPSigning_sdk.json
@@ -4,66 +4,9 @@
    "SignBatches": [
        {
            "MatchedPath": [
+                "Microsoft.CommandPalette.Extensions.dll",
                "Microsoft.CommandPalette.Extensions.Toolkit.dll"
            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameSign",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameVerify",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        },
-        {
-            "MatchedPath": [
-                "Microsoft.CommandPalette.Extensions.dll"
-            ],
            "SigningInfo": {
                "Operations": [
                    {
--- a/.pipelines/UpdateVersions.ps1
+++ b/.pipelines/UpdateVersions.ps1
@@ -126,15 +126,16 @@ Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
 }

 # Update Directory.Packages.props file
-Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
+$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
+if (Test-Path $propsFile) {
+    $file = Read-FileWithEncoding -Path $propsFile
    $content = $file.Content
    if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
        $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
        $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName
+        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $propsFile
    }
 }

@@ -143,8 +144,8 @@ Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
    $file = Read-FileWithEncoding -Path $_.FullName
    $content = $file.Content
    if ($content -match '\\Microsoft.WindowsAppSDK.') {
-        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion
-        $oldVersionString = '\\Microsoft.WindowsAppSDK.(?=[-.0-9a-zA-Z]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
        $content = $content -replace $oldVersionString, $newVersionString
        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
        Write-Host "Modified " $_.FullName
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -55,7 +55,7 @@
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1472,7 +1472,7 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.7.250513003
+- Microsoft.WindowsAppSDK 1.7.250401001
 - Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
--- a/README.md
+++ b/README.md
@@ -37,17 +37,17 @@ Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and cl
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.0/PowerToysUserSetup-0.91.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.0/PowerToysUserSetup-0.91.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.0/PowerToysSetup-0.91.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.0/PowerToysSetup-0.91.0-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.91.1-x64.exe][ptUserX64] | 42EA4A3E8C79A5456476D19E72B3E2AB9393A89C4DC7442EB7EE5A1E3490D38A |
-| Per user - ARM64     | [PowerToysUserSetup-0.91.1-arm64.exe][ptUserArm64] | F3F433FE04049F9197411D792AADEBF34E3BE7FE16327BD8B73D2A046ED8BAF6 |
-| Machine wide - x64   | [PowerToysSetup-0.91.1-x64.exe][ptMachineX64] | EC4BC3A8625775866B0ED4577CCF83E6EC7B1A0AD267379DDBAF4FE49C7B5BDD |
-| Machine wide - ARM64 | [PowerToysSetup-0.91.1-arm64.exe][ptMachineArm64] | 9CB8911008420D0E446AE3D5CE365E447FA4DF9DCF9337F3A80F933C00FC3689 |
+| Per user - x64       | [PowerToysUserSetup-0.91.0-x64.exe][ptUserX64] | 190DD702EDE2D3AC27A253DF8BC2416B1AF05E6594FF25CABEE844E6D3C8CCB0 |
+| Per user - ARM64     | [PowerToysUserSetup-0.91.0-arm64.exe][ptUserArm64] | BE6C964C40147B5F7838E51A13837347756CC45E6AC5BC0DD11AF9AF605ABDCD |
+| Machine wide - x64   | [PowerToysSetup-0.91.0-x64.exe][ptMachineX64] | 2308D896D9A66C56B98AC8B3CE9B7C945C7A2315551E36C118C7ECAC4A6D05C2 |
+| Machine wide - ARM64 | [PowerToysSetup-0.91.0-arm64.exe][ptMachineArm64] | 28BD1FEFA22C52279C6B600E677B425B014D1F9190EA449D6C63FC2702092DA3 |

 This is our preferred method.

--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
@@ -153,7 +153,7 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
  </Target>
 </Project>
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -4,5 +4,5 @@
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>
--- a/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp
+++ b/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp
@@ -567,7 +567,7 @@ public:
        executable_args.append(L"\" & echo \"Adding an inbound firewall rule for PowerToys.MouseWithoutBorders.exe\"");
        executable_args.append(L" & netsh advfirewall firewall add rule name=\"PowerToys.MouseWithoutBorders\" dir=in action=allow program=\"");
        executable_args.append(executable_path);
-        executable_args.append(L"\" enable=yes remoteip=any profile=any protocol=tcp & pause\"");
+        executable_args.append(L"\" enable=yes remoteip=LocalSubnet profile=any protocol=tcp & pause\"");

        SHELLEXECUTEINFOW sei{ sizeof(sei) };
        sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
--- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
+++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
@@ -217,9 +217,7 @@ public:
        CmdPal::m_enabled.store(true);

        std::wstring packageName = L"Microsoft.CommandPalette";
-        // Launch CmdPal as normal user using explorer
-        std::wstring launchPath = L"explorer.exe";
-        std::wstring launchArgs = L"x-cmdpal://background";
+        std::wstring launchPath = L"x-cmdpal://background";
 #ifdef IS_DEV_BRANDING
        packageName = L"Microsoft.CommandPalette.Dev";
 #endif
@@ -270,13 +268,13 @@ public:
        if (!firstEnableCall)
        {
            Logger::trace("Not first attempt, try to launch");
-            LaunchApp(launchPath, launchArgs, false /*no elevated*/, false /*error pop up*/);
+            LaunchApp(launchPath, L"", false /*no elevated*/, false /*error pop up*/);
        }
        else
        {
            // If first time enable, do retry launch.
            Logger::trace("First attempt, try to launch");
-            std::thread launchThread(&CmdPal::RetryLaunch, launchPath, launchArgs);
+            std::thread launchThread(&CmdPal::RetryLaunch, launchPath);
            launchThread.detach();
        }

@@ -291,14 +289,14 @@ public:
        CmdPal::m_enabled.store(false);
    }

-    static void RetryLaunch(std::wstring path, std::wstring cmdArgs)
+    static void RetryLaunch(std::wstring path)
    {
        const int base_delay_milliseconds = 1000;
        int max_retry = 9; // 2**9 - 1 seconds. Control total wait time within 10 min.
        int retry = 0;
        do
        {
-            auto launch_result = LaunchApp(path, cmdArgs, false, retry < max_retry);
+            auto launch_result = LaunchApp(path, L"", false, retry < max_retry);
            if (launch_result)
            {
                Logger::info(L"CmdPal launched successfully after {} retries.", retry);
@@ -350,4 +348,4 @@ std::atomic<bool> CmdPal::m_launched{ false };
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
    return new CmdPal();
-}
+}
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
  <PropertyGroup>
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
@@ -9,7 +9,7 @@
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <RootNamespace>TemplateCmdPalExtension</RootNamespace>
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
  <PropertyGroup>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListItemViewModel.cs
@@ -107,17 +107,17 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte

    private void UpdateTags(ITag[]? newTagsFromModel)
    {
-        var newTags = newTagsFromModel?.Select(t =>
-        {
-            var vm = new TagViewModel(t, PageContext);
-            vm.InitializeProperties();
-            return vm;
-        })
-            .ToList() ?? [];
-
        DoOnUiThread(
            () =>
            {
+                var newTags = newTagsFromModel?.Select(t =>
+                {
+                    var vm = new TagViewModel(t, PageContext);
+                    vm.InitializeProperties();
+                    return vm;
+                })
+                    .ToList() ?? [];
+
                // Tags being an ObservableCollection instead of a List lead to
                // many COM exception issues.
                Tags = new(newTags);
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ShellViewModel.cs
@@ -4,6 +4,7 @@

 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using CommunityToolkit.Common;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -108,11 +109,13 @@ public partial class ShellViewModel(IServiceProvider _serviceProvider, TaskSched
                    // TODO GH #239 switch back when using the new MD text block
                    // _ = _queue.EnqueueAsync(() =>
                    _ = Task.Factory.StartNew(
-                        () =>
+                        async () =>
                        {
                            // bool f = await viewModel.InitializeCommand.ExecutionTask.;
                            // var result = viewModel.InitializeCommand.ExecutionTask.GetResultOrDefault()!;
                            // var result = viewModel.InitializeCommand.ExecutionTask.GetResultOrDefault<bool?>()!;
+                            var result = await viewModel.InitializeAsync();
+
                            CurrentPage = viewModel; // result ? viewModel : null;
                            ////LoadedState = result ? ViewModelLoadedState.Loaded : ViewModelLoadedState.Error;
                        },
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup>
    <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
  </PropertyGroup>
  <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
  <PropertyGroup Label="Globals">
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateHelper.cs
@@ -35,7 +35,7 @@ public static class CalculateHelper
    {
        if (string.IsNullOrWhiteSpace(input))
        {
-            return false;
+            throw new ArgumentNullException(paramName: nameof(input));
        }

        if (!RegValidExpressChar.IsMatch(input))
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs
@@ -32,11 +32,6 @@ public static partial class QueryHelper
        NumberTranslator translator = NumberTranslator.Create(inputCulture, new CultureInfo("en-US"));
        var input = translator.Translate(query.Normalize(NormalizationForm.FormKC));

-        if (string.IsNullOrWhiteSpace(input))
-        {
-            return ErrorHandler.OnError(isFallbackSearch, query, Properties.Resources.calculator_expression_empty);
-        }
-
        if (!CalculateHelper.InputValid(input))
        {
            return null;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.Designer.cs
@@ -132,15 +132,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Please enter an expression.
-        /// </summary>
-        public static string calculator_expression_empty {
-            get {
-                return ResourceManager.GetString("calculator_expression_empty", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Expression wrong or incomplete.
        /// </summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.resx
@@ -199,7 +199,4 @@
  <data name="calculator_copy_binary" xml:space="preserve">
    <value>Copy binary</value>
  </data>
-  <data name="calculator_expression_empty" xml:space="preserve">
-    <value>Please enter an expression</value>
-  </data>
 </root>
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs
@@ -16,6 +16,6 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit;
 [JsonSerializable(typeof(List<ChoiceSetSetting>))]
 [JsonSerializable(typeof(Dictionary<string, object>), TypeInfoPropertyName = "Dictionary")]
 [JsonSourceGenerationOptions(UseStringEnumConverter = true, WriteIndented = true)]
-internal sealed partial class JsonSerializationContext : JsonSerializerContext
+internal partial class JsonSerializationContext : JsonSerializerContext
 {
 }
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/MatchOption.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/MatchOption.cs
@@ -5,6 +5,8 @@
 using System;
 using System.Runtime.CompilerServices;

+[assembly: InternalsVisibleTo("Microsoft.Plugin.Program.UnitTests")]
+
 namespace Microsoft.CommandPalette.Extensions.Toolkit;

 public partial class MatchOption
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/MatchResult.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/MatchResult.cs
@@ -4,6 +4,8 @@

 using System.Runtime.CompilerServices;

+[assembly: InternalsVisibleTo("Microsoft.Plugin.Program.UnitTests")]
+
 namespace Microsoft.CommandPalette.Extensions.Toolkit;

 public partial class MatchResult
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Microsoft.CommandPalette.Extensions.Toolkit.csproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Microsoft.CommandPalette.Extensions.Toolkit.csproj
@@ -15,12 +15,6 @@
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(CIBuild)'=='true'">
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\..\..\..\.pipelines\272MSSharedLibSN2048.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
  <PropertyGroup>
    <CsWinRTIncludes>Microsoft.CommandPalette.Extensions</CsWinRTIncludes>
    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PathToRoot>..\..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
    <CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
    <WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428</WindowsSdkBuildToolsNuget>
    <WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40</WebView2Nuget>
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config
@@ -3,5 +3,5 @@
  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>
--- a/src/modules/cmdpal/extensionsdk/nuget/BuildSDKHelper.ps1
+++ b/src/modules/cmdpal/extensionsdk/nuget/BuildSDKHelper.ps1
@@ -69,10 +69,6 @@ if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "build")) {
          ("/p:VersionNumber="+$VersionOfSDK)
          )

-        if ($IsAzurePipelineBuild) {
-          $msbuildArgs += "/p:CIBuild=true"
-        }
-
        & $msbuildPath $msbuildArgs
      }
    }
--- a/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
+++ b/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
@@ -14,70 +14,12 @@ namespace PowerLauncher.Helper
 {
    public static class ErrorReporting
    {
-        private const string LoggerName = "UnHandledException";
-
-        public static void ShowMessageBox(string title, string message)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                MessageBox.Show(message, title);
-            });
-        }
-
-        public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
-        {
-            // handle non-ui thread exceptions
-            System.Windows.Application.Current.Dispatcher.Invoke(() =>
-            {
-                HandleException(e?.ExceptionObject as Exception, true);
-            });
-        }
-
-        public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
-        {
-            if (e != null)
-            {
-                // handle ui thread exceptions
-                HandleException(e.Exception, false);
-
-                // prevent application exist, so the user can copy prompted error info
-                e.Handled = true;
-            }
-        }
-
-        public static string RuntimeInfo()
-        {
-            var info = $"\nVersion: {Constant.Version}" +
-                       $"\nOS Version: {Environment.OSVersion.VersionString}" +
-                       $"\nIntPtr Length: {IntPtr.Size}" +
-                       $"\nx64: {Environment.Is64BitOperatingSystem}";
-            return info;
-        }
-
-        private static void HandleException(Exception e, bool isNotUIThread)
-        {
-            // The crash occurs in PresentationFramework.dll, not necessarily when the Runner UI is visible, originating from this line:
-            // https://github.com/dotnet/wpf/blob/3439f20fb8c685af6d9247e8fd2978cac42e74ac/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Shell/WindowChromeWorker.cs#L1005
-            // Many bug reports because users see the "Report problem UI" after "the" crash with System.Runtime.InteropServices.COMException 0xD0000701 or 0x80263001.
-            // However, displaying this "Report problem UI" during WPF crashes, especially when DWM composition is changing, is not ideal; some users reported it hangs for up to a minute before the "Report problem UI" appears.
-            // This change modifies the behavior to log the exception instead of showing the "Report problem UI".
-            if (IsDwmCompositionException(e as System.Runtime.InteropServices.COMException))
-            {
-                var logger = LogManager.GetLogger(LoggerName);
-                logger.Error($"From {(isNotUIThread ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
-            }
-            else
-            {
-                Report(e, isNotUIThread);
-            }
-        }
-
        private static void Report(Exception e, bool waitForClose)
        {
            if (e != null)
            {
-                var logger = LogManager.GetLogger(LoggerName);
-                logger.Fatal($"From {(waitForClose ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
+                var logger = LogManager.GetLogger("UnHandledException");
+                logger.Fatal(ExceptionFormatter.FormatException(e));

                var reportWindow = new ReportWindow(e);

@@ -92,21 +34,39 @@ namespace PowerLauncher.Helper
            }
        }

-        private static bool IsDwmCompositionException(System.Runtime.InteropServices.COMException comException)
+        public static void ShowMessageBox(string title, string message)
        {
-            if (comException == null)
+            Application.Current.Dispatcher.Invoke(() =>
            {
-                return false;
-            }
+                MessageBox.Show(message, title);
+            });
+        }

-            var stackTrace = comException.StackTrace;
-            if (string.IsNullOrEmpty(stackTrace))
+        public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
+        {
+            // handle non-ui thread exceptions
+            System.Windows.Application.Current.Dispatcher.Invoke(() =>
            {
-                return false;
-            }
+                Report((Exception)e?.ExceptionObject, true);
+            });
+        }

-            // Check for common DWM composition changed patterns in the stack trace
-            return stackTrace.Contains("DwmCompositionChanged");
+        public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        {
+            // handle ui thread exceptions
+            Report(e?.Exception, false);
+
+            // prevent application exist, so the user can copy prompted error info
+            e.Handled = true;
+        }
+
+        public static string RuntimeInfo()
+        {
+            var info = $"\nVersion: {Constant.Version}" +
+                       $"\nOS Version: {Environment.OSVersion.VersionString}" +
+                       $"\nIntPtr Length: {IntPtr.Size}" +
+                       $"\nx64: {Environment.Is64BitOperatingSystem}";
+            return info;
        }
    }
 }
--- a/src/modules/peek/Peek.UI/Peek.UI.csproj
+++ b/src/modules/peek/Peek.UI/Peek.UI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<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.SelfContained.props" />
--- a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.cs
@@ -62,11 +62,11 @@ public partial class PowerAccent : IDisposable

    private void SetEvents()
    {
-        _keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey) =>
+        _keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey, TriggerKey trigger ) =>
        {
            System.Windows.Application.Current.Dispatcher.Invoke(() =>
            {
-                ShowToolbar(letterKey);
+                ShowToolbar(letterKey, trigger);
            });
        }));

@@ -92,23 +92,15 @@ public partial class PowerAccent : IDisposable
        }));
    }

-    private void ShowToolbar(LetterKey letterKey)
+    private void ShowToolbar(LetterKey letterKey, TriggerKey trigger)
    {
        _visible = true;

        _characters = GetCharacters(letterKey);
        _characterDescriptions = GetCharacterDescriptions(_characters);
        _showUnicodeDescription = _settingService.ShowUnicodeDescription;
-
-        Task.Delay(_settingService.InputTime).ContinueWith(
-        t =>
-        {
-            if (_visible)
-            {
-                OnChangeDisplay?.Invoke(true, _characters);
-            }
-        },
-        TaskScheduler.FromCurrentSynchronizationContext());
+        OnChangeDisplay?.Invoke(true, _characters);
+        ProcessNextChar(trigger, false);
    }

    private string[] GetCharacters(LetterKey letterKey)
--- a/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp
+++ b/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp
@@ -13,7 +13,7 @@
 namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 {
    KeyboardListener::KeyboardListener() :
-        m_toolbarVisible(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
+           m_toolbarVisible(false), m_activationKeyHold(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
    {
        s_instance = this;
        LoggerHelpers::init_logger(L"PowerAccent", L"PowerAccentKeyboardService", "PowerAccent");
@@ -53,8 +53,8 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation

    void KeyboardListener::SetShowToolbarEvent(ShowToolbar showToolbarEvent)
    {
-        m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key) {
-            trigger(key);
+        m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key, TriggerKey triggerKey) {
+            trigger(key, triggerKey);
        };
    }

@@ -152,6 +152,17 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
        return false;
    }

+    void KeyboardListener::BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger)
+    {
+        std::unique_lock<std::mutex> lock(toolbarMutex);
+        auto result = toolbarCV.wait_for(lock, delay);
+        if (result == std::cv_status::timeout)
+        {
+            m_toolbarVisible = true;
+            m_showToolbarCb(key, trigger);
+        }
+    }
+
    bool KeyboardListener::OnKeyDown(KBDLLHOOKSTRUCT info) noexcept
    {
        auto letterKey = static_cast<LetterKey>(info.vkCode);
@@ -199,7 +210,7 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
            }
        }

-        if (!m_toolbarVisible && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
+        if (!m_toolbarVisible && !m_activationKeyHold && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
        {
            Logger::debug(L"Show toolbar. Letter: {}, Trigger: {}", letterPressed, triggerPressed);

@@ -207,11 +218,21 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
            m_triggeredWithSpace = triggerPressed == VK_SPACE;
            m_triggeredWithLeftArrow = triggerPressed == VK_LEFT;
            m_triggeredWithRightArrow = triggerPressed == VK_RIGHT;
-            m_toolbarVisible = true;
-            m_showToolbarCb(letterPressed);
+            m_activationKeyHold = true;
+            m_bothKeysPressed = true;
+            if (toolbarThread != nullptr)
+            {
+                toolbarCV.notify_all();
+                toolbarThread->join();
+            }
+            toolbarThread = std::make_unique<std::thread>(std::bind(&KeyboardListener::BeginShowToolbar, this, m_settings.inputTime, letterPressed,static_cast<TriggerKey>(triggerPressed)));
        }

-        if (m_toolbarVisible && triggerPressed)
+        if (m_activationKeyHold && triggerPressed && !m_toolbarVisible)
+        {
+            return true;
+        }
+        else if (m_toolbarVisible && triggerPressed)
        {
            if (triggerPressed == VK_LEFT)
            {
@@ -251,8 +272,9 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
        {
            letterPressed = LetterKey::None;

-            if (m_toolbarVisible)
+            if (m_toolbarVisible || m_bothKeysPressed)
            {
+                m_bothKeysPressed = false;
                if (m_stopwatch.elapsed() < m_settings.inputTime)
                {
                    Logger::debug(L"Activation too fast. Do nothing.");
@@ -280,11 +302,18 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
                Logger::debug(L"Hide toolbar event and input char");

                m_hideToolbarCb(InputType::Char);
-
                m_toolbarVisible = false;
            }
        }

+        auto triggerPressed = info.vkCode;
+
+        if (m_activationKeyHold && (letterPressed == LetterKey::None || (triggerPressed == VK_SPACE || triggerPressed == VK_LEFT || triggerPressed == VK_RIGHT)))
+        {
+            m_activationKeyHold = false;
+            toolbarCV.notify_all();
+        }
+
        return false;
    }

--- a/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.h
+++ b/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.h
@@ -2,6 +2,7 @@

 #include "KeyboardListener.g.h"
 #include <mutex>
+#include <thread>
 #include <spdlog/stopwatch.h>

 namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
@@ -44,6 +45,7 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
        static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);

    private:
+        void BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger);
        bool OnKeyDown(KBDLLHOOKSTRUCT info) noexcept;
        bool OnKeyUp(KBDLLHOOKSTRUCT info) noexcept;
        bool IsSuppressedByGameMode();
@@ -51,9 +53,14 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation

        static inline KeyboardListener* s_instance;
        HHOOK s_llKeyboardHook = nullptr;
-        bool m_toolbarVisible;
+        std::atomic<bool> m_toolbarVisible;
+        bool m_activationKeyHold;
+        bool m_bothKeysPressed = false;
+        std::unique_ptr<std::thread> toolbarThread;
+        std::mutex toolbarMutex;
+        std::condition_variable toolbarCV;
        PowerAccentSettings m_settings;
-        std::function<void(LetterKey)> m_showToolbarCb;
+        std::function<void(LetterKey, TriggerKey)> m_showToolbarCb;
        std::function<void(InputType)> m_hideToolbarCb;
        std::function<void(TriggerKey, bool)> m_nextCharCb;
        std::function<bool(LetterKey)> m_isLanguageLetterCb;
--- a/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.idl
+++ b/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.idl
@@ -67,7 +67,7 @@ namespace PowerToys
            Char
        };

-        [version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key);
+        [version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key, TriggerKey trigger);
        [version(1.0), uuid(8eb79d6b-1826-424f-9fbc-af21ae19725e)] delegate void HideToolbar(InputType inputType);
        [version(1.0), uuid(db72d45c-a5a2-446f-bdc1-506e9121764a)] delegate void NextChar(TriggerKey inputSpace, boolean shiftPressed);
        [version(1.0), uuid(20be2919-2b91-4313-b6e0-4c3484fe91ef)] delegate void IsLanguageLetter(LetterKey key, [out] boolean* result);
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
@@ -207,7 +207,7 @@
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
    <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
    <Import Project="..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" />
  </ImportGroup>
@@ -221,8 +221,8 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.87.0\build\boost.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets'))" />
  </Target>
--- a/src/modules/powerrename/PowerRenameUILib/packages.config
+++ b/src/modules/powerrename/PowerRenameUILib/packages.config
@@ -6,5 +6,5 @@
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>
--- a/src/runner/Resources.resx
+++ b/src/runner/Resources.resx
@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
@@ -148,7 +89,7 @@
    <value>This setting has been disabled by your administrator.</value>
  </data>
  <data name="STARTUP_DISABLED_BY_USER" xml:space="preserve">
-    <value>This setting has been disabled manually via &lt;a href="https://ms_settings_startupapps" target="_blank"&gt;Startup Settings&lt;/a&gt;.</value>
+    <value>This setting has been disabled manually via &lt;a href=&quot;https://ms_settings_startupapps&quot; target=&quot;_blank&quot;&gt;Startup Settings&lt;/a&gt;.</value>
  </data>
  <data name="GITHUB_NEW_VERSION_AVAILABLE" xml:space="preserve">
    <value>An update to PowerToys is available.</value>
@@ -180,9 +121,6 @@
    <value>Exit</value>
    <comment>Exit as a verb, as in Exit the application</comment>
  </data>
-  <data name="SHOW_TRAY_ICON_MENU_TEXT" xml:space="preserve">
-    <value>Show icon</value>
-  </data>
  <data name="SUBMIT_BUG_TEXT" xml:space="preserve">
    <value>Report bug</value>
  </data>
@@ -196,4 +134,4 @@
  <data name="TRAY_ICON_ADMIN_TOOLTIP" xml:space="preserve">
    <value>Administrator</value>
  </data>
-</root>
+</root>
--- a/src/runner/general_settings.cpp
+++ b/src/runner/general_settings.cpp
@@ -1,7 +1,6 @@
 #include "pch.h"
 #include "general_settings.h"
 #include "auto_start_helper.h"
-#include "tray_icon.h"
 #include "Generated files/resource.h"

 #include <common/SettingsAPI/settings_helpers.h>
@@ -15,7 +14,6 @@

 // TODO: would be nice to get rid of these globals, since they're basically cached json settings
 static std::wstring settings_theme = L"system";
-static bool show_tray_icon = true;
 static bool run_as_elevated = false;
 static bool show_new_updates_toast_notification = true;
 static bool download_updates_automatically = true;
@@ -40,7 +38,6 @@ json::JsonObject GeneralSettings::to_json()
    }
    result.SetNamedValue(L"enabled", std::move(enabled));

-    result.SetNamedValue(L"show_tray_icon", json::value(showSystemTrayIcon));
    result.SetNamedValue(L"is_elevated", json::value(isElevated));
    result.SetNamedValue(L"run_elevated", json::value(isRunElevated));
    result.SetNamedValue(L"show_new_updates_toast_notification", json::value(showNewUpdatesToastNotification));
@@ -77,9 +74,7 @@ json::JsonObject load_general_settings()
 GeneralSettings get_general_settings()
 {
    const bool is_user_admin = check_user_is_admin();
-    GeneralSettings settings
-    {
-        .showSystemTrayIcon = show_tray_icon,
+    GeneralSettings settings{
        .isElevated = is_process_elevated(),
        .isRunElevated = run_as_elevated,
        .isAdmin = is_user_admin,
@@ -219,13 +214,6 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
        settings_theme = general_configs.GetNamedString(L"theme");
    }

-    if (json::has(general_configs, L"show_tray_icon", json::JsonValueType::Boolean))
-    {
-        show_tray_icon = general_configs.GetNamedBoolean(L"show_tray_icon");
-        // Update tray icon visibility when setting is toggled
-        set_tray_icon_visible(show_tray_icon);
-    }
-
    if (save)
    {
        GeneralSettings save_settings = get_general_settings();
--- a/src/runner/general_settings.h
+++ b/src/runner/general_settings.h
@@ -5,7 +5,6 @@
 struct GeneralSettings
 {
    bool isStartupEnabled;
-    bool showSystemTrayIcon;
    std::wstring startupDisabledReason;
    std::map<std::wstring, bool> isModulesEnabledMap;
    bool isElevated;
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -90,7 +90,6 @@ void open_menu_from_another_instance(std::optional<std::string> settings_window)
        msg = static_cast<LPARAM>(ESettingsWindowNames_from_string(settings_window.value()));
    }
    PostMessageW(hwnd_main, WM_COMMAND, ID_SETTINGS_MENU_COMMAND, msg);
-    SetForegroundWindow(hwnd_main); // Bring the settings window to the front
 }

 int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow, bool openOobe, bool openScoobe, bool showRestartNotificationAfterUpdate)
@@ -105,7 +104,6 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
 #endif
    Trace::RegisterProvider();
    start_tray_icon(isProcessElevated);
-    set_tray_icon_visible(get_general_settings().showSystemTrayIcon);
    CentralizedKeyboardHook::Start();

    int result = -1;
--- a/src/runner/resource.base.h
+++ b/src/runner/resource.base.h
@@ -20,5 +20,4 @@
 #define ID_ABOUT_MENU_COMMAND 40003
 #define ID_REPORT_BUG_COMMAND 40004
 #define ID_DOCUMENTATION_MENU_COMMAND 40005
-#define ID_QUICK_ACCESS_MENU_COMMAND 40006
-#define ID_SHOW_TRAY_ICON_MENU_COMMAND 40007
+#define ID_QUICK_ACCESS_MENU_COMMAND 40006
--- a/src/runner/runner.base.rc
+++ b/src/runner/runner.base.rc
--- a/src/runner/tray_icon.cpp
+++ b/src/runner/tray_icon.cpp
@@ -2,7 +2,6 @@
 #include "Generated files/resource.h"
 #include "settings_window.h"
 #include "tray_icon.h"
-#include "general_settings.h"
 #include "centralized_hotkeys.h"
 #include "centralized_kb_hook.h"
 #include <Windows.h>
@@ -91,13 +90,6 @@ void handle_tray_command(HWND window, const WPARAM command_id, LPARAM lparam)
        }
        DestroyWindow(window);
        break;
-    case ID_SHOW_TRAY_ICON_MENU_COMMAND:
-    {
-        GeneralSettings settings = get_general_settings();
-        settings.showSystemTrayIcon = true;
-        apply_general_settings(settings.to_json(), true);
-        break;
-    }
    case ID_ABOUT_MENU_COMMAND:
        if (!about_box_shown)
        {
@@ -199,13 +191,11 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
                {
                    static std::wstring settings_menuitem_label = GET_RESOURCE_STRING(IDS_SETTINGS_MENU_TEXT);
                    static std::wstring exit_menuitem_label = GET_RESOURCE_STRING(IDS_EXIT_MENU_TEXT);
-                    static std::wstring show_tray_icon_menuitem_label = GET_RESOURCE_STRING(IDS_SHOW_TRAY_ICON_MENU_TEXT);
                    static std::wstring submit_bug_menuitem_label = GET_RESOURCE_STRING(IDS_SUBMIT_BUG_TEXT);
                    static std::wstring documentation_menuitem_label = GET_RESOURCE_STRING(IDS_DOCUMENTATION_MENU_TEXT);
                    static std::wstring quick_access_menuitem_label = GET_RESOURCE_STRING(IDS_QUICK_ACCESS_MENU_TEXT);
                    change_menu_item_text(ID_SETTINGS_MENU_COMMAND, settings_menuitem_label.data());
                    change_menu_item_text(ID_EXIT_MENU_COMMAND, exit_menuitem_label.data());
-                    change_menu_item_text(ID_SHOW_TRAY_ICON_MENU_COMMAND, show_tray_icon_menuitem_label.data());
                    change_menu_item_text(ID_REPORT_BUG_COMMAND, submit_bug_menuitem_label.data());
                    change_menu_item_text(ID_DOCUMENTATION_MENU_COMMAND, documentation_menuitem_label.data());
                    change_menu_item_text(ID_QUICK_ACCESS_MENU_COMMAND, quick_access_menuitem_label.data());
@@ -322,14 +312,6 @@ void start_tray_icon(bool isProcessElevated)
    }
 }

-void set_tray_icon_visible(bool shouldIconBeVisible)
-{
-    tray_icon_data.uFlags |= NIF_STATE;
-    tray_icon_data.dwStateMask = NIS_HIDDEN;
-    tray_icon_data.dwState = shouldIconBeVisible ? 0 : NIS_HIDDEN;
-    Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
-}
-
 void stop_tray_icon()
 {
    if (tray_icon_created)
--- a/src/runner/tray_icon.h
+++ b/src/runner/tray_icon.h
@@ -4,8 +4,6 @@

 // Start the Tray Icon
 void start_tray_icon(bool isProcessElevated);
-// Change the Tray Icon visibility
-void set_tray_icon_visible(bool shouldIconBeVisible);
 // Stop the Tray Icon
 void stop_tray_icon();
 // Open the Settings Window
@@ -15,5 +13,4 @@ typedef void (*main_loop_callback_function)(PVOID);
 // Calls a callback in _callback
 bool dispatch_run_on_main_ui_thread(main_loop_callback_function _callback, PVOID data);

-// Must be the same as: settings-ui/Settings.UI/Views/ShellPage.xaml.cs -> ExitPTItem_Tapped() -> const string ptTrayIconWindowClass
 const inline wchar_t* pt_tray_icon_window_class = L"PToyTrayIconWindow";
--- a/src/settings-ui/Settings.UI.Library/GeneralSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/GeneralSettings.cs
@@ -19,10 +19,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
        [JsonPropertyName("startup")]
        public bool Startup { get; set; }

-        // Gets or sets a value indicating whether the powertoys system tray icon should be hidden.
-        [JsonPropertyName("show_tray_icon")]
-        public bool ShowSysTrayIcon { get; set; }
-
        // Gets or sets a value indicating whether the powertoy elevated.
        [CmdConfigureIgnoreAttribute]
        [JsonPropertyName("is_elevated")]
@@ -79,7 +75,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
        public GeneralSettings()
        {
            Startup = false;
-            ShowSysTrayIcon = true;
            IsAdmin = false;
            EnableWarningsElevatedApps = true;
            IsElevated = false;
--- a/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/General.cs
+++ b/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/General.cs
@@ -224,36 +224,6 @@ namespace ViewModelTests
            viewModel.ThemeIndex = 0;
        }

-        [TestMethod]
-        public void IsShowSysTrayIconEnabledByDefaultShouldDisableWhenSuccessful()
-        {
-            // Arrange
-            // Assert
-            Func<string, int> sendMockIPCConfigMSG = msg =>
-            {
-                OutGoingGeneralSettings snd = JsonSerializer.Deserialize<OutGoingGeneralSettings>(msg);
-                Assert.IsFalse(snd.GeneralSettings.ShowSysTrayIcon);
-                return 0;
-            };
-
-            Func<string, int> sendRestartAdminIPCMessage = msg => { return 0; };
-            Func<string, int> sendCheckForUpdatesIPCMessage = msg => { return 0; };
-            GeneralViewModel viewModel = new(
-                settingsRepository: SettingsRepository<GeneralSettings>.GetInstance(mockGeneralSettingsUtils.Object),
-                "GeneralSettings_RunningAsAdminText",
-                "GeneralSettings_RunningAsUserText",
-                false,
-                false,
-                sendMockIPCConfigMSG,
-                sendRestartAdminIPCMessage,
-                sendCheckForUpdatesIPCMessage,
-                GeneralSettingsFileName);
-            Assert.IsTrue(viewModel.ShowSysTrayIcon);
-
-            // Act
-            viewModel.ShowSysTrayIcon = false;
-        }
-
        [TestMethod]
        public void AllModulesAreEnabledByDefault()
        {
--- a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs
+++ b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs
@@ -17,7 +17,6 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
        internal const int SW_SHOWNORMAL = 1;
        internal const int SW_SHOWMAXIMIZED = 3;
        internal const int SW_HIDE = 0;
-        internal const int WM_COMMAND = 0x0111; // https://learn.microsoft.com/en-us/windows/win32/menurc/wm-command

        [DllImport("user32.dll")]
        internal static extern IntPtr GetActiveWindow();
@@ -49,12 +48,6 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
        [DllImport("Comdlg32.dll", CharSet = CharSet.Unicode)]
        internal static extern bool GetOpenFileName([In, Out] OpenFileName openFileName);

-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-        [DllImport("user32.dll")]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, IntPtr msg, UIntPtr wParam, UIntPtr lParam);
-
        [DllImport("comdlg32.dll", CharSet = CharSet.Auto, EntryPoint = "ChooseFont", SetLastError = true)]
        internal static extern bool ChooseFont(IntPtr lpChooseFont);

--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
@@ -39,7 +39,6 @@

            <tkconverters:StringFormatConverter x:Key="StringFormatConverter" />
            <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
-            <x:Double x:Key="SettingsCardSpacing">2</x:Double>

            <!--  Overrides  -->
            <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml
@@ -10,7 +10,7 @@
                    <StackPanel
                        ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                        Orientation="Vertical"
-                        Spacing="{StaticResource SettingsCardSpacing}" />
+                        Spacing="2" />
                </ItemsPanelTemplate>
            </Setter.Value>
        </Setter>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
@@ -176,7 +176,7 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
            });
        }

-        internal void ReportBugBtn_Click(object sender, RoutedEventArgs e)
+        private void ReportBugBtn_Click(object sender, RoutedEventArgs e)
        {
            ViewModel.StartBugReport();

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
@@ -34,7 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            ViewModel.RefreshEnabledState();
        }

-        private void LaunchApp(string appPath, string args)
+        private void LaunchApp(string appPath)
        {
            try
            {
@@ -43,7 +43,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                var processStartInfo = new ProcessStartInfo
                {
                    FileName = appPath,
-                    Arguments = args,
+                    Arguments = string.Empty,
                    WorkingDirectory = dir,
                    UseShellExecute = true,
                    Verb = "open",
@@ -64,10 +64,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views

        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
-            // Launch CmdPal settings window as normal user using explorer
-            string launchPath = "explorer.exe";
-            string launchArgs = "x-cmdpal://settings";
-            LaunchApp(launchPath, launchArgs);
+            // Launch CmdPal settings window
+            string launchPath = "x-cmdpal://settings";
+            LaunchApp(launchPath);
        }
    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -266,10 +266,6 @@
                    <tkcontrols:SettingsCard x:Uid="GeneralPage_RunAtStartUp" IsEnabled="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
                    </tkcontrols:SettingsCard>
-
-                    <tkcontrols:SettingsCard x:Uid="ShowSystemTrayIcon">
-                        <ToggleSwitch x:Uid="ShowSystemTrayIcon_ToggleSwitch" IsOn="{x:Bind ViewModel.ShowSysTrayIcon, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
                    <InfoBar
                        x:Uid="GPO_SettingIsManaged"
                        BorderThickness="0"
@@ -406,11 +402,10 @@
                    </InfoBar>
                </controls:SettingsGroup>
                <controls:SettingsGroup x:Uid="General_DiagnosticsAndFeedback" Visibility="Visible">
-                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                    <StackPanel>
                        <HyperlinkButton
                            x:Uid="GeneralPage_DiagnosticsAndFeedback_Link"
-                            Margin="0,0,0,8"
-                            Padding="0"
+                            Margin="-8,0,0,0"
                            NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
                        <tkcontrols:SettingsCard
                            x:Uid="GeneralPage_EnableDataDiagnostics"
@@ -454,12 +449,7 @@
                                <Button x:Uid="GeneralPage_ViewDiagnosticDataViewerInfoButton" Click="Click_ViewDiagnosticDataViewerRestart" />
                            </InfoBar.ActionButton>
                        </InfoBar>
-                        <tkcontrols:SettingsCard x:Uid="GeneralPage_ReportBugPackage" HeaderIcon="{ui:FontIcon Glyph=&#xEBE8;}">
-                            <Button
-                                x:Uid="GeneralPageReportBugPackage"
-                                HorizontalAlignment="Right"
-                                Click="BugReportToolClicked" />
-                        </tkcontrols:SettingsCard>
+
                    </StackPanel>
                </controls:SettingsGroup>
            </StackPanel>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
@@ -7,7 +7,6 @@ using System.Threading;
 using System.Threading.Tasks;

 using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Flyout;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
@@ -166,24 +165,5 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            await Task.Run(ViewModel.ViewDiagnosticData);
        }
-
-        private void ExitPTItem_Tapped(object sender, RoutedEventArgs e)
-        {
-            const string ptTrayIconWindowClass = "PToyTrayIconWindow"; // Defined in runner/tray_icon.h
-            const nuint ID_EXIT_MENU_COMMAND = 40001;                  // Generated resource from runner/runner.base.rc
-
-            // Exit the XAML application
-            Application.Current.Exit();
-
-            // Invoke the exit command from the tray icon
-            IntPtr hWnd = NativeMethods.FindWindow(ptTrayIconWindowClass, ptTrayIconWindowClass);
-            NativeMethods.SendMessage(hWnd, NativeMethods.WM_COMMAND, ID_EXIT_MENU_COMMAND, 0);
-        }
-
-        private void BugReportToolClicked(object sender, RoutedEventArgs e)
-        {
-            var launchPage = new LaunchPage();
-            launchPage.ReportBugBtn_Click(sender, e);
-        }
    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -39,17 +39,10 @@
            Margin="48,0,0,0"
            VerticalAlignment="Top"
            IsHitTestVisible="True">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="LeftTitleBarColumn" Width="*" />
-                <ColumnDefinition x:Name="RightTitleBarColumn" Width="Auto" />
-            </Grid.ColumnDefinitions>
            <animations:Implicit.Animations>
                <animations:OffsetAnimation Duration="0:0:0.3" />
            </animations:Implicit.Animations>
-            <StackPanel
-                Grid.Column="0"
-                HorizontalAlignment="Left"
-                Orientation="Horizontal">
+            <StackPanel Orientation="Horizontal">
                <Image
                    Width="16"
                    Height="16"
@@ -71,24 +64,6 @@
                    TextWrapping="NoWrap"
                    Visibility="Collapsed" />
            </StackPanel>
-            <StackPanel
-                Grid.Column="1"
-                Margin="0,0,148,0"
-                HorizontalAlignment="Right"
-                Orientation="Horizontal">
-                <Button
-                    x:Name="ShutDownBtn"
-                    Height="48"
-                    Click="ExitPTItem_Tapped"
-                    Style="{StaticResource SubtleButtonStyle}">
-                    <FontIcon FontSize="16" Glyph="&#xE7E8;" />
-                    <ToolTipService.ToolTip>
-                        <ToolTip>
-                            <TextBlock x:Uid="AppTitleBarShutDown_Tooltip" />
-                        </ToolTip>
-                    </ToolTipService.ToolTip>
-                </Button>
-            </StackPanel>
        </Grid>
        <NavigationView
            x:Name="navigationView"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs
@@ -9,7 +9,6 @@ using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
@@ -423,7 +422,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                // A custom title bar is required for full window theme and Mica support.
                // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
                u.ExtendsContentIntoTitleBar = true;
-                u.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
                WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(u));
                u.SetTitleBar(AppTitleBar);
                var loader = ResourceLoaderInstance.ResourceLoader;
@@ -459,18 +457,5 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            navigationView.IsPaneOpen = !navigationView.IsPaneOpen;
        }
-
-        private void ExitPTItem_Tapped(object sender, RoutedEventArgs e)
-        {
-            const string ptTrayIconWindowClass = "PToyTrayIconWindow"; // Defined in runner/tray_icon.h
-            const nuint ID_EXIT_MENU_COMMAND = 40001;                  // Generated resource from runner/runner.base.rc
-
-            // Exit the XAML application
-            Application.Current.Exit();
-
-            // Invoke the exit command from the tray icon
-            IntPtr hWnd = NativeMethods.FindWindow(ptTrayIconWindowClass, ptTrayIconWindowClass);
-            NativeMethods.SendMessage(hWnd, NativeMethods.WM_COMMAND, ID_EXIT_MENU_COMMAND, 0);
-        }
    }
 }
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4299,12 +4299,6 @@ Activate by holding the key for the character you want to add an accent to, then
  <data name="GeneralPage_ShowWhatsNewAfterUpdates.Content" xml:space="preserve">
    <value>Show the release notes after an update</value>
  </data>
-  <data name="ShowSystemTrayIcon.Description" xml:space="preserve">
-    <value>This settings page is accessible by running the PowerToys executable again</value>
-  </data>
-  <data name="ShowSystemTrayIcon.Header" xml:space="preserve">
-    <value>Show system tray icon</value>
-  </data>
  <data name="QuickAccent_Prevent_Activation_On_Game_Mode.Content" xml:space="preserve">
    <value>Do not activate when Game Mode is on</value>
    <comment>"Game mode" is the Windows feature to prevent notification when playing a game.</comment>
@@ -5026,25 +5020,4 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="Help_hueOklch" xml:space="preserve">
    <value>hue (Oklch)</value>
  </data>
-  <data name="ExitPT_NavViewItem.Content" xml:space="preserve">
-    <value>Exit PowerToys</value>
-  </data>
-  <data name="General_System.Header" xml:space="preserve">
-    <value>System</value>
-  </data>
-  <data name="GeneralPage_ReportBugPackage.Header" xml:space="preserve">
-    <value>Generate bug report package</value>
-  </data>
-  <data name="GeneralPage_ReportBugPackage.Description" xml:space="preserve">
-    <value>Create zip folder with logs on the Desktop</value>
-  </data>
-  <data name="GeneralPageReportBugPackage.Content" xml:space="preserve">
-    <value>Generate package</value>
-  </data>
-  <data name="AppTitleBarShutDown_Tooltip.Text" xml:space="preserve">
-    <value>Shut down</value>
-  </data>
-  <data name="BugReportUnderConstruction" xml:space="preserve">
-    <value>Bug report package is being created</value>
-  </data>
 </root>
--- a/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
@@ -146,7 +146,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                _startup = GeneralSettingsConfig.Startup;
            }

-            _showSysTrayIcon = GeneralSettingsConfig.ShowSysTrayIcon;
            _showNewUpdatesToastNotification = GeneralSettingsConfig.ShowNewUpdatesToastNotification;
            _autoDownloadUpdates = GeneralSettingsConfig.AutoDownloadUpdates;
            _showWhatsNewAfterUpdates = GeneralSettingsConfig.ShowWhatsNewAfterUpdates;
@@ -229,7 +228,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        private static bool _isDevBuild;
        private bool _startup;
-        private bool _showSysTrayIcon;
        private GpoRuleConfigured _runAtStartupGpoRuleConfiguration;
        private bool _runAtStartupIsGPOConfigured;
        private bool _isElevated;
@@ -361,25 +359,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            }
        }

-        // Gets or sets a value indicating whether the PowerToys icon should be shown in the system tray.
-        public bool ShowSysTrayIcon
-        {
-            get
-            {
-                return _showSysTrayIcon;
-            }
-
-            set
-            {
-                if (_showSysTrayIcon != value)
-                {
-                    _showSysTrayIcon = value;
-                    GeneralSettingsConfig.ShowSysTrayIcon = value;
-                    NotifyPropertyChanged();
-                }
-            }
-        }
-
        public string RunningAsText
        {
            get