test dev lable

This reverts commit 1b6b446915.

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
Reverting this PR because WinUI 3 doesn’t support drag operations when
running as admin.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

.pipelines/v2/templates/steps-esrp-signing.yml

@@ -10,7 +10,7 @@ parameters:
     default: {}
 
 steps:
-  - task: EsrpCodeSigning@5
+  - task: EsrpCodeSigning@6
     displayName: 🔏 ${{ parameters.displayName }}
     inputs:
       ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}

Directory.Packages.props

@@ -13,6 +13,8 @@
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
+    <!-- Pin the SixLabors.ImageSharp version (a transitive dependency of CoenM.ImageSharp.ImageHash) to restore functionality and apply patches. -->
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.12" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1549,7 +1549,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 42> processesToTerminate = {
+    std::array<std::wstring_view, 44> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1584,12 +1584,14 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.MouseWithoutBordersService.exe",
         L"PowerToys.CropAndLock.exe",
         L"PowerToys.EnvironmentVariables.exe",
+        L"PowerToys.QuickAccess.exe",
         L"PowerToys.WorkspacesSnapshotTool.exe",
         L"PowerToys.WorkspacesLauncher.exe",
         L"PowerToys.WorkspacesLauncherUI.exe",
         L"PowerToys.WorkspacesEditor.exe",
         L"PowerToys.WorkspacesWindowArranger.exe",
         L"Microsoft.CmdPal.UI.exe",
+        L"Microsoft.CmdPal.Ext.PowerToys.exe",
         L"PowerToys.ZoomIt.exe",
         L"PowerToys.exe",
     };

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml

@@ -466,39 +466,27 @@
                         TextChanged="EditVariableDialogValueTxtBox_TextChanged"
                         TextWrapping="Wrap" />
                     <MenuFlyoutSeparator Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}" />
-                    <ListView
+                    <ItemsControl
                         x:Name="EditVariableValuesList"
                         Margin="0,-8,0,12"
                         HorizontalAlignment="Stretch"
-                        AllowDrop="True"
-                        CanDragItems="True"
-                        CanReorderItems="True"
-                        DragItemsCompleted="EditVariableValuesList_DragItemsCompleted"
                         ItemsSource="{Binding ValuesList, Mode=TwoWay}"
                         Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <ListView.ItemTemplate>
+                        <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="32" />
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="40" />
                                     </Grid.ColumnDefinitions>
-                                    <FontIcon
-                                        Grid.Column="0"
-                                        Margin="0,0,8,0"
-                                        FontSize="16"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Glyph="&#xE759;" />
                                     <TextBox
-                                        Grid.Column="1"
                                         Background="Transparent"
                                         BorderBrush="Transparent"
                                         LostFocus="EditVariableValuesListTextBox_LostFocus"
                                         Text="{Binding Text}" />
                                     <Button
                                         x:Uid="More_Options_Button"
-                                        Grid.Column="2"
+                                        Grid.Column="1"
                                         VerticalAlignment="Center"
                                         Content="&#xE712;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
@@ -535,8 +523,8 @@
                                     </Button>
                                 </Grid>
                             </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
                 </StackPanel>
             </ScrollViewer>
         </ContentDialog>

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml.cs

@@ -16,8 +16,6 @@ namespace EnvironmentVariablesUILib
 {
     public sealed partial class EnvironmentVariablesMainPage : Page
     {
-        private const string ValueListSeparator = ";";
-
         private sealed class RelayCommandParameter
         {
             public RelayCommandParameter(Variable variable, VariablesSet set)
@@ -442,7 +440,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index - 1);
             }
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -463,7 +461,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index + 1);
             }
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -478,7 +476,7 @@ namespace EnvironmentVariablesUILib
             var variable = EditVariableDialog.DataContext as Variable;
             variable.ValuesList.Remove(listItem);
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -494,7 +492,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -512,7 +510,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index + 1, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -534,7 +532,7 @@ namespace EnvironmentVariablesUILib
             listItem.Text = (sender as TextBox)?.Text;
             var variable = EditVariableDialog.DataContext as Variable;
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -550,16 +548,5 @@ namespace EnvironmentVariablesUILib
             CancelAddVariable();
             ConfirmAddVariableBtn.IsEnabled = false;
         }
-
-        private void EditVariableValuesList_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            if (EditVariableDialog.DataContext is Variable variable && variable.ValuesList != null)
-            {
-                var newValues = string.Join(ValueListSeparator, variable.ValuesList.Select(x => x.Text));
-                EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
-                EditVariableDialogValueTxtBox.Text = newValues;
-                EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
-            }
-        }
     }
 }

src/modules/Workspaces/WorkspacesCsharpLibrary/Data/ApplicationWrapper.cs

@@ -10,10 +10,10 @@ public struct ApplicationWrapper
 {
     public struct WindowPositionWrapper
     {
-        [JsonPropertyName("x")]
+        [JsonPropertyName("X")]
         public int X { get; set; }
 
-        [JsonPropertyName("y")]
+        [JsonPropertyName("Y")]
         public int Y { get; set; }
 
         [JsonPropertyName("width")]

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

@@ -291,24 +291,26 @@
   </ItemGroup>
   <!-- </AdaptiveCardsWorkaround> -->
 
-  <!-- Metadata for build information  -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishTrimmed</_Parameter1>
-      <_Parameter2>$(PublishTrimmed)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishAot</_Parameter1>
-      <_Parameter2>$(PublishAot)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CIBuild</_Parameter1>
-      <_Parameter2>$(CIBuild)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CommandPaletteBranding</_Parameter1>
-      <_Parameter2>$(CommandPaletteBranding)</_Parameter2>
-    </AssemblyAttribute>
-  </ItemGroup>
+  <!-- Metadata for build information - Use Target to ensure properties are evaluated at build time, not project load time -->
+  <Target Name="AddBuildMetadataAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
+    <ItemGroup>
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+        <_Parameter1>PublishTrimmed</_Parameter1>
+        <_Parameter2>$(PublishTrimmed)</_Parameter2>
+      </AssemblyAttribute>
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+        <_Parameter1>PublishAot</_Parameter1>
+        <_Parameter2>$(PublishAot)</_Parameter2>
+      </AssemblyAttribute>
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+        <_Parameter1>CIBuild</_Parameter1>
+        <_Parameter2>$(CIBuild)</_Parameter2>
+      </AssemblyAttribute>
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+        <_Parameter1>CommandPaletteBranding</_Parameter1>
+        <_Parameter2>$(CommandPaletteBranding)</_Parameter2>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
 
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj

@@ -7,6 +7,7 @@
 		<OutputType>WinExe</OutputType>
 		<RootNamespace>PowerToysExtension</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<ApplicationIcon>..\..\..\..\runner\svgs\icon.ico</ApplicationIcon>
 		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
 		<EnableMsixTooling>false</EnableMsixTooling>
 		<WindowsPackageType>None</WindowsPackageType>

src/modules/fancyzones/FancyZonesCLI/CommandLine/Commands/SetHotkeyCommand.cs

@@ -9,6 +9,7 @@ using System.CommandLine.Invocation;
 using System.Globalization;
 using System.Linq;
 
+using FancyZonesCLI.Utils;
 using FancyZonesEditorCommon.Data;
 using FancyZonesEditorCommon.Utils;
 
@@ -35,13 +36,19 @@ internal sealed partial class SetHotkeyCommand : FancyZonesBaseCommand
     {
         // FancyZones running guard is handled by FancyZonesBaseCommand.
         int key = context.ParseResult.GetValueForArgument(_key);
-        string layout = context.ParseResult.GetValueForArgument(_layout);
+        string layoutInput = context.ParseResult.GetValueForArgument(_layout);
 
         if (key < 0 || key > 9)
         {
             throw new InvalidOperationException(Properties.Resources.set_hotkey_error_invalid_key);
         }
 
+        // Normalize GUID to Windows format with braces (supports input with or without braces)
+        if (!GuidHelper.TryNormalizeGuid(layoutInput, out string layout))
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layoutInput));
+        }
+
         // Editor only allows assigning hotkeys to existing custom layouts.
         var customLayouts = FancyZonesDataIO.ReadCustomLayouts();
 
@@ -60,7 +67,7 @@ internal sealed partial class SetHotkeyCommand : FancyZonesBaseCommand
 
         if (!matchedLayout.HasValue)
         {
-            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layout));
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layoutInput));
         }
 
         string layoutName = matchedLayout.Value.Name;

src/modules/fancyzones/FancyZonesCLI/CommandLine/Commands/SetLayoutCommand.cs

@@ -140,9 +140,12 @@ internal sealed partial class SetLayoutCommand : FancyZonesBaseCommand
             return null;
         }
 
+        // Normalize GUID to Windows format with braces (supports input with or without braces)
+        string normalizedLayout = GuidHelper.NormalizeGuid(layout) ?? layout;
+
         foreach (var customLayout in customLayouts.CustomLayouts)
         {
-            if (customLayout.Uuid.Equals(layout, StringComparison.OrdinalIgnoreCase))
+            if (customLayout.Uuid.Equals(normalizedLayout, StringComparison.OrdinalIgnoreCase))
             {
                 return customLayout;
             }

src/modules/fancyzones/FancyZonesCLI/CommandLine/FancyZonesCliUsage.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.CommandLine;
+using System.Globalization;
 using System.Linq;
 
 namespace FancyZonesCLI.CommandLine;
@@ -13,15 +14,15 @@ internal static class FancyZonesCliUsage
     public static void PrintUsage()
     {
         Console.OutputEncoding = System.Text.Encoding.UTF8;
-        Console.WriteLine("FancyZones CLI - Command line interface for FancyZones");
+        Console.WriteLine(Properties.Resources.usage_title);
         Console.WriteLine();
 
         var cmd = FancyZonesCliCommandFactory.CreateRootCommand();
 
-        Console.WriteLine("Usage: FancyZonesCLI [command] [options]");
+        Console.WriteLine(Properties.Resources.usage_syntax);
         Console.WriteLine();
 
-        Console.WriteLine("Options:");
+        Console.WriteLine(Properties.Resources.usage_options);
         foreach (var option in cmd.Options)
         {
             var aliases = string.Join(", ", option.Aliases);
@@ -30,7 +31,7 @@ internal static class FancyZonesCliUsage
         }
 
         Console.WriteLine();
-        Console.WriteLine("Commands:");
+        Console.WriteLine(Properties.Resources.usage_commands);
         foreach (var command in cmd.Subcommands)
         {
             if (command.IsHidden)
@@ -51,7 +52,7 @@ internal static class FancyZonesCliUsage
         }
 
         Console.WriteLine();
-        Console.WriteLine("Examples:");
+        Console.WriteLine(Properties.Resources.usage_examples);
         Console.WriteLine("  FancyZonesCLI --help");
         Console.WriteLine("  FancyZonesCLI --version");
         Console.WriteLine("  FancyZonesCLI get-monitors");
@@ -59,4 +60,135 @@ internal static class FancyZonesCliUsage
         Console.WriteLine("  FancyZonesCLI set-layout <uuid> --monitor 1");
         Console.WriteLine("  FancyZonesCLI get-hotkeys");
     }
+
+    public static void PrintCommandUsage(string commandName)
+    {
+        Console.OutputEncoding = System.Text.Encoding.UTF8;
+
+        var rootCmd = FancyZonesCliCommandFactory.CreateRootCommand();
+
+        // Find matching subcommand by name or alias
+        var subcommand = rootCmd.Subcommands.FirstOrDefault(c =>
+            c.Aliases.Any(a => string.Equals(a, commandName, StringComparison.OrdinalIgnoreCase)));
+
+        if (subcommand == null)
+        {
+            Console.WriteLine(string.Format(CultureInfo.InvariantCulture, Properties.Resources.usage_unknown_command, commandName));
+            Console.WriteLine();
+            Console.WriteLine(Properties.Resources.usage_run_help);
+            return;
+        }
+
+        // Command name and description
+        Console.WriteLine($"{Properties.Resources.usage_command} {subcommand.Name}");
+        if (!string.IsNullOrEmpty(subcommand.Description))
+        {
+            Console.WriteLine($"  {subcommand.Description}");
+        }
+
+        Console.WriteLine();
+
+        // Usage line
+        string argsLabel = string.Join(" ", subcommand.Arguments.Select(a => $"<{a.Name}>"));
+        string optionsLabel = subcommand.Options.Any() ? " [options]" : string.Empty;
+        Console.WriteLine($"Usage: FancyZonesCLI {subcommand.Name} {argsLabel}{optionsLabel}".TrimEnd());
+        Console.WriteLine();
+
+        // Aliases
+        var aliases = subcommand.Aliases.Where(a => !string.Equals(a, subcommand.Name, StringComparison.OrdinalIgnoreCase)).ToList();
+        if (aliases.Count > 0)
+        {
+            Console.WriteLine($"{Properties.Resources.usage_aliases} {string.Join(", ", aliases)}");
+            Console.WriteLine();
+        }
+
+        // Arguments
+        if (subcommand.Arguments.Any())
+        {
+            Console.WriteLine(Properties.Resources.usage_arguments);
+            foreach (var arg in subcommand.Arguments)
+            {
+                var argDescription = arg.Description ?? string.Empty;
+                Console.WriteLine($"  <{arg.Name}>{(arg.Arity.MinimumNumberOfValues == 0 ? $" {Properties.Resources.usage_optional}" : string.Empty),-20} {argDescription}");
+            }
+
+            Console.WriteLine();
+        }
+
+        // Options
+        if (subcommand.Options.Any())
+        {
+            Console.WriteLine(Properties.Resources.usage_options);
+            foreach (var option in subcommand.Options)
+            {
+                var optAliases = string.Join(", ", option.Aliases);
+                var optDescription = option.Description ?? string.Empty;
+                Console.WriteLine($"  {optAliases,-25} {optDescription}");
+            }
+
+            Console.WriteLine();
+        }
+
+        // Command-specific examples
+        PrintCommandExamples(subcommand.Name);
+    }
+
+    private static void PrintCommandExamples(string commandName)
+    {
+        Console.WriteLine(Properties.Resources.usage_examples);
+
+        switch (commandName.ToLowerInvariant())
+        {
+            case "get-monitors":
+                Console.WriteLine("  FancyZonesCLI get-monitors");
+                Console.WriteLine("  FancyZonesCLI m");
+                break;
+
+            case "get-layouts":
+                Console.WriteLine("  FancyZonesCLI get-layouts");
+                Console.WriteLine("  FancyZonesCLI ls");
+                break;
+
+            case "get-active-layout":
+                Console.WriteLine("  FancyZonesCLI get-active-layout");
+                Console.WriteLine("  FancyZonesCLI active");
+                break;
+
+            case "set-layout":
+                Console.WriteLine("  FancyZonesCLI set-layout focus");
+                Console.WriteLine("  FancyZonesCLI set-layout columns --monitor 1");
+                Console.WriteLine("  FancyZonesCLI set-layout {uuid} --all");
+                Console.WriteLine("  FancyZonesCLI s rows -m 2");
+                break;
+
+            case "open-editor":
+                Console.WriteLine("  FancyZonesCLI open-editor");
+                Console.WriteLine("  FancyZonesCLI e");
+                break;
+
+            case "open-settings":
+                Console.WriteLine("  FancyZonesCLI open-settings");
+                Console.WriteLine("  FancyZonesCLI settings");
+                break;
+
+            case "get-hotkeys":
+                Console.WriteLine("  FancyZonesCLI get-hotkeys");
+                Console.WriteLine("  FancyZonesCLI hk");
+                break;
+
+            case "set-hotkey":
+                Console.WriteLine("  FancyZonesCLI set-hotkey 1 {layout-uuid}");
+                Console.WriteLine("  FancyZonesCLI shk 2 0CEBCBA9-9C32-4395-B93E-DC77485AD6D0");
+                break;
+
+            case "remove-hotkey":
+                Console.WriteLine("  FancyZonesCLI remove-hotkey 1");
+                Console.WriteLine("  FancyZonesCLI rhk 2");
+                break;
+
+            default:
+                Console.WriteLine($"  FancyZonesCLI {commandName}");
+                break;
+        }
+    }
 }

src/modules/fancyzones/FancyZonesCLI/Program.cs

@@ -12,6 +12,8 @@ namespace FancyZonesCLI;
 
 internal sealed class Program
 {
+    private static readonly string[] HelpFlags = ["--help", "-h", "-?"];
+
     private static async Task<int> Main(string[] args)
     {
         Logger.InitializeLogger();
@@ -21,14 +23,17 @@ internal sealed class Program
         NativeMethods.InitializeWindowMessages();
 
         // Intercept help requests early and print custom usage.
-        if (args.Any(a => string.Equals(a, "--help", StringComparison.OrdinalIgnoreCase) ||
-                          string.Equals(a, "-h", StringComparison.OrdinalIgnoreCase) ||
-                          string.Equals(a, "-?", StringComparison.OrdinalIgnoreCase)))
+        if (TryHandleHelpRequest(args))
         {
-            FancyZonesCliUsage.PrintUsage();
             return 0;
         }
 
+        // Detect PowerShell script block expansion (when {} is interpreted as script block)
+        if (DetectPowerShellScriptBlockArgs(args))
+        {
+            return 1;
+        }
+
         RootCommand rootCommand = FancyZonesCliCommandFactory.CreateRootCommand();
         int exitCode = await rootCommand.InvokeAsync(args);
 
@@ -43,4 +48,69 @@ internal sealed class Program
 
         return exitCode;
     }
+
+    /// <summary>
+    /// Handles help requests for root command and subcommands.
+    /// </summary>
+    /// <returns>True if help was printed, false otherwise.</returns>
+    private static bool TryHandleHelpRequest(string[] args)
+    {
+        bool hasHelpFlag = args.Any(a => HelpFlags.Any(h => string.Equals(a, h, StringComparison.OrdinalIgnoreCase)));
+        if (!hasHelpFlag)
+        {
+            return false;
+        }
+
+        // Get non-help arguments to identify subcommand
+        var nonHelpArgs = args.Where(a => !HelpFlags.Any(h => string.Equals(a, h, StringComparison.OrdinalIgnoreCase))).ToArray();
+
+        if (nonHelpArgs.Length == 0)
+        {
+            // Root help: fancyzones cli --help
+            FancyZonesCliUsage.PrintUsage();
+        }
+        else
+        {
+            // Subcommand help: fancyzones cli <command> --help
+            string subcommandName = nonHelpArgs[0];
+            FancyZonesCliUsage.PrintCommandUsage(subcommandName);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Detects when PowerShell interprets {GUID} as a script block and converts it to encoded command args.
+    /// This happens when users forget to quote GUIDs with braces in PowerShell.
+    /// </summary>
+    /// <returns>True if PowerShell script block args were detected, false otherwise.</returns>
+    private static bool DetectPowerShellScriptBlockArgs(string[] args)
+    {
+        // PowerShell converts {scriptblock} to: -encodedCommand <base64> -inputFormat xml -outputFormat text
+        bool hasEncodedCommand = args.Any(a => string.Equals(a, "-encodedCommand", StringComparison.OrdinalIgnoreCase));
+        bool hasInputFormat = args.Any(a => string.Equals(a, "-inputFormat", StringComparison.OrdinalIgnoreCase));
+        bool hasOutputFormat = args.Any(a => string.Equals(a, "-outputFormat", StringComparison.OrdinalIgnoreCase));
+
+        if (hasEncodedCommand || (hasInputFormat && hasOutputFormat))
+        {
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_title);
+            Console.ResetColor();
+            Console.WriteLine();
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_explanation);
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_hint);
+            Console.WriteLine();
+            Console.WriteLine($"  {Properties.Resources.error_powershell_scriptblock_option1}");
+            Console.WriteLine($"    {Properties.Resources.error_powershell_scriptblock_option1_example}");
+            Console.WriteLine();
+            Console.WriteLine($"  {Properties.Resources.error_powershell_scriptblock_option2}");
+            Console.WriteLine($"    {Properties.Resources.error_powershell_scriptblock_option2_example}");
+            Console.WriteLine();
+
+            Logger.LogWarning("PowerShell script block expansion detected - user needs to quote GUID or omit braces");
+            return true;
+        }
+
+        return false;
+    }
 }

src/modules/fancyzones/FancyZonesCLI/Properties/Resources.Designer.cs

@@ -349,5 +349,113 @@ namespace FancyZonesCLI.Properties {
                 return ResourceManager.GetString("editor_params_timeout", resourceCulture);
             }
         }
+        
+        internal static string error_powershell_scriptblock_title {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_title", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_explanation {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_explanation", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_hint {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_hint", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option1 {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option1", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option1_example {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option1_example", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option2 {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option2", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option2_example {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option2_example", resourceCulture);
+            }
+        }
+        
+        internal static string usage_title {
+            get {
+                return ResourceManager.GetString("usage_title", resourceCulture);
+            }
+        }
+        
+        internal static string usage_syntax {
+            get {
+                return ResourceManager.GetString("usage_syntax", resourceCulture);
+            }
+        }
+        
+        internal static string usage_options {
+            get {
+                return ResourceManager.GetString("usage_options", resourceCulture);
+            }
+        }
+        
+        internal static string usage_commands {
+            get {
+                return ResourceManager.GetString("usage_commands", resourceCulture);
+            }
+        }
+        
+        internal static string usage_examples {
+            get {
+                return ResourceManager.GetString("usage_examples", resourceCulture);
+            }
+        }
+        
+        internal static string usage_arguments {
+            get {
+                return ResourceManager.GetString("usage_arguments", resourceCulture);
+            }
+        }
+        
+        internal static string usage_aliases {
+            get {
+                return ResourceManager.GetString("usage_aliases", resourceCulture);
+            }
+        }
+        
+        internal static string usage_command {
+            get {
+                return ResourceManager.GetString("usage_command", resourceCulture);
+            }
+        }
+        
+        internal static string usage_optional {
+            get {
+                return ResourceManager.GetString("usage_optional", resourceCulture);
+            }
+        }
+        
+        internal static string usage_unknown_command {
+            get {
+                return ResourceManager.GetString("usage_unknown_command", resourceCulture);
+            }
+        }
+        
+        internal static string usage_run_help {
+            get {
+                return ResourceManager.GetString("usage_run_help", resourceCulture);
+            }
+        }
     }
 }

src/modules/fancyzones/FancyZonesCLI/Properties/Resources.resx

@@ -230,4 +230,62 @@ Tip: For templates, use the type name (e.g., 'focus', 'columns', 'rows', 'grid',
   <data name="editor_params_timeout" xml:space="preserve">
     <value>Could not get current monitor information (timed out after {0}ms waiting for '{1}').</value>
   </data>
+
+  <!-- PowerShell Script Block Detection -->
+  <data name="error_powershell_scriptblock_title" xml:space="preserve">
+    <value>Error: Invalid GUID format detected.</value>
+  </data>
+  <data name="error_powershell_scriptblock_explanation" xml:space="preserve">
+    <value>PowerShell interprets curly braces {} as script blocks.</value>
+  </data>
+  <data name="error_powershell_scriptblock_hint" xml:space="preserve">
+    <value>Please quote your GUID or use it without braces:</value>
+  </data>
+  <data name="error_powershell_scriptblock_option1" xml:space="preserve">
+    <value>Option 1 - Quote the GUID:</value>
+  </data>
+  <data name="error_powershell_scriptblock_option1_example" xml:space="preserve">
+    <value>FancyZonesCLI shk 1 '{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}'</value>
+  </data>
+  <data name="error_powershell_scriptblock_option2" xml:space="preserve">
+    <value>Option 2 - Omit the braces (recommended):</value>
+  </data>
+  <data name="error_powershell_scriptblock_option2_example" xml:space="preserve">
+    <value>FancyZonesCLI shk 1 xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</value>
+  </data>
+
+  <!-- CLI Usage -->
+  <data name="usage_title" xml:space="preserve">
+    <value>FancyZones CLI - Command line interface for FancyZones</value>
+  </data>
+  <data name="usage_syntax" xml:space="preserve">
+    <value>Usage: FancyZonesCLI [command] [options]</value>
+  </data>
+  <data name="usage_options" xml:space="preserve">
+    <value>Options:</value>
+  </data>
+  <data name="usage_commands" xml:space="preserve">
+    <value>Commands:</value>
+  </data>
+  <data name="usage_examples" xml:space="preserve">
+    <value>Examples:</value>
+  </data>
+  <data name="usage_arguments" xml:space="preserve">
+    <value>Arguments:</value>
+  </data>
+  <data name="usage_aliases" xml:space="preserve">
+    <value>Aliases:</value>
+  </data>
+  <data name="usage_command" xml:space="preserve">
+    <value>Command:</value>
+  </data>
+  <data name="usage_optional" xml:space="preserve">
+    <value>(optional)</value>
+  </data>
+  <data name="usage_unknown_command" xml:space="preserve">
+    <value>Unknown command: {0}</value>
+  </data>
+  <data name="usage_run_help" xml:space="preserve">
+    <value>Run 'FancyZonesCLI --help' to see available commands.</value>
+  </data>
 </root>

src/modules/fancyzones/FancyZonesCLI/Utils/GuidHelper.cs

@@ -0,0 +1,52 @@
+// 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.Diagnostics.CodeAnalysis;
+
+#nullable enable
+
+namespace FancyZonesCLI.Utils;
+
+/// <summary>
+/// Helper class for normalizing GUID strings to Windows format with braces.
+/// Supports input with or without braces: both "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+/// and "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" are accepted.
+/// </summary>
+internal static class GuidHelper
+{
+    /// <summary>
+    /// Normalizes a GUID string to Windows format with braces.
+    /// Returns null if the input is not a valid GUID.
+    /// </summary>
+    /// <param name="input">GUID string with or without braces.</param>
+    /// <returns>GUID in "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" format, or null if invalid.</returns>
+    public static string? NormalizeGuid(string? input)
+    {
+        if (string.IsNullOrWhiteSpace(input))
+        {
+            return null;
+        }
+
+        if (Guid.TryParse(input, out Guid guid))
+        {
+            // "B" format includes braces: {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
+            return guid.ToString("B").ToUpperInvariant();
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Tries to normalize a GUID string to Windows format with braces.
+    /// </summary>
+    /// <param name="input">GUID string with or without braces.</param>
+    /// <param name="normalizedGuid">The normalized GUID string, or the original input if normalization fails.</param>
+    /// <returns>True if the input was successfully normalized; otherwise, false.</returns>
+    public static bool TryNormalizeGuid(string? input, [NotNullWhen(true)] out string? normalizedGuid)
+    {
+        normalizedGuid = NormalizeGuid(input);
+        return normalizedGuid != null;
+    }
+}

src/modules/imageresizer/ImageResizerCLI/Program.cs

@@ -31,7 +31,7 @@ internal static class Program
         Console.InputEncoding = Encoding.Unicode;
 
         // Initialize logger to file (same as other modules)
-        CliLogger.Initialize("\\ImageResizer\\Logs");
+        CliLogger.Initialize("\\Image Resizer\\CLI");
         CliLogger.Info($"ImageResizerCLI started with {args.Length} argument(s)");
 
         try

src/modules/imageresizer/tests/Properties/SettingsTests.cs

@@ -126,13 +126,10 @@ namespace ImageResizer.Properties
                 h => ncc.CollectionChanged -= h,
                 () => settings.CustomSize = new CustomSize());
 
-            Assert.AreEqual(NotifyCollectionChangedAction.Replace, result.Arguments.Action);
-            Assert.AreEqual(1, result.Arguments.NewItems.Count);
-            Assert.AreEqual(settings.CustomSize, result.Arguments.NewItems[0]);
-            Assert.AreEqual(0, result.Arguments.NewStartingIndex);
-            Assert.AreEqual(1, result.Arguments.OldItems.Count);
-            Assert.AreEqual(originalCustomSize, result.Arguments.OldItems[0]);
-            Assert.AreEqual(0, result.Arguments.OldStartingIndex);
+            // Reset is used instead of Replace to avoid ArgumentOutOfRangeException
+            // when notifying changes for virtual items (CustomSize/AiSize) that exist
+            // outside the bounds of the underlying _sizes collection.
+            Assert.AreEqual(NotifyCollectionChangedAction.Reset, result.Arguments.Action);
         }
 
         [TestMethod]

src/modules/imageresizer/ui/Properties/Settings.cs

@@ -216,27 +216,15 @@ namespace ImageResizer.Properties
                 {
                     if (e.PropertyName == nameof(Models.CustomSize))
                     {
-                        var oldCustomSize = _customSize;
                         _customSize = settings.CustomSize;
 
-                        OnCollectionChanged(
-                            new NotifyCollectionChangedEventArgs(
-                                NotifyCollectionChangedAction.Replace,
-                                _customSize,
-                                oldCustomSize,
-                                _sizes.Count));
+                        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
                     }
                     else if (e.PropertyName == nameof(Models.AiSize))
                     {
-                        var oldAiSize = _aiSize;
                         _aiSize = settings.AiSize;
 
-                        OnCollectionChanged(
-                            new NotifyCollectionChangedEventArgs(
-                                NotifyCollectionChangedAction.Replace,
-                                _aiSize,
-                                oldAiSize,
-                                _sizes.Count + 1));
+                        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
                     }
                     else if (e.PropertyName == nameof(Sizes))
                     {

src/modules/peek/Peek.UI/MainWindowViewModel.cs

@@ -388,6 +388,13 @@ namespace Peek.UI
             IsErrorVisible = true;
         }
 
+        public void ShowError(string message)
+        {
+            IsErrorVisible = false;
+            ErrorMessage = message;
+            IsErrorVisible = true;
+        }
+
         private void NavigationThrottleTimer_Tick(object? sender, object e)
         {
             if (sender == null)

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml

@@ -50,7 +50,8 @@
             Item="{x:Bind ViewModel.CurrentItem, Mode=OneWay}"
             NumberOfFiles="{x:Bind ViewModel.DisplayItemCount, Mode=OneWay}"
             PreviewSizeChanged="FilePreviewer_PreviewSizeChanged"
-            ScalingFactor="{x:Bind ViewModel.ScalingFactor, Mode=OneWay}" />
+            ScalingFactor="{x:Bind ViewModel.ScalingFactor, Mode=OneWay}"
+            Visibility="{x:Bind ContentVisibility(ViewModel.IsErrorVisible), Mode=OneWay}" />
 
         <InfoBar
             x:Name="ErrorInfoBar"
@@ -59,6 +60,7 @@
             Grid.RowSpan="2"
             Margin="4,0,4,6"
             VerticalAlignment="Bottom"
+            Closed="ErrorInfoBar_Closed"
             IsOpen="{x:Bind ViewModel.IsErrorVisible, Mode=TwoWay}"
             Message="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}"
             Severity="Error" />

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs

@@ -14,6 +14,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Peek.Common.Constants;
 using Peek.Common.Extensions;
+using Peek.Common.Helpers;
 using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
 using Peek.UI.Extensions;
@@ -195,6 +196,20 @@ namespace Peek.UI
             bootTime.Start();
 
             ViewModel.Initialize(selectedItem);
+
+            // If no files were found (e.g., in virtual folders like Home/Recent), show an error
+            if (ViewModel.CurrentItem == null)
+            {
+                Logger.LogInfo("Peek: No files found to preview, showing error.");
+                var errorMessage = ResourceLoaderInstance.ResourceLoader.GetString("NoFilesSelected");
+                ViewModel.ShowError(errorMessage);
+
+                // Still show the window so user can see the warning
+                this.Show();
+                WindowHelpers.BringToForeground(this.GetWindowHandle());
+                return;
+            }
+
             ViewModel.ScalingFactor = this.GetMonitorScale();
             this.Content.KeyUp += Content_KeyUp;
 
@@ -302,5 +317,24 @@ namespace Peek.UI
         {
             themeListener?.Dispose();
         }
+
+        /// <summary>
+        /// Returns Visibility.Collapsed when error is showing, Visibility.Visible when not.
+        /// </summary>
+        public Visibility ContentVisibility(bool isErrorVisible)
+        {
+            return isErrorVisible ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        /// <summary>
+        /// Handle InfoBar closed - if there's no current item, close the window.
+        /// </summary>
+        private void ErrorInfoBar_Closed(InfoBar sender, InfoBarClosedEventArgs args)
+        {
+            if (ViewModel.CurrentItem == null)
+            {
+                Uninitialize();
+            }
+        }
     }
 }

src/modules/peek/Peek.UI/Strings/en-us/Resources.resw

@@ -341,6 +341,10 @@
     <value>No more files to preview.</value>
     <comment>The message to show when there are no files remaining to preview.</comment>
   </data>
+  <data name="NoFilesSelected" xml:space="preserve">
+    <value>No files selected or this folder is not supported for preview.</value>
+    <comment>Displayed when Peek is activated in a virtual folder (like Home or Recent) where file selection cannot be retrieved.</comment>
+  </data>
   <data name="DeleteFileError_NotFound" xml:space="preserve">
     <value>The file cannot be found. Please check if the file has been moved, renamed, or deleted.</value>
     <comment>Displayed if the file or path was not found</comment>

src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj

@@ -7,6 +7,7 @@
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <RootNamespace>Microsoft.PowerToys.QuickAccess</RootNamespace>
     <AssemblyName>PowerToys.QuickAccess</AssemblyName>
+    <ApplicationIcon>..\..\runner\svgs\icon.ico</ApplicationIcon>
     <UseWinUI>true</UseWinUI>
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>

src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs

@@ -154,6 +154,9 @@ public sealed class AllAppsViewModel : Observable
         if (_coordinator.UpdateModuleEnabled(flyoutItem.Tag, flyoutItem.IsEnabled))
         {
             _coordinator.NotifyUserSettingsInteraction();
+
+            // Trigger re-sort immediately when status changes on UI
+            RefreshFlyoutMenuItems();
         }
     }