Merge remote-tracking branch 'origin/main' into dev/snickler/net10-upgrade

NOTICE.md

@@ -1519,23 +1519,23 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.7
+- Microsoft.Bcl.AsyncInterfaces 9.0.8
 - Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.7
+- Microsoft.Data.Sqlite 9.0.8
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.7
+- Microsoft.Extensions.DependencyInjection 9.0.8
-- Microsoft.Extensions.Hosting 9.0.7
+- Microsoft.Extensions.Hosting 9.0.8
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.7
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.8
-- Microsoft.Extensions.Logging 9.0.7
+- Microsoft.Extensions.Logging 9.0.8
-- Microsoft.Extensions.Logging.Abstractions 9.0.7
+- Microsoft.Extensions.Logging.Abstractions 9.0.8
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.7
+- Microsoft.Win32.SystemEvents 9.0.8
-- Microsoft.Windows.Compatibility 9.0.7
+- Microsoft.Windows.Compatibility 9.0.8
 - Microsoft.Windows.CsWin32 0.3.183
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
@@ -1555,25 +1555,25 @@ SOFTWARE.
 - SkiaSharp.Views.WinUI 2.88.9
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.7
+- System.CodeDom 9.0.8
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.7
+- System.ComponentModel.Composition 9.0.8
-- System.Configuration.ConfigurationManager 9.0.7
+- System.Configuration.ConfigurationManager 9.0.8
-- System.Data.OleDb 9.0.7
+- System.Data.OleDb 9.0.8
 - System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.7
+- System.Diagnostics.EventLog 9.0.8
-- System.Diagnostics.PerformanceCounter 9.0.7
+- System.Diagnostics.PerformanceCounter 9.0.8
-- System.Drawing.Common 9.0.7
+- System.Drawing.Common 9.0.8
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.7
+- System.Management 9.0.8
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.7
+- System.Runtime.Caching 9.0.8
-- System.ServiceProcess.ServiceController 9.0.7
+- System.ServiceProcess.ServiceController 9.0.8
-- System.Text.Encoding.CodePages 9.0.7
+- System.Text.Encoding.CodePages 9.0.8
-- System.Text.Json 9.0.7
+- System.Text.Json 9.0.8
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

@@ -5,6 +5,7 @@
 #include "MouseHighlighter.h"
 #include "trace.h"
 #include <cmath>
+#include <algorithm>
 
 #ifdef COMPOSITION
 namespace winrt
@@ -49,6 +50,9 @@ private:
     void BringToFront();
     HHOOK m_mouseHook = NULL;
     static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept;
+    // Helpers for spotlight overlay
+    float GetDpiScale() const;
+    void UpdateSpotlightMask(float cx, float cy, float radius, bool show);
 
     static constexpr auto m_className = L"MouseHighlighter";
     static constexpr auto m_windowTitle = L"PowerToys Mouse Highlighter";
@@ -67,7 +71,14 @@ private:
     winrt::CompositionSpriteShape m_leftPointer{ nullptr };
     winrt::CompositionSpriteShape m_rightPointer{ nullptr };
     winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
-    winrt::CompositionSpriteShape m_spotlightPointer{ nullptr };
+    // Spotlight overlay (mask with soft feathered edge)
+    winrt::SpriteVisual m_overlay{ nullptr };
+    winrt::CompositionMaskBrush m_spotlightMask{ nullptr };
+    winrt::CompositionRadialGradientBrush m_spotlightMaskGradient{ nullptr };
+    winrt::CompositionColorBrush m_spotlightSource{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopCenter{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopInner{ nullptr };
+    winrt::CompositionColorGradientStop m_maskStopOuter{ nullptr };
 
     bool m_leftPointerEnabled = true;
     bool m_rightPointerEnabled = true;
@@ -123,6 +134,35 @@ bool Highlighter::CreateHighlighter()
         m_shape.RelativeSizeAdjustment({ 1.0f, 1.0f });
         m_root.Children().InsertAtTop(m_shape);
 
+        // Create spotlight overlay (soft feather, DPI-aware)
+        m_overlay = m_compositor.CreateSpriteVisual();
+        m_overlay.RelativeSizeAdjustment({ 1.0f, 1.0f });
+        m_spotlightSource = m_compositor.CreateColorBrush(m_alwaysColor);
+        m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
+        m_spotlightMaskGradient.MappingMode(winrt::CompositionMappingMode::Absolute);
+        // Center region fully transparent
+        m_maskStopCenter = m_compositor.CreateColorGradientStop();
+        m_maskStopCenter.Offset(0.0f);
+        m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        // Inner edge of feather (still transparent)
+        m_maskStopInner = m_compositor.CreateColorGradientStop();
+        m_maskStopInner.Offset(0.995f); // will be updated per-radius
+        m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        // Outer edge (opaque mask -> overlay visible)
+        m_maskStopOuter = m_compositor.CreateColorGradientStop();
+        m_maskStopOuter.Offset(1.0f);
+        m_maskStopOuter.Color(winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255));
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopCenter);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopInner);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopOuter);
+
+        m_spotlightMask = m_compositor.CreateMaskBrush();
+        m_spotlightMask.Source(m_spotlightSource);
+        m_spotlightMask.Mask(m_spotlightMaskGradient);
+        m_overlay.Brush(m_spotlightMask);
+        m_overlay.IsVisible(false);
+        m_root.Children().InsertAtTop(m_overlay);
+
         return true;
     }
     catch (...)
@@ -165,12 +205,8 @@ void Highlighter::AddDrawingPoint(MouseButton button)
         // always
         if (m_spotlightMode)
         {
-            float borderThickness = static_cast<float>(std::hypot(GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)));
+            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
-            circleGeometry.Radius({ static_cast<float>(borderThickness / 2.0 + m_radius), static_cast<float>(borderThickness / 2.0 + m_radius) });
+            return;
-            circleShape.FillBrush(nullptr);
-            circleShape.StrokeBrush(m_compositor.CreateColorBrush(m_alwaysColor));
-            circleShape.StrokeThickness(borderThickness);
-            m_spotlightPointer = circleShape;
         }
         else
         {
@@ -209,23 +245,17 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
     }
     else
     {
-        // always
+        // always / spotlight idle
         if (m_spotlightMode)
         {
-            if (m_spotlightPointer)
+            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
-            {
-                m_spotlightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
         }
-        }
+        else if (m_alwaysPointer)
-        else
-        {
-            if (m_alwaysPointer)
         {
             m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
         }
     }
 }
-}
 void Highlighter::StartDrawingPointFading(MouseButton button)
 {
     winrt::Windows::UI::Composition::CompositionSpriteShape circleShape{ nullptr };
@@ -266,9 +296,9 @@ void Highlighter::ClearDrawingPoint()
 {
     if (m_spotlightMode)
     {
-        if (m_spotlightPointer)
+        if (m_overlay)
         {
-            m_spotlightPointer.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+            m_overlay.IsVisible(false);
         }
     }
     else
@@ -421,7 +451,10 @@ void Highlighter::StopDrawing()
     m_leftPointer = nullptr;
     m_rightPointer = nullptr;
     m_alwaysPointer = nullptr;
-    m_spotlightPointer = nullptr;
+    if (m_overlay)
+    {
+        m_overlay.IsVisible(false);
+    }
     ShowWindow(m_hwnd, SW_HIDE);
     UnhookWindowsHookEx(m_mouseHook);
     ClearDrawing();
@@ -452,6 +485,16 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
         m_rightPointerEnabled = false;
     }
 
+    // Keep spotlight overlay color updated
+    if (m_spotlightSource)
+    {
+        m_spotlightSource.Color(m_alwaysColor);
+    }
+    if (!m_spotlightMode && m_overlay)
+    {
+        m_overlay.IsVisible(false);
+    }
+
     if (instance->m_visible)
     {
         instance->StopDrawing();
@@ -563,6 +606,43 @@ void Highlighter::Terminate()
     }
 }
 
+float Highlighter::GetDpiScale() const
+{
+    return static_cast<float>(GetDpiForWindow(m_hwnd)) / 96.0f;
+}
+
+// Update spotlight radial mask center/radius with DPI-aware feather
+void Highlighter::UpdateSpotlightMask(float cx, float cy, float radius, bool show)
+{
+    if (!m_spotlightMaskGradient)
+    {
+        return;
+    }
+
+    m_spotlightMaskGradient.EllipseCenter({ cx, cy });
+    m_spotlightMaskGradient.EllipseRadius({ radius, radius });
+
+    const float dpiScale = GetDpiScale();
+    // Target a very fine edge: ~1 physical pixel, convert to DIPs: 1 / dpiScale
+    const float featherDip = 1.0f / (dpiScale > 0.0f ? dpiScale : 1.0f);
+    const float safeRadius = (std::max)(radius, 1.0f);
+    const float featherRel = (std::min)(0.25f, featherDip / safeRadius);
+
+    if (m_maskStopInner)
+    {
+        m_maskStopInner.Offset((std::max)(0.0f, 1.0f - featherRel));
+    }
+
+    if (m_spotlightSource)
+    {
+        m_spotlightSource.Color(m_alwaysColor);
+    }
+    if (m_overlay)
+    {
+        m_overlay.IsVisible(show);
+    }
+}
+
 #pragma region MouseHighlighter_API
 
 void MouseHighlighterApplySettings(MouseHighlighterSettings settings)

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

@@ -12,6 +12,6 @@
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <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.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs

@@ -2,11 +2,14 @@
 // 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.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
     private readonly KeyChord nullKeyChord = new(0, 0, 0);

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

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -9,6 +10,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
     public ExtensionObject<ICommandItem> Model => _commandItemModel;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs

@@ -4,12 +4,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public interface IContextItemViewModel
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SeparatorContextItemViewModel.cs

@@ -2,11 +2,13 @@
 // 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.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class SeparatorContextItemViewModel() : IContextItemViewModel, ISeparatorContextItem
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -60,6 +60,7 @@ public partial class MainListPage : DynamicListPage,
         var settings = _serviceProvider.GetService<SettingsModel>()!;
         settings.SettingsChanged += SettingsChangedHandler;
         HotReloadSettings(settings);
+        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
 
         IsLoading = true;
     }

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

@@ -98,18 +98,90 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
     public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
     {
-        if (action is AdaptiveOpenUrlAction openUrlAction)
+        // BODGY circa GH #40979
+        // Usually, you're supposed to try to cast the action to a specific
+        // type, and use those objects to get the data you need.
+        // However, there's something weird with AdaptiveCards and the way it
+        // works when we consume it when built in Release, with AOT (and
+        // trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()`
+        // or similar will throw a System.InvalidCastException.
+        //
+        // Instead we have this horror show.
+        //
+        // The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which
+        // we can use to determine what kind of action it is. Then we can parse
+        // the JSON manually based on the type.
+        var actionJson = action.ToJson();
+
+        if (actionJson.TryGetValue("type", out var actionTypeValue))
         {
-            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
+            var actionTypeString = actionTypeValue.GetString();
-            return;
+            Logger.LogTrace($"atString={actionTypeString}");
+
+            var actionType = actionTypeString switch
+            {
+                "Action.Submit" => ActionType.Submit,
+                "Action.Execute" => ActionType.Execute,
+                "Action.OpenUrl" => ActionType.OpenUrl,
+                _ => ActionType.Unsupported,
+            };
+
+            Logger.LogDebug($"{actionTypeString}->{actionType}");
+
+            switch (actionType)
+            {
+                case ActionType.OpenUrl:
+                    {
+                        HandleOpenUrlAction(action, actionJson);
                     }
 
-        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
+                    break;
+                case ActionType.Submit:
+                case ActionType.Execute:
                     {
-            // Get the data and inputs
+                        HandleSubmitAction(action, actionJson, inputs);
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
+                    }
-            var inputString = inputs.Stringify();
 
+                    break;
+                default:
+                    Logger.LogError($"{actionType} was an unexpected action `type`");
+                    break;
+            }
+        }
+        else
+        {
+            Logger.LogError($"actionJson.TryGetValue(type) failed");
+        }
+    }
+
+    private void HandleOpenUrlAction(IAdaptiveActionElement action, JsonObject actionJson)
+    {
+        if (actionJson.TryGetValue("url", out var actionUrlValue))
+        {
+            var actionUrl = actionUrlValue.GetString() ?? string.Empty;
+            if (Uri.TryCreate(actionUrl, default(UriCreationOptions), out var uri))
+            {
+                WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(uri));
+            }
+            else
+            {
+                Logger.LogError($"Failed to produce URI for {actionUrlValue}");
+            }
+        }
+    }
+
+    private void HandleSubmitAction(
+        IAdaptiveActionElement action,
+        JsonObject actionJson,
+        JsonObject inputs)
+    {
+        var dataString = string.Empty;
+        if (actionJson.TryGetValue("data", out var actionDataValue))
+        {
+            dataString = actionDataValue.Stringify() ?? string.Empty;
+        }
+
+        var inputString = inputs.Stringify();
         _ = Task.Run(() =>
         {
             try
@@ -118,6 +190,7 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
                 if (model != null)
                 {
                     var result = model.SubmitForm(inputString, dataString);
+                    Logger.LogDebug($"SubmitForm() returned {result}");
                     WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
                 }
             }
@@ -127,7 +200,6 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
             }
         });
     }
-    }
 
     private static readonly string ErrorCardJson = """
 {

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

@@ -64,6 +64,9 @@ public partial class App : Application
 
         this.InitializeComponent();
 
+        // Ensure types used in XAML are preserved for AOT compilation
+        TypePreservation.PreserveTypes();
+
         NativeEventWaiter.WaitForEventLoop(
             "Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd", () =>
             {

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml

@@ -59,8 +59,24 @@
                     <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
                     <Setter Property="BorderThickness" Value="1" />
                     <Setter Property="CornerRadius" Value="6" />
+                    <Setter Property="MinWidth" Value="20" />
                 </Style.Setters>
             </Style>
+
+            <Style x:Key="HotkeyTextBlockStyle" TargetType="TextBlock">
+                <Setter Property="FontSize" Value="10" />
+                <Setter Property="CharacterSpacing" Value="4" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+
+            <Style x:Key="HotkeyFontIconStyle" TargetType="FontIcon">
+                <Setter Property="FontSize" Value="10" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -155,12 +171,7 @@
                         Style="{StaticResource CaptionTextBlockStyle}"
                         Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}" />
                     <Border Style="{StaticResource HotkeyStyle}">
-                        <FontIcon
+                        <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="10"
-                            Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                            Glyph="&#xE751;" />
                     </Border>
                 </StackPanel>
             </Button>
@@ -179,19 +190,10 @@
                         Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            <TextBlock
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
-                                CharacterSpacing="4"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                                Text="Ctrl" />
                         </Border>
                         <Border Style="{StaticResource HotkeyStyle}">
-                            <FontIcon
+                            <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-                                Glyph="&#xE751;" />
                         </Border>
                     </StackPanel>
                 </StackPanel>
@@ -199,7 +201,7 @@
             <Button
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
-                Padding="4"
+                Padding="6,4,4,4"
                 Click="MoreCommandsButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
                 ToolTipService.ToolTip="Ctrl+K"
@@ -209,32 +211,12 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource CaptionTextBlockStyle}"
                         Text="More" />
-                    <StackPanel Orientation="Horizontal" Spacing="2">
+                    <StackPanel Orientation="Horizontal" Spacing="4">
-                        <Border
+                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            Padding="4,2,4,2"
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                CharacterSpacing="4"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="Ctrl" />
                         </Border>
-                        <Border
+                        <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
-                            Padding="4,2,4,2"
+                            <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="K" />
-                            VerticalAlignment="Center"
-                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-                            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                            BorderThickness="1"
-                            CornerRadius="4">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="10"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Text="K" />
                         </Border>
                     </StackPanel>
                 </StackPanel>

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/ContextItemTemplateSelector.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -10,6 +11,7 @@ using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.CmdPal.UI;
 
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 internal sealed partial class ContextItemTemplateSelector : DataTemplateSelector
 {
     public DataTemplate? Default { get; set; }

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

@@ -102,10 +102,6 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
 
-  <ItemGroup>
-	<RdXmlFile Include="rd.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />

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

@@ -0,0 +1,40 @@
+// 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.Diagnostics.CodeAnalysis;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI;
+
+/// <summary>
+/// This class ensures types used in XAML are preserved during AOT compilation.
+/// Framework types cannot have attributes added directly to their definitions since they're external types.
+/// Application types that require runtime type checking should also be preserved here if needed.
+/// </summary>
+internal static class TypePreservation
+{
+    /// <summary>
+    /// This method ensures critical types are preserved for AOT compilation.
+    /// These types are used dynamically in XAML and would otherwise be trimmed.
+    /// </summary>
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.FontIconSource))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.PathIcon))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.DataTemplate))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.DataTemplateSelector))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(Microsoft.UI.Xaml.Controls.ListViewItem))]
+    public static void PreserveTypes()
+    {
+        // This method exists only to hold the DynamicDependency attributes above.
+        // It must be called to ensure the types are not trimmed during AOT compilation.
+
+        // Note: We cannot add [DynamicallyAccessedMembers] directly to framework types
+        // since we don't own their source code. DynamicDependency is the correct approach
+        // for preserving external types that are used dynamically (e.g., in XAML).
+
+        // For application types that require runtime type checking (e.g., in template selectors),
+        // prefer adding [DynamicallyAccessedMembers] attributes directly on the type definitions.
+        // Only use DynamicDependency here for types we cannot modify directly.
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml

@@ -1,23 +0,0 @@
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-	<Application>
-		<Assembly Name="Microsoft.WinUI">
-			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.DataTemplate" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.DataTemplateSelector" Dynamic="Required All" />
-			<Type Name="Microsoft.UI.Xaml.Controls.ListViewItem" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add ViewModel types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.Core.ViewModels">
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.SeparatorContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.IContextItemViewModel" Dynamic="Required All" />
-			<Type Name="Microsoft.CmdPal.Core.ViewModels.CommandItemViewModel" Dynamic="Required All" />
-		</Assembly>
-
-		<!-- Add UI types for AOT compatibility -->
-		<Assembly Name="Microsoft.CmdPal.UI">
-			<Type Name="Microsoft.CmdPal.UI.ContextItemTemplateSelector" Dynamic="Required All" />
-		</Assembly>
-	</Application>
-</Directives>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/ExtendedCalculatorParserTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.
 
@@ -6,12 +6,15 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.CmdPal.Ext.Calc.Helper;
+using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
 
 [TestClass]
-public class ExtendedCalculatorParserTests
+public class ExtendedCalculatorParserTests : CommandPaletteUnitTestBase
 {
     [DataTestMethod]
     [DataRow(null)]
@@ -28,7 +31,7 @@ public class ExtendedCalculatorParserTests
     [DataRow("[10,10]")] // '[10,10]' is interpreted as array by mages engine
     public void Interpret_NoResult_WhenCalled(string input)
     {
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         var result = CalculateEngine.Interpret(settings, input, CultureInfo.CurrentCulture, out _);
 
@@ -68,7 +71,7 @@ public class ExtendedCalculatorParserTests
     [DynamicData(nameof(Interpret_NoErrors_WhenCalledWithRounding_Data))]
     public void Interpret_NoErrors_WhenCalledWithRounding(string input, decimal expectedResult)
     {
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         // Using InvariantCulture since this is internal
@@ -90,7 +93,7 @@ public class ExtendedCalculatorParserTests
     public void Interpret_GreaterPrecision_WhenCalled(string input, decimal expectedResult)
     {
         // Arrange
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         // Using InvariantCulture since this is internal
@@ -114,7 +117,7 @@ public class ExtendedCalculatorParserTests
     {
         // Arrange
         var cultureInfo = CultureInfo.GetCultureInfo(cultureName);
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         var result = CalculateEngine.Interpret(settings, input, cultureInfo, out _);
@@ -175,7 +178,7 @@ public class ExtendedCalculatorParserTests
     public void Interpret_MustReturnResult_WhenResultIsZero(string input)
     {
         // Arrange
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         // Using InvariantCulture since this is internal
@@ -203,7 +206,7 @@ public class ExtendedCalculatorParserTests
     public void Interpret_MustReturnExpectedResult_WhenCalled(string input, decimal expectedResult)
     {
         // Arrange
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         // Using en-us culture to have a fixed number style
@@ -226,7 +229,7 @@ public class ExtendedCalculatorParserTests
     {
         // Arrange
         var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         // Using en-us culture to have a fixed number style

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/Microsoft.CmdPal.Ext.Calc.UnitTests.csproj

@@ -14,5 +14,6 @@
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
+		<ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
 	</ItemGroup>
 </Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/QueryTests.cs

@@ -0,0 +1,86 @@
+// 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.Linq;
+using Microsoft.CmdPal.Ext.Calc.Helper;
+using Microsoft.CmdPal.Ext.Calc.Pages;
+using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
+
+[TestClass]
+public class QueryTests : CommandPaletteUnitTestBase
+{
+    [DataTestMethod]
+    [DataRow("2+2", "4")]
+    [DataRow("5*3", "15")]
+    [DataRow("10/2", "5")]
+    [DataRow("sqrt(16)", "4")]
+    [DataRow("2^3", "8")]
+    public void TopLevelPageQueryTest(string input, string expectedResult)
+    {
+        var settings = new Settings();
+        var page = new CalculatorListPage(settings);
+
+        // Simulate query execution
+        page.UpdateSearchText(string.Empty, input);
+        var result = page.GetItems();
+
+        Assert.IsTrue(result.Length == 1, "Valid input should always return result");
+
+        var firstResult = result.FirstOrDefault();
+
+        Assert.IsNotNull(result);
+        Assert.IsTrue(
+            firstResult.Title.Contains(expectedResult),
+            $"Expected result to contain '{expectedResult}' but got '{firstResult.Title}'");
+    }
+
+    [TestMethod]
+    public void EmptyQueryTest()
+    {
+        var settings = new Settings();
+        var page = new CalculatorListPage(settings);
+        page.UpdateSearchText("abc", string.Empty);
+        var results = page.GetItems();
+        Assert.IsNotNull(results);
+
+        var firstItem = results.FirstOrDefault();
+        Assert.AreEqual("Type an equation...", firstItem.Title);
+    }
+
+    [TestMethod]
+    public void InvalidExpressionTest()
+    {
+        var settings = new Settings();
+
+        var page = new CalculatorListPage(settings);
+
+        // Simulate query execution
+        page.UpdateSearchText(string.Empty, "invalid expression");
+        var result = page.GetItems().FirstOrDefault();
+
+        Assert.AreEqual("Type an equation...", result.Title);
+    }
+
+    [DataTestMethod]
+    [DataRow("sin(60)", "-0.30481", CalculateEngine.TrigMode.Radians)]
+    [DataRow("sin(60)", "0.866025", CalculateEngine.TrigMode.Degrees)]
+    [DataRow("sin(60)", "0.809016", CalculateEngine.TrigMode.Gradians)]
+    public void TrigModeSettingsTest(string input, string expected, CalculateEngine.TrigMode trigMode)
+    {
+        var settings = new Settings(trigUnit: trigMode);
+
+        var page = new CalculatorListPage(settings);
+
+        page.UpdateSearchText(string.Empty, input);
+        var result = page.GetItems().FirstOrDefault();
+
+        Assert.IsNotNull(result);
+
+        Assert.IsTrue(result.Title.Contains(expected, System.StringComparison.Ordinal), $"Calc trigMode convert result isn't correct. Current result: {result.Title}");
+    }
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/Settings.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.Calc.Helper;
+
+namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
+
+public class Settings : ISettingsInterface
+{
+    private readonly CalculateEngine.TrigMode trigUnit;
+    private readonly bool inputUseEnglishFormat;
+    private readonly bool outputUseEnglishFormat;
+    private readonly bool closeOnEnter;
+
+    public Settings(
+        CalculateEngine.TrigMode trigUnit = CalculateEngine.TrigMode.Radians,
+        bool inputUseEnglishFormat = false,
+        bool outputUseEnglishFormat = false,
+        bool closeOnEnter = true)
+    {
+        this.trigUnit = trigUnit;
+        this.inputUseEnglishFormat = inputUseEnglishFormat;
+        this.outputUseEnglishFormat = outputUseEnglishFormat;
+        this.closeOnEnter = closeOnEnter;
+    }
+
+    public CalculateEngine.TrigMode TrigUnit => trigUnit;
+
+    public bool InputUseEnglishFormat => inputUseEnglishFormat;
+
+    public bool OutputUseEnglishFormat => outputUseEnglishFormat;
+
+    public bool CloseOnEnter => closeOnEnter;
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/SettingsManagerTests.cs

@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.Calc.Helper;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
+
+[TestClass]
+public class SettingsManagerTests
+{
+    [TestMethod]
+    public void SettingsManagerInitializationTest()
+    {
+        // Act
+        var settingsManager = new SettingsManager();
+
+        // Assert
+        Assert.IsNotNull(settingsManager);
+        Assert.IsNotNull(settingsManager.Settings);
+    }
+
+    [TestMethod]
+    public void SettingsInterfaceTest()
+    {
+        // Act
+        ISettingsInterface settings = new SettingsManager();
+
+        // Assert
+        Assert.IsNotNull(settings);
+        Assert.IsTrue(settings.TrigUnit == CalculateEngine.TrigMode.Radians);
+        Assert.IsFalse(settings.InputUseEnglishFormat);
+        Assert.IsFalse(settings.OutputUseEnglishFormat);
+        Assert.IsTrue(settings.CloseOnEnter);
+    }
+
+    [TestMethod]
+    public void MockSettingsTest()
+    {
+        // Act
+        var settings = new Settings(
+            trigUnit: CalculateEngine.TrigMode.Degrees,
+            inputUseEnglishFormat: true,
+            outputUseEnglishFormat: true,
+            closeOnEnter: false);
+
+        // Assert
+        Assert.IsNotNull(settings);
+        Assert.AreEqual(CalculateEngine.TrigMode.Degrees, settings.TrigUnit);
+        Assert.IsTrue(settings.InputUseEnglishFormat);
+        Assert.IsTrue(settings.OutputUseEnglishFormat);
+        Assert.IsFalse(settings.CloseOnEnter);
+    }
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/Microsoft.CmdPal.Ext.Registry.UnitTests.csproj

@@ -18,5 +18,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
+    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/QueryTests.cs

@@ -0,0 +1,74 @@
+// 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.Linq;
+using Microsoft.CmdPal.Ext.Registry.Helpers;
+using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
+
+[TestClass]
+public class QueryTests : CommandPaletteUnitTestBase
+{
+    [DataTestMethod]
+    [DataRow("HKLM", "HKEY_LOCAL_MACHINE")]
+    [DataRow("HKCU", "HKEY_CURRENT_USER")]
+    [DataRow("HKCR", "HKEY_CLASSES_ROOT")]
+    [DataRow("HKU", "HKEY_USERS")]
+    [DataRow("HKCC", "HKEY_CURRENT_CONFIG")]
+    public void TopLevelPageQueryTest(string input, string expectedKeyName)
+    {
+        var settings = new Settings();
+        var page = new RegistryListPage(settings);
+        var results = page.Query(input);
+
+        Assert.IsNotNull(results);
+        Assert.IsTrue(results.Count > 0, "No items matched the query.");
+
+        var firstItem = results.FirstOrDefault();
+        Assert.IsNotNull(firstItem, "No items matched the query.");
+        Assert.IsTrue(
+            firstItem.Title.Contains(expectedKeyName, System.StringComparison.OrdinalIgnoreCase),
+            $"Expected to match '{expectedKeyName}' but got '{firstItem.Title}'");
+    }
+
+    [TestMethod]
+    public void EmptyQueryTest()
+    {
+        var settings = new Settings();
+        var page = new RegistryListPage(settings);
+        var results = page.Query(string.Empty);
+
+        Assert.IsNotNull(results);
+
+        // Empty query should return all base keys
+        Assert.IsTrue(results.Count >= 5, "Expected at least 5 base registry keys.");
+    }
+
+    [TestMethod]
+    public void NullQueryTest()
+    {
+        var settings = new Settings();
+        var page = new RegistryListPage(settings);
+        var results = page.Query(null);
+
+        Assert.IsNotNull(results);
+        Assert.AreEqual(0, results.Count, "Null query should return empty results.");
+    }
+
+    [TestMethod]
+    public void InvalidBaseKeyTest()
+    {
+        var settings = new Settings();
+        var page = new RegistryListPage(settings);
+        var results = page.Query("INVALID_KEY");
+
+        Assert.IsNotNull(results);
+
+        Assert.AreEqual(0, results.Count, "Invalid query should return empty results.");
+    }
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/Settings.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.Registry.Helpers;
+
+namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
+
+public class Settings : ISettingsInterface
+{
+    public Settings()
+    {
+        // Currently no specific settings for Registry extension
+    }
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs

@@ -142,11 +142,7 @@ public class QueryTests : CommandPaletteUnitTestBase
         // UEFI Firmware Settings command should exist
         Assert.IsNotNull(result);
         var firstItem = result.FirstOrDefault();
-        Assert.IsNotNull(firstItem, "No items matched the query.");
+        var firstItemIsUefiCommand = firstItem?.Title.Contains("UEFI", StringComparison.OrdinalIgnoreCase) ?? false;
-        var containsFirmwareSettings = firstItem.Title.Contains("UEFI Firmware Settings", StringComparison.OrdinalIgnoreCase);
+        Assert.AreEqual(hasCommand, firstItemIsUefiCommand, $"Expected to match (or not match) 'UEFI Firmware Settings' but got '{firstItem?.Title}'");
-
-        Assert.IsTrue(
-            containsFirmwareSettings == hasCommand,
-            $"Expected to match 'UEFI Firmware Settings' but got '{firstItem.Title}'");
     }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/AvailableResultsListTests.cs

@@ -367,7 +367,7 @@ public class AvailableResultsListTests
     public void UnixTimestampSecondsFormat()
     {
         // Setup
-        string formatLabel = "Unix epoch time";
+        var formatLabel = "Unix epoch time";
         DateTime timeValue = DateTime.Now.ToUniversalTime();
         var settings = new SettingsManager();
         var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
@@ -384,7 +384,7 @@ public class AvailableResultsListTests
     public void UnixTimestampMillisecondsFormat()
     {
         // Setup
-        string formatLabel = "Unix epoch time in milliseconds";
+        var formatLabel = "Unix epoch time in milliseconds";
         DateTime timeValue = DateTime.Now.ToUniversalTime();
         var settings = new SettingsManager();
         var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
@@ -401,7 +401,7 @@ public class AvailableResultsListTests
     public void WindowsFileTimeFormat()
     {
         // Setup
-        string formatLabel = "Windows file time (Int64 number)";
+        var formatLabel = "Windows file time (Int64 number)";
         DateTime timeValue = DateTime.Now;
         var settings = new SettingsManager();
         var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
@@ -418,7 +418,7 @@ public class AvailableResultsListTests
     public void ValidateEraResult()
     {
         // Setup
-        string formatLabel = "Era";
+        var formatLabel = "Era";
         DateTime timeValue = DateTime.Now;
         var settings = new SettingsManager();
         var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
@@ -435,7 +435,7 @@ public class AvailableResultsListTests
     public void ValidateEraAbbreviationResult()
     {
         // Setup
-        string formatLabel = "Era abbreviation";
+        var formatLabel = "Era abbreviation";
         DateTime timeValue = DateTime.Now;
         var settings = new SettingsManager();
         var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/BasicTests.cs

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class BasicTests
-{
-    [TestMethod]
-    public void BasicTest()
-    {
-        // This is a basic test to verify the test project can run
-        Assert.IsTrue(true);
-    }
-
-    [TestMethod]
-    public void DateTimeTest()
-    {
-        // Test basic DateTime functionality
-        var now = DateTime.Now;
-        Assert.IsNotNull(now);
-        Assert.IsTrue(now > DateTime.MinValue);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/FallbackTimeDateItemTests.cs

@@ -40,7 +40,7 @@ public class FallbackTimeDateItemTests
     public void FallbackQueryTests(string query, string expectedTitle)
     {
         // Setup
-        var settingsManager = new SettingsManager();
+        var settingsManager = new Settings();
         DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
         var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
 
@@ -66,7 +66,7 @@ public class FallbackTimeDateItemTests
     public void InvalidQueryTests(string query)
     {
         // Setup
-        var settingsManager = new SettingsManager();
+        var settingsManager = new Settings();
         DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
         var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
 
@@ -83,4 +83,26 @@ public class FallbackTimeDateItemTests
             Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
         }
     }
+
+    [DataTestMethod]
+    public void DisableFallbackItemTest()
+    {
+        // Setup
+        var settingsManager = new Settings(enableFallbackItems: false);
+        DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
+        var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
+
+        // Act & Assert - Test that UpdateQuery doesn't throw exceptions
+        try
+        {
+            fallbackItem.UpdateQuery("now");
+
+            Assert.AreEqual(string.Empty, fallbackItem.Title, "Title should be empty when disable fallback item");
+            Assert.AreEqual(string.Empty, fallbackItem.Subtitle, "Subtitle should be empty when disable fallback item");
+        }
+        catch (Exception ex)
+        {
+            Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
+        }
+    }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/IconTests.cs

@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class IconTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void CleanUp()
-    {
-        // Set culture to original value
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    [TestMethod]
-    public void TimeDateCommandsProvider_HasIcon()
-    {
-        // Setup
-        var provider = new TimeDateCommandsProvider();
-
-        // Act
-        var icon = provider.Icon;
-
-        // Assert
-        Assert.IsNotNull(icon, "Provider should have an icon");
-    }
-
-    [TestMethod]
-    public void TimeDateCommandsProvider_TopLevelCommands_HaveIcons()
-    {
-        // Setup
-        var provider = new TimeDateCommandsProvider();
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Length > 0, "Should have at least one top-level command");
-
-        foreach (var command in commands)
-        {
-            Assert.IsNotNull(command.Icon, "Each command should have an icon");
-        }
-    }
-
-    [TestMethod]
-    public void AvailableResults_HaveIcons()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should have results");
-
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow(ResultIconType.Time, "\uE823")]
-    [DataRow(ResultIconType.Date, "\uE787")]
-    [DataRow(ResultIconType.DateTime, "\uEC92")]
-    public void ResultHelper_CreateListItem_PreservesIcon(ResultIconType resultIconType, string expectedIcon)
-    {
-        // Setup
-        var availableResult = new AvailableResult
-        {
-            Label = "Test Label",
-            Value = "Test Value",
-            IconType = resultIconType,
-        };
-
-        // Act
-        var listItem = availableResult.ToListItem();
-
-        var icon = listItem.Icon;
-
-        // Assert
-        Assert.IsNotNull(listItem);
-        Assert.IsNotNull(listItem.Icon, "ListItem should preserve the icon from AvailableResult");
-        Assert.AreEqual(expectedIcon, icon.Dark.Icon, $"Icon for {resultIconType} should match expected value");
-    }
-
-    [TestMethod]
-    public void Icons_AreNotEmpty()
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Act & Assert
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.GetIconInfo().ToString()), $"Icon for '{result.Label}' should not be empty");
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/Microsoft.CmdPal.Ext.TimeDate.UnitTests.csproj

@@ -19,5 +19,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj" />
+    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/QueryTests.cs

@@ -6,13 +6,14 @@ using System;
 using System.Globalization;
 using System.Linq;
 using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.CmdPal.Ext.TimeDate.Pages;
+using Microsoft.CmdPal.Ext.UnitTestBase;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
 
 [TestClass]
-public class QueryTests
+public class QueryTests : CommandPaletteUnitTestBase
 {
     private CultureInfo originalCulture;
     private CultureInfo originalUiCulture;
@@ -46,7 +47,7 @@ public class QueryTests
     public void CountBasicQueries(string query, int expectedMinResultCount)
     {
         // Setup
-        var settings = new SettingsManager();
+        var settings = new Settings();
 
         // Act
         var results = TimeDateCalculator.ExecuteSearch(settings, query);
@@ -58,30 +59,32 @@ public class QueryTests
     }
 
     [DataTestMethod]
-    [DataRow("time")]
+    [DataRow("time", "time")]
-    [DataRow("date")]
+    [DataRow("date", "date")]
-    [DataRow("year")]
+    [DataRow("year", "year")]
-    [DataRow("now")]
+    [DataRow("now", "now")]
-    [DataRow("current")]
+    [DataRow("year", "year")]
-    [DataRow("")]
+    public void BasicQueryTest(string input, string expectedMatchTerm)
-    [DataRow("now::10:10:10")] // Windows file time
-    public void AllQueriesReturnResults(string query)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
+        page.UpdateSearchText(string.Empty, input);
+        var resultLists = page.GetItems();
 
-        // Act
+        var result = Query(input, resultLists);
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
 
-        // Assert
+        Assert.IsNotNull(result);
-        Assert.IsNotNull(results);
+        Assert.IsTrue(result.Length > 0, "No items matched the query.");
-        Assert.IsTrue(results.Count > 0, $"Query '{query}' should return at least one result");
+
+        var firstItem = result.FirstOrDefault();
+        Assert.IsNotNull(firstItem, "No items matched the query.");
+        Assert.IsTrue(
+            firstItem.Title.Contains(expectedMatchTerm, System.StringComparison.OrdinalIgnoreCase) ||
+            firstItem.Subtitle.Contains(expectedMatchTerm, System.StringComparison.OrdinalIgnoreCase),
+            $"Expected to match '{expectedMatchTerm}' in title or subtitle but got '{firstItem.Title}' - '{firstItem.Subtitle}'");
     }
 
     [DataTestMethod]
-    [DataRow("time", "Time")]
-    [DataRow("date", "Date")]
-    [DataRow("now", "Now")]
     [DataRow("unix", "Unix epoch time")]
     [DataRow("unix epoch time in milli", "Unix epoch time in milliseconds")]
     [DataRow("file", "Windows file time (Int64 number)")]
@@ -98,12 +101,8 @@ public class QueryTests
     [DataRow("month", "Month")]
     [DataRow("month of year", "Month of the year")]
     [DataRow("month and d", "Month and day")]
-    [DataRow("month and y", "Month and year")]
     [DataRow("year", "Year")]
-    [DataRow("era", "Era")]
-    [DataRow("era a", "Era abbreviation")]
     [DataRow("universal", "Universal time format: YYYY-MM-DD hh:mm:ss")]
-    [DataRow("iso", "ISO 8601")]
     [DataRow("rfc", "RFC1123")]
     [DataRow("time::12:30", "Time")]
     [DataRow("date::10.10.2022", "Date")]
@@ -114,40 +113,19 @@ public class QueryTests
     [DataRow("week num", "Week of the year (Calendar week, Week number)")]
     [DataRow("days in mo", "Days in month")]
     [DataRow("Leap y", "Leap year")]
-    public void CanFindFormatResult(string query, string expectedSubtitle)
+    public void FormatDateQueryTest(string input, string expectedMatchTerm)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
+        page.UpdateSearchText(string.Empty, input);
+        var resultLists = page.GetItems();
 
-        // Act
+        var firstItem = resultLists.FirstOrDefault();
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
+        Assert.IsNotNull(firstItem, "No items matched the query.");
-
+        Assert.IsTrue(
-        // Assert
+            firstItem.Title.Contains(expectedMatchTerm, System.StringComparison.OrdinalIgnoreCase) ||
-        var matchingResult = results.FirstOrDefault(x => x.Subtitle?.StartsWith(expectedSubtitle, StringComparison.CurrentCulture) == true);
+            firstItem.Subtitle.Contains(expectedMatchTerm, System.StringComparison.OrdinalIgnoreCase),
-        Assert.IsNotNull(matchingResult, $"Could not find result with subtitle starting with '{expectedSubtitle}' for query '{query}'");
+            $"Expected to match '{expectedMatchTerm}' in title or subtitle but got '{firstItem.Title}' - '{firstItem.Subtitle}'");
-    }
-
-    [DataTestMethod]
-    [DataRow("12:30", "Time")]
-    [DataRow("10.10.2022", "Date")]
-    [DataRow("u1646408119", "Date and time")]
-    [DataRow("u+1646408119", "Date and time")]
-    [DataRow("u-1646408119", "Date and time")]
-    [DataRow("ums1646408119", "Date and time")]
-    [DataRow("ums+1646408119", "Date and time")]
-    [DataRow("ums-1646408119", "Date and time")]
-    [DataRow("ft637820085517321977", "Date and time")]
-    public void DateTimeNumberOnlyInput(string query, string expectedSubtitle)
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
-
-        // Assert
-        var matchingResult = results.FirstOrDefault(x => x.Subtitle?.StartsWith(expectedSubtitle, StringComparison.CurrentCulture) == true);
-        Assert.IsNotNull(matchingResult, $"Could not find result with subtitle starting with '{expectedSubtitle}' for query '{query}'");
     }
 
     [DataTestMethod]
@@ -157,24 +135,6 @@ public class QueryTests
     [DataRow("time:eeee")]
     [DataRow("time::eeee")]
     [DataRow("time//eeee")]
-    public void InvalidInputShowsErrorResults(string query)
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
-
-        // Assert
-        Assert.IsNotNull(results, $"Results should not be null for query '{query}'");
-        Assert.IsTrue(results.Count > 0, $"Query '{query}' should return at least one result");
-
-        // For invalid input, cmdpal returns an error result
-        var hasErrorResult = results.Any(r => r.Title?.StartsWith("Error: Invalid input", StringComparison.CurrentCulture) == true);
-        Assert.IsTrue(hasErrorResult, $"Query '{query}' should return an error result for invalid input");
-    }
-
-    [DataTestMethod]
     [DataRow("ug1646408119")] // Invalid prefix
     [DataRow("u9999999999999")] // Unix number + prefix is longer than 12 characters
     [DataRow("ums999999999999999")] // Unix number in milliseconds + prefix is longer than 17 characters
@@ -194,116 +154,33 @@ public class QueryTests
     [DataRow("10.aa.22")]
     [DataRow("12::55")]
     [DataRow("12:aa:55")]
-    public void InvalidNumberInputShowsErrorMessage(string query)
+    public void InvalidInputShowsErrorResults(string query)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
-
+        page.UpdateSearchText(string.Empty, query);
-        // Act
+        var results = page.GetItems();
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
 
         // Assert
         Assert.IsNotNull(results, $"Results should not be null for query '{query}'");
-        Assert.IsTrue(results.Count > 0, $"Should return at least one result (error message) for invalid query '{query}'");
+        Assert.IsTrue(results.Length > 0, $"Query '{query}' should return at least one result");
 
-        // Check if we get an error result
+        var firstItem = results.FirstOrDefault();
-        var errorResult = results.FirstOrDefault(r => r.Title?.StartsWith("Error: Invalid input", StringComparison.CurrentCulture) == true);
+        Assert.IsTrue(firstItem.Title.StartsWith("Error: Invalid input", StringComparison.CurrentCulture), $"Query '{query}' should return an error result for invalid input");
-        Assert.IsNotNull(errorResult, $"Should return an error result for invalid query '{query}'");
     }
 
     [DataTestMethod]
-    [DataRow("10.10aa")] // Input contains <Number>.<Number> (Can be part of a date.)
+    [DataRow("")]
-    [DataRow("10:10aa")] // Input contains <Number>:<Number> (Can be part of a time.)
+    [DataRow(null)]
-    [DataRow("10/10aa")] // Input contains <Number>/<Number> (Can be part of a date.)
+    public void EmptyQueryReturnsAllResults(string input)
-    public void InvalidInputNotShowsErrorMessage(string query)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
-
+        page.UpdateSearchText("abc", input);
-        // Act
+        var results = page.GetItems();
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
 
         // Assert
-        Assert.IsNotNull(results, $"Results should not be null for query '{query}'");
+        Assert.IsTrue(results.Length > 0, $"Empty query should return results");
-
-        // These queries are ambiguous and cmdpal returns an error for them
-        // This test might need to be adjusted based on actual cmdpal behavior
-        if (results.Count > 0)
-        {
-            var hasErrorResult = results.Any(r => r.Title?.StartsWith("Error: Invalid input", StringComparison.CurrentCulture) == true);
-
-            // For these ambiguous inputs, cmdpal may return error results, which is acceptable
-            // We just verify that the system handles them gracefully (doesn't crash)
-            Assert.IsTrue(true, $"Query '{query}' handled gracefully");
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "time", true)] // Full word match should work
-    [DataRow("date", "date", true)] // Full word match should work
-    [DataRow("now", "now", true)] // Full word match should work
-    [DataRow("year", "year", true)] // Full word match should work
-    [DataRow("abcdefg", "", false)] // Invalid query should return error
-    public void ValidateBehaviorOnSearchQueries(string query, string expectedMatchTerm, bool shouldHaveValidResults)
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
-
-        // Assert
-        Assert.IsNotNull(results, $"Results should not be null for query '{query}'");
-        Assert.IsTrue(results.Count > 0, $"Query '{query}' should return at least one result");
-
-        if (shouldHaveValidResults)
-        {
-            // Should have non-error results
-            var hasValidResult = results.Any(r => !r.Title?.StartsWith("Error: Invalid input", StringComparison.CurrentCulture) == true);
-            Assert.IsTrue(hasValidResult, $"Query '{query}' should return valid (non-error) results");
-
-            if (!string.IsNullOrEmpty(expectedMatchTerm))
-            {
-                var hasMatchingResult = results.Any(r =>
-                    r.Title?.Contains(expectedMatchTerm, StringComparison.CurrentCultureIgnoreCase) == true ||
-                    r.Subtitle?.Contains(expectedMatchTerm, StringComparison.CurrentCultureIgnoreCase) == true);
-                Assert.IsTrue(hasMatchingResult, $"Query '{query}' should return results containing '{expectedMatchTerm}'");
-            }
-        }
-        else
-        {
-            // Should have error results
-            var hasErrorResult = results.Any(r => r.Title?.StartsWith("Error: Invalid input", StringComparison.CurrentCulture) == true);
-            Assert.IsTrue(hasErrorResult, $"Query '{query}' should return error results for invalid input");
-        }
-    }
-
-    [TestMethod]
-    public void EmptyQueryReturnsAllResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = TimeDateCalculator.ExecuteSearch(settings, string.Empty);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Empty query should return all available results");
-    }
-
-    [TestMethod]
-    public void NullQueryReturnsAllResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = TimeDateCalculator.ExecuteSearch(settings, null);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Null query should return all available results");
     }
 
     [DataTestMethod]
@@ -312,39 +189,34 @@ public class QueryTests
     [DataRow("iso utc", "ISO 8601 UTC")]
     [DataRow("iso zone", "ISO 8601 with time zone")]
     [DataRow("iso utc zone", "ISO 8601 UTC with time zone")]
-    public void UTCRelatedQueries(string query, string expectedSubtitle)
+    public void TimeZoneQuery(string query, string expectedSubtitle)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
-
+        page.UpdateSearchText(string.Empty, query);
-        // Act
+        var resultsList = page.GetItems();
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
+        var results = Query(query, resultsList);
 
         // Assert
         Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, $"Query '{query}' should return results");
+        var firstResult = results.FirstOrDefault();
-
+        Assert.IsTrue(firstResult.Subtitle.StartsWith(expectedSubtitle, StringComparison.CurrentCulture), $"Could not find result with subtitle starting with '{expectedSubtitle}' for query '{query}'");
-        var matchingResult = results.FirstOrDefault(x => x.Subtitle?.StartsWith(expectedSubtitle, StringComparison.CurrentCulture) == true);
-        Assert.IsNotNull(matchingResult, $"Could not find result with subtitle starting with '{expectedSubtitle}' for query '{query}'");
     }
 
     [DataTestMethod]
-    [DataRow("time::12:30:45")]
+    [DataRow("time::12:30:45", "12:30 PM")]
-    [DataRow("date::2023-12-25")]
+    [DataRow("date::2023-12-25", "12/25/2023")]
-    [DataRow("now::u1646408119")]
+    [DataRow("now::u1646408119", "132908817190000000")]
-    [DataRow("current::ft637820085517321977")]
+    public void DelimiterQueriesReturnResults(string query, string expectedResult)
-    public void DelimiterQueriesReturnResults(string query)
     {
-        // Setup
+        var settings = new Settings();
-        var settings = new SettingsManager();
+        var page = new TimeDateExtensionPage(settings);
-
+        page.UpdateSearchText(string.Empty, query);
-        // Act
+        var resultsList = page.GetItems();
-        var results = TimeDateCalculator.ExecuteSearch(settings, query);
 
         // Assert
-        Assert.IsNotNull(results);
+        Assert.IsNotNull(resultsList);
-
+        var firstResult = resultsList.FirstOrDefault();
-        // Delimiter queries should return results even if parsing fails (error results)
+        Assert.IsTrue(firstResult.Title.Contains(expectedResult, StringComparison.CurrentCulture), $"Delimiter query '{query}' result not match {expectedResult} current result {firstResult.Title}");
-        Assert.IsTrue(results.Count > 0, $"Delimiter query '{query}' should return at least one result");
     }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/Settings.cs

@@ -0,0 +1,46 @@
+// 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.Collections.Generic;
+using Microsoft.CmdPal.Ext.TimeDate.Helpers;
+
+namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
+
+public class Settings : ISettingsInterface
+{
+    private readonly int firstWeekOfYear;
+    private readonly int firstDayOfWeek;
+    private readonly bool enableFallbackItems;
+    private readonly bool timeWithSecond;
+    private readonly bool dateWithWeekday;
+    private readonly List<string> customFormats;
+
+    public Settings(
+        int firstWeekOfYear = -1,
+        int firstDayOfWeek = -1,
+        bool enableFallbackItems = true,
+        bool timeWithSecond = false,
+        bool dateWithWeekday = false,
+        List<string> customFormats = null)
+    {
+        this.firstWeekOfYear = firstWeekOfYear;
+        this.firstDayOfWeek = firstDayOfWeek;
+        this.enableFallbackItems = enableFallbackItems;
+        this.timeWithSecond = timeWithSecond;
+        this.dateWithWeekday = dateWithWeekday;
+        this.customFormats = customFormats ?? new List<string>();
+    }
+
+    public int FirstWeekOfYear => firstWeekOfYear;
+
+    public int FirstDayOfWeek => firstDayOfWeek;
+
+    public bool EnableFallbackItems => enableFallbackItems;
+
+    public bool TimeWithSecond => timeWithSecond;
+
+    public bool DateWithWeekday => dateWithWeekday;
+
+    public List<string> CustomFormats => customFormats;
+}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/SettingsManagerTests.cs

@@ -1,85 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class SettingsManagerTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void Cleanup()
-    {
-        // Restore original culture
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    [TestMethod]
-    public void SettingsManagerInitializationTest()
-    {
-        // Act
-        var settingsManager = new SettingsManager();
-
-        // Assert
-        Assert.IsNotNull(settingsManager);
-        Assert.IsNotNull(settingsManager.Settings);
-    }
-
-    [TestMethod]
-    public void DefaultSettingsValidation()
-    {
-        // Act
-        var settingsManager = new SettingsManager();
-
-        // Assert - Check that properties are accessible
-        var enableFallback = settingsManager.EnableFallbackItems;
-        var timeWithSecond = settingsManager.TimeWithSecond;
-        var dateWithWeekday = settingsManager.DateWithWeekday;
-        var firstWeekOfYear = settingsManager.FirstWeekOfYear;
-        var firstDayOfWeek = settingsManager.FirstDayOfWeek;
-        var customFormats = settingsManager.CustomFormats;
-
-        Assert.IsNotNull(customFormats);
-    }
-
-    [TestMethod]
-    public void SettingsPropertiesAccessibilityTest()
-    {
-        // Setup
-        var settingsManager = new SettingsManager();
-
-        // Act & Assert - Verify all properties are accessible without exception
-        try
-        {
-            _ = settingsManager.EnableFallbackItems;
-            _ = settingsManager.TimeWithSecond;
-            _ = settingsManager.DateWithWeekday;
-            _ = settingsManager.FirstWeekOfYear;
-            _ = settingsManager.FirstDayOfWeek;
-            _ = settingsManager.CustomFormats;
-        }
-        catch (Exception ex)
-        {
-            Assert.Fail($"Settings properties should be accessible: {ex.Message}");
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests.csproj

@@ -20,5 +20,6 @@
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
+    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/PluginSettingsTests.cs

@@ -1,60 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Reflection;
-
-using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.WindowWalker.UnitTests;
-
-[TestClass]
-public class PluginSettingsTests
-{
-    [DataTestMethod]
-    [DataRow("ResultsFromVisibleDesktopOnly")]
-    [DataRow("SubtitleShowPid")]
-    [DataRow("SubtitleShowDesktopName")]
-    [DataRow("ConfirmKillProcess")]
-    [DataRow("KillProcessTree")]
-    [DataRow("OpenAfterKillAndClose")]
-    [DataRow("HideKillProcessOnElevatedProcesses")]
-    [DataRow("HideExplorerSettingInfo")]
-    [DataRow("InMruOrder")]
-    public void DoesSettingExist(string name)
-    {
-        // Setup
-        Type settings = SettingsManager.Instance?.GetType();
-
-        // Act
-        var result = settings?.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
-
-        // Assert
-        Assert.IsNotNull(result);
-    }
-
-    [DataTestMethod]
-    [DataRow("ResultsFromVisibleDesktopOnly", false)]
-    [DataRow("SubtitleShowPid", false)]
-    [DataRow("SubtitleShowDesktopName", true)]
-    [DataRow("ConfirmKillProcess", true)]
-    [DataRow("KillProcessTree", false)]
-    [DataRow("OpenAfterKillAndClose", false)]
-    [DataRow("HideKillProcessOnElevatedProcesses", false)]
-    [DataRow("HideExplorerSettingInfo", true)]
-    [DataRow("InMruOrder", true)]
-    public void DefaultValues(string name, bool valueExpected)
-    {
-        // Setup
-        SettingsManager setting = SettingsManager.Instance;
-
-        // Act
-        PropertyInfo propertyInfo = setting?.GetType()?.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
-        var result = propertyInfo?.GetValue(setting);
-
-        // Assert
-        Assert.AreEqual(valueExpected, result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.UnitTests;
+
+public class Settings : ISettingsInterface
+{
+    private readonly bool resultsFromVisibleDesktopOnly;
+    private readonly bool subtitleShowPid;
+    private readonly bool subtitleShowDesktopName;
+    private readonly bool confirmKillProcess;
+    private readonly bool killProcessTree;
+    private readonly bool openAfterKillAndClose;
+    private readonly bool hideKillProcessOnElevatedProcesses;
+    private readonly bool hideExplorerSettingInfo;
+    private readonly bool inMruOrder;
+
+    public Settings(
+        bool resultsFromVisibleDesktopOnly = false,
+        bool subtitleShowPid = false,
+        bool subtitleShowDesktopName = true,
+        bool confirmKillProcess = true,
+        bool killProcessTree = false,
+        bool openAfterKillAndClose = false,
+        bool hideKillProcessOnElevatedProcesses = false,
+        bool hideExplorerSettingInfo = true,
+        bool inMruOrder = true)
+    {
+        this.resultsFromVisibleDesktopOnly = resultsFromVisibleDesktopOnly;
+        this.subtitleShowPid = subtitleShowPid;
+        this.subtitleShowDesktopName = subtitleShowDesktopName;
+        this.confirmKillProcess = confirmKillProcess;
+        this.killProcessTree = killProcessTree;
+        this.openAfterKillAndClose = openAfterKillAndClose;
+        this.hideKillProcessOnElevatedProcesses = hideKillProcessOnElevatedProcesses;
+        this.hideExplorerSettingInfo = hideExplorerSettingInfo;
+        this.inMruOrder = inMruOrder;
+    }
+
+    public bool ResultsFromVisibleDesktopOnly => resultsFromVisibleDesktopOnly;
+
+    public bool SubtitleShowPid => subtitleShowPid;
+
+    public bool SubtitleShowDesktopName => subtitleShowDesktopName;
+
+    public bool ConfirmKillProcess => confirmKillProcess;
+
+    public bool KillProcessTree => killProcessTree;
+
+    public bool OpenAfterKillAndClose => openAfterKillAndClose;
+
+    public bool HideKillProcessOnElevatedProcesses => hideKillProcessOnElevatedProcesses;
+
+    public bool HideExplorerSettingInfo => hideExplorerSettingInfo;
+
+    public bool InMruOrder => inMruOrder;
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs

@@ -12,21 +12,21 @@ namespace Microsoft.CmdPal.Ext.Calc;
 
 public partial class CalculatorCommandProvider : CommandProvider
 {
+    private static ISettingsInterface settings = new SettingsManager();
     private readonly ListItem _listItem = new(new CalculatorListPage(settings))
     {
         Subtitle = Resources.calculator_top_level_subtitle,
-        MoreCommands = [new CommandContextItem(settings.Settings.SettingsPage)],
+        MoreCommands = [new CommandContextItem(((SettingsManager)settings).Settings.SettingsPage)],
     };
 
     private readonly FallbackCalculatorItem _fallback = new(settings);
-    private static SettingsManager settings = new();
 
     public CalculatorCommandProvider()
     {
         Id = "Calculator";
         DisplayName = Resources.calculator_display_name;
         Icon = Icons.CalculatorIcon;
-        Settings = settings.Settings;
+        Settings = ((SettingsManager)settings).Settings;
     }
 
     public override ICommandItem[] TopLevelCommands() => [_listItem];

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs

@@ -34,7 +34,7 @@ public static partial class CalculateEngine
     /// Interpret
     /// </summary>
     /// <param name="cultureInfo">Use CultureInfo.CurrentCulture if something is user facing</param>
-    public static CalculateResult Interpret(SettingsManager settings, string input, CultureInfo cultureInfo, out string error)
+    public static CalculateResult Interpret(ISettingsInterface settings, string input, CultureInfo cultureInfo, out string error)
     {
         error = default;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/ISettingsInterface.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Ext.Calc.Helper;
+
+namespace Microsoft.CmdPal.Ext.Calc.Helper;
+
+public interface ISettingsInterface
+{
+    public CalculateEngine.TrigMode TrigUnit { get; }
+
+    public bool InputUseEnglishFormat { get; }
+
+    public bool OutputUseEnglishFormat { get; }
+
+    public bool CloseOnEnter { get; }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs

@@ -12,7 +12,7 @@ namespace Microsoft.CmdPal.Ext.Calc.Helper;
 
 public static partial class QueryHelper
 {
-    public static ListItem Query(string query, SettingsManager settings, bool isFallbackSearch, TypedEventHandler<object, object> handleSave = null)
+    public static ListItem Query(string query, ISettingsInterface settings, bool isFallbackSearch, TypedEventHandler<object, object> handleSave = null)
     {
         ArgumentNullException.ThrowIfNull(query);
         if (!isFallbackSearch)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/ResultHelper.cs

@@ -13,7 +13,7 @@ namespace Microsoft.CmdPal.Ext.Calc.Helper;
 
 public static class ResultHelper
 {
-    public static ListItem CreateResult(decimal? roundedResult, CultureInfo inputCulture, CultureInfo outputCulture, string query, SettingsManager settings, TypedEventHandler<object, object> handleSave)
+    public static ListItem CreateResult(decimal? roundedResult, CultureInfo inputCulture, CultureInfo outputCulture, string query, ISettingsInterface settings, TypedEventHandler<object, object> handleSave)
     {
         // Return null when the expression is not a valid calculator query.
         if (roundedResult == null)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/SettingsManager.cs

@@ -8,7 +8,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Calc.Helper;
 
-public class SettingsManager : JsonSettingsManager
+public class SettingsManager : JsonSettingsManager, ISettingsInterface
 {
     private static readonly string _namespace = "calculator";
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Pages/CalculatorListPage.cs

@@ -23,7 +23,7 @@ namespace Microsoft.CmdPal.Ext.Calc.Pages;
 public sealed partial class CalculatorListPage : DynamicListPage
 {
     private readonly Lock _resultsLock = new();
-    private readonly SettingsManager _settingsManager;
+    private readonly ISettingsInterface _settingsManager;
     private readonly List<ListItem> _items = [];
     private readonly List<ListItem> history = [];
     private readonly ListItem _emptyItem;
@@ -32,7 +32,7 @@ public sealed partial class CalculatorListPage : DynamicListPage
     // We need to avoid the double calculation. This may cause some wierd behaviors.
     private string skipQuerySearchText = string.Empty;
 
-    public CalculatorListPage(SettingsManager settings)
+    public CalculatorListPage(ISettingsInterface settings)
     {
         _settingsManager = settings;
         Icon = Icons.CalculatorIcon;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Pages/FallbackCalculatorItem.cs

@@ -11,9 +11,9 @@ namespace Microsoft.CmdPal.Ext.Calc.Pages;
 public sealed partial class FallbackCalculatorItem : FallbackCommandItem
 {
     private readonly CopyTextCommand _copyCommand = new(string.Empty);
-    private readonly SettingsManager _settings;
+    private readonly ISettingsInterface _settings;
 
-    public FallbackCalculatorItem(SettingsManager settings)
+    public FallbackCalculatorItem(ISettingsInterface settings)
         : base(new NoOpCommand(), Resources.calculator_title)
     {
         Command = _copyCommand;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/Helpers/ISettingsInterface.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Ext.Registry.Helpers;
+
+public interface ISettingsInterface
+{
+    // Add registry-specific settings methods here if needed
+    // For now, this can be empty if there are no settings for Registry
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/Helpers/SettingsManager.cs

@@ -0,0 +1,37 @@
+// 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.IO;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Registry.Helpers;
+
+public class SettingsManager : JsonSettingsManager, ISettingsInterface
+{
+    private static readonly string _namespace = "registry";
+
+    private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
+
+    internal static string SettingsJsonPath()
+    {
+        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        Directory.CreateDirectory(directory);
+
+        // now, the state is just next to the exe
+        return Path.Combine(directory, "settings.json");
+    }
+
+    public SettingsManager()
+    {
+        FilePath = SettingsJsonPath();
+
+        // Add settings here when needed
+        // Settings.Add(setting);
+
+        // Load settings from file upon initialization
+        LoadSettings();
+
+        Settings.SettingsChanged += (s, a) => this.SaveSettings();
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/Pages/RegistryListPage.cs

@@ -18,12 +18,14 @@ internal sealed partial class RegistryListPage : DynamicListPage
     public static IconInfo RegistryIcon { get; } = new("\uE74C"); // OEM
 
     private readonly CommandItem _emptyMessage;
+    private readonly ISettingsInterface _settingsManager;
 
-    public RegistryListPage()
+    public RegistryListPage(ISettingsInterface settingsManager)
     {
         Icon = Icons.RegistryIcon;
         Name = Title = Resources.Registry_Page_Title;
         Id = "com.microsoft.cmdpal.registry";
+        _settingsManager = settingsManager;
         _emptyMessage = new CommandItem()
         {
             Icon = Icons.RegistryIcon,

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CmdPal.Ext.Registry.Helpers;
 using Microsoft.CmdPal.Ext.Registry.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -10,6 +11,8 @@ namespace Microsoft.CmdPal.Ext.Registry;
 
 public partial class RegistryCommandsProvider : CommandProvider
 {
+    private static readonly ISettingsInterface _settingsManager = new SettingsManager();
+
     public RegistryCommandsProvider()
     {
         Id = "Windows.Registry";
@@ -20,7 +23,7 @@ public partial class RegistryCommandsProvider : CommandProvider
     public override ICommandItem[] TopLevelCommands()
     {
         return [
-            new CommandItem(new RegistryListPage())
+            new CommandItem(new RegistryListPage(_settingsManager))
             {
                 Title = "Registry",
                 Subtitle = "Navigate the Windows registry",

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/FallbackTimeDateItem.cs

@@ -16,10 +16,10 @@ namespace Microsoft.CmdPal.Ext.TimeDate;
 internal sealed partial class FallbackTimeDateItem : FallbackCommandItem
 {
     private readonly HashSet<string> _validOptions;
-    private SettingsManager _settingsManager;
+    private ISettingsInterface _settingsManager;
     private DateTime? _timestamp;
 
-    public FallbackTimeDateItem(SettingsManager settings, DateTime? timestamp = null)
+    public FallbackTimeDateItem(ISettingsInterface settings, DateTime? timestamp = null)
          : base(new NoOpCommand(), Resources.Microsoft_plugin_timedate_fallback_display_title)
     {
         Title = string.Empty;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/AvailableResultsList.cs

@@ -22,7 +22,7 @@ internal static class AvailableResultsList
     /// <param name="firstWeekOfYear">Required for UnitTest: Use custom first week of the year instead of the plugin setting.</param>
     /// <param name="firstDayOfWeek">Required for UnitTest: Use custom first day of the week instead the plugin setting.</param>
     /// <returns>List of results</returns>
-    internal static List<AvailableResult> GetList(bool isKeywordSearch, SettingsManager settings, bool? timeLongFormat = null, bool? dateLongFormat = null, DateTime? timestamp = null, CalendarWeekRule? firstWeekOfYear = null, DayOfWeek? firstDayOfWeek = null)
+    internal static List<AvailableResult> GetList(bool isKeywordSearch, ISettingsInterface settings, bool? timeLongFormat = null, bool? dateLongFormat = null, DateTime? timestamp = null, CalendarWeekRule? firstWeekOfYear = null, DayOfWeek? firstDayOfWeek = null)
     {
         var results = new List<AvailableResult>();
         var calendar = CultureInfo.CurrentCulture.Calendar;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/ISettingsInterface.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
+
+public interface ISettingsInterface
+{
+    public int FirstWeekOfYear { get; }
+
+    public int FirstDayOfWeek { get; }
+
+    public bool EnableFallbackItems { get; }
+
+    public bool TimeWithSecond { get; }
+
+    public bool DateWithWeekday { get; }
+
+    public List<string> CustomFormats { get; }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/SettingsManager.cs

@@ -11,7 +11,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
 
-public class SettingsManager : JsonSettingsManager
+public class SettingsManager : JsonSettingsManager, ISettingsInterface
 {
     // Line break character used in WinUI3 TextBox and TextBlock.
     private const char TEXTBOXNEWLINE = '\r';

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs

@@ -27,7 +27,7 @@ public sealed partial class TimeDateCalculator
     /// </summary>
     /// <param name="query">Search query object</param>
     /// <returns>List of Wox <see cref="Result"/>s.</returns>
-    public static List<ListItem> ExecuteSearch(SettingsManager settings, string query)
+    public static List<ListItem> ExecuteSearch(ISettingsInterface settings, string query)
     {
         var isEmptySearchInput = string.IsNullOrWhiteSpace(query);
         List<AvailableResult> availableFormats = new List<AvailableResult>();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs

@@ -19,9 +19,9 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
     private IList<ListItem> _results = new List<ListItem>();
     private bool _dataLoaded;
 
-    private SettingsManager _settingsManager;
+    private ISettingsInterface _settingsManager;
 
-    public TimeDateExtensionPage(SettingsManager settingsManager)
+    public TimeDateExtensionPage(ISettingsInterface settingsManager)
     {
         Icon = Icons.TimeDateExtIcon;
         Title = Resources.Microsoft_plugin_timedate_main_page_title;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs

@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate;
 public partial class TimeDateCommandsProvider : CommandProvider
 {
     private readonly CommandItem _command;
-    private static readonly SettingsManager _settingsManager = new();
+    private static readonly SettingsManager _settingsManager = new SettingsManager();
     private static readonly CompositeFormat MicrosoftPluginTimedatePluginDescription = System.Text.CompositeFormat.Parse(Resources.Microsoft_plugin_timedate_plugin_description);
     private static readonly TimeDateExtensionPage _timeDateExtensionPage = new(_settingsManager);
     private readonly FallbackTimeDateItem _fallbackTimeDateItem = new(_settingsManager);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs

@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+public interface ISettingsInterface
+{
+    public bool ResultsFromVisibleDesktopOnly { get; }
+
+    public bool SubtitleShowPid { get; }
+
+    public bool SubtitleShowDesktopName { get; }
+
+    public bool ConfirmKillProcess { get; }
+
+    public bool KillProcessTree { get; }
+
+    public bool OpenAfterKillAndClose { get; }
+
+    public bool HideKillProcessOnElevatedProcesses { get; }
+
+    public bool HideExplorerSettingInfo { get; }
+
+    public bool InMruOrder { get; }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs

@@ -8,7 +8,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 
-public class SettingsManager : JsonSettingsManager
+public class SettingsManager : JsonSettingsManager, ISettingsInterface
 {
     private static readonly string _namespace = "windowWalker";
 

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleContentPage.cs

@@ -225,6 +225,11 @@ internal sealed partial class SampleContentForm : FormContent
                     }
                 ]
             }
+        },
+        {
+            "type": "Action.OpenUrl",
+            "title": "Action.OpenUrl",
+            "url": "https://adaptivecards.microsoft.com/"
         }
     ]
 }

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

@@ -149,7 +149,7 @@
                         IsClosable="False"
                         IsOpen="True"
                         Severity="Informational"
-                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource BoolToReverseVisibilityConverter}}">
+                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
                         <InfoBar.ActionButton>
                             <HyperlinkButton x:Uid="OpenSettings" Click="OpenAnimationsSettings_Click" />
                         </InfoBar.ActionButton>

src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs

@@ -69,16 +69,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private void AddDashboardListItem(ModuleType moduleType)
         {
             GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
-            AllModules.Add(new DashboardListItem()
+            var newItem = new DashboardListItem()
             {
                 Tag = moduleType,
                 Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
                 IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
                 IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
                 Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
-                EnabledChangedCallback = EnabledChangedOnUI,
                 DashboardModuleItems = GetModuleItems(moduleType),
-            });
+            };
+
+            AllModules.Add(newItem);
+            newItem.EnabledChangedCallback = EnabledChangedOnUI;
         }
 
         private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
@@ -120,16 +122,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
                 if (filteredItems.Count != 0)
                 {
-                    ShortcutModules.Add(new DashboardListItem
+                    var newItem = new DashboardListItem
                     {
-                        EnabledChangedCallback = x.EnabledChangedCallback,
                         Icon = x.Icon,
                         IsLocked = x.IsLocked,
                         Label = x.Label,
                         Tag = x.Tag,
                         IsEnabled = x.IsEnabled,
                         DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
-                    });
+                    };
+
+                    ShortcutModules.Add(newItem);
+                    newItem.EnabledChangedCallback = x.EnabledChangedCallback;
                 }
             }
 
@@ -141,16 +145,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
                 if (filteredItems.Count != 0)
                 {
-                    ActionModules.Add(new DashboardListItem
+                    var newItem = new DashboardListItem
                     {
-                        EnabledChangedCallback = x.EnabledChangedCallback,
                         Icon = x.Icon,
                         IsLocked = x.IsLocked,
                         Label = x.Label,
                         Tag = x.Tag,
                         IsEnabled = x.IsEnabled,
                         DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
-                    });
+                    };
+
+                    ActionModules.Add(newItem);
+                    newItem.EnabledChangedCallback = x.EnabledChangedCallback;
                 }
             }
         }