remove unused import

.pipelines/v2/ci-test-with-canary-webview2.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -36,8 +36,7 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWebView2: ${{ parameters.useLatestWebView2 }}

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -19,7 +19,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -42,8 +42,7 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
@@ -46,7 +46,6 @@ extends:
   template: templates/pipeline-ci-build.yml
   parameters:
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-      enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
     runTests: ${{ parameters.runTests }}
     useVSPreview: ${{ parameters.useVSPreview }}

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -3,6 +3,9 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
 
 parameters:
   - name: buildPlatforms

.pipelines/v2/templates/pipeline-ui-tests-automation.yml

@@ -3,6 +3,9 @@ variables:
     value: false
   - name: EnablePipelineCache
     value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
 
 parameters:
   - name: buildPlatforms

packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.318-preview" />
-  <package id="Microsoft.MSBuildCache.Local" version="0.1.318-preview" />
-  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.318-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.283-preview" />
 </packages>

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "MouseHighlighter.h"
 #include "trace.h"
-#include <cmath>
 
 #ifdef COMPOSITION
 namespace winrt
@@ -44,7 +43,7 @@ private:
     void AddDrawingPoint(MouseButton button);
     void UpdateDrawingPointPosition(MouseButton button);
     void StartDrawingPointFading(MouseButton button);
-    void ClearDrawingPoint();
+    void ClearDrawingPoint(MouseButton button);
     void ClearDrawing();
     void BringToFront();
     HHOOK m_mouseHook = NULL;
@@ -67,12 +66,10 @@ private:
     winrt::CompositionSpriteShape m_leftPointer{ nullptr };
     winrt::CompositionSpriteShape m_rightPointer{ nullptr };
     winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
-    winrt::CompositionSpriteShape m_spotlightPointer{ nullptr };
 
     bool m_leftPointerEnabled = true;
     bool m_rightPointerEnabled = true;
     bool m_alwaysPointerEnabled = true;
-    bool m_spotlightMode = false;
 
     bool m_leftButtonPressed = false;
     bool m_rightButtonPressed = false;
@@ -98,7 +95,8 @@ bool Highlighter::CreateHighlighter()
     try
     {
         // We need a dispatcher queue.
-        DispatcherQueueOptions options = {
+        DispatcherQueueOptions options =
+        {
             sizeof(options),
             DQTYPE_THREAD_CURRENT,
             DQTAT_COM_ASTA,
@@ -124,8 +122,7 @@ bool Highlighter::CreateHighlighter()
         m_root.Children().InsertAtTop(m_shape);
 
         return true;
-    }
-    catch (...)
+    } catch (...)
     {
         return false;
     }
@@ -133,9 +130,6 @@ bool Highlighter::CreateHighlighter()
 
 void Highlighter::AddDrawingPoint(MouseButton button)
 {
-    if (!m_compositor)
-        return;
-
     POINT pt;
 
     // Applies DPIs.
@@ -147,7 +141,6 @@ void Highlighter::AddDrawingPoint(MouseButton button)
     // Create circle and add it.
     auto circleGeometry = m_compositor.CreateEllipseGeometry();
     circleGeometry.Radius({ m_radius, m_radius });
-
     auto circleShape = m_compositor.CreateSpriteShape(circleGeometry);
     circleShape.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
     if (button == MouseButton::Left)
@@ -163,22 +156,9 @@ void Highlighter::AddDrawingPoint(MouseButton button)
     else
     {
         // always
-        if (m_spotlightMode)
-        {
-            float borderThickness = static_cast<float>(std::hypot(GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)));
-            circleGeometry.Radius({ static_cast<float>(borderThickness / 2.0 + m_radius), static_cast<float>(borderThickness / 2.0 + m_radius) });
-            circleShape.FillBrush(nullptr);
-            circleShape.StrokeBrush(m_compositor.CreateColorBrush(m_alwaysColor));
-            circleShape.StrokeThickness(borderThickness);
-            m_spotlightPointer = circleShape;
-        }
-        else
-        {
-            circleShape.FillBrush(m_compositor.CreateColorBrush(m_alwaysColor));
-            m_alwaysPointer = circleShape;
-        }
+        circleShape.FillBrush(m_compositor.CreateColorBrush(m_alwaysColor));
+        m_alwaysPointer = circleShape;
     }
-
     m_shape.Shapes().Append(circleShape);
 
     // TODO: We're leaking shapes for long drawing sessions.
@@ -210,20 +190,7 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
     else
     {
         // always
-        if (m_spotlightMode)
-        {
-            if (m_spotlightPointer)
-            {
-                m_spotlightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
-            }
-        }
-        else
-        {
-            if (m_alwaysPointer)
-            {
-                m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
-            }
-        }
+        m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
     }
 }
 void Highlighter::StartDrawingPointFading(MouseButton button)
@@ -262,22 +229,20 @@ void Highlighter::StartDrawingPointFading(MouseButton button)
     circleShape.FillBrush().StartAnimation(L"Color", animation);
 }
 
-void Highlighter::ClearDrawingPoint()
+void Highlighter::ClearDrawingPoint(MouseButton _button)
 {
-    if (m_spotlightMode)
+    winrt::Windows::UI::Composition::CompositionSpriteShape circleShape{ nullptr };
+
+    if (nullptr == m_alwaysPointer)
     {
-        if (m_spotlightPointer)
-        {
-            m_spotlightPointer.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        }
-    }
-    else
-    {
-        if (m_alwaysPointer)
-        {
-            m_alwaysPointer.FillBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        }
+        // Guard against alwaysPointer not being initialized.
+        return;
     }
+
+    // always
+    circleShape = m_alwaysPointer;
+
+    circleShape.FillBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
 }
 
 void Highlighter::ClearDrawing()
@@ -304,14 +269,13 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
                 if (instance->m_alwaysPointerEnabled && !instance->m_rightButtonPressed)
                 {
                     // Clear AlwaysPointer only when it's enabled and RightPointer is not active
-                    instance->ClearDrawingPoint();
+                    instance->ClearDrawingPoint(MouseButton::None);
                 }
                 if (instance->m_leftButtonPressed)
                 {
                     // There might be a stray point from the user releasing the mouse button on an elevated window, which wasn't caught by us.
                     instance->StartDrawingPointFading(MouseButton::Left);
                 }
-
                 instance->AddDrawingPoint(MouseButton::Left);
                 instance->m_leftButtonPressed = true;
                 // start a timer for the scenario, when the user clicks a pinned window which has no focus.
@@ -329,7 +293,7 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa
                 if (instance->m_alwaysPointerEnabled && !instance->m_leftButtonPressed)
                 {
                     // Clear AlwaysPointer only when it's enabled and LeftPointer is not active
-                    instance->ClearDrawingPoint();
+                    instance->ClearDrawingPoint(MouseButton::None);
                 }
                 if (instance->m_rightButtonPressed)
                 {
@@ -394,21 +358,13 @@ void Highlighter::StartDrawing()
 {
     Logger::info("Starting draw mode.");
     Trace::StartHighlightingSession();
-
-    if (m_spotlightMode && m_alwaysColor.A != 0)
-    {
-        Trace::StartSpotlightSession();
-    }
-
     m_visible = true;
 
     // HACK: Draw with 1 pixel off. Otherwise Windows glitches the task bar transparency when a transparent window fill the whole screen.
     SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
     ClearDrawing();
     ShowWindow(m_hwnd, SW_SHOWNOACTIVATE);
-
-    instance->AddDrawingPoint(Highlighter::MouseButton::None);
-
+    instance->AddDrawingPoint(MouseButton::None);
     m_mouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseHookProc, m_hinstance, 0);
 }
 
@@ -421,7 +377,6 @@ void Highlighter::StopDrawing()
     m_leftPointer = nullptr;
     m_rightPointer = nullptr;
     m_alwaysPointer = nullptr;
-    m_spotlightPointer = nullptr;
     ShowWindow(m_hwnd, SW_HIDE);
     UnhookWindowsHookEx(m_mouseHook);
     ClearDrawing();
@@ -433,8 +388,7 @@ void Highlighter::SwitchActivationMode()
     PostMessage(m_hwnd, WM_SWITCH_ACTIVATION_MODE, 0, 0);
 }
 
-void Highlighter::ApplySettings(MouseHighlighterSettings settings)
-{
+void Highlighter::ApplySettings(MouseHighlighterSettings settings) {
     m_radius = static_cast<float>(settings.radius);
     m_fadeDelay_ms = settings.fadeDelayMs;
     m_fadeDuration_ms = settings.fadeDurationMs;
@@ -444,23 +398,9 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
     m_leftPointerEnabled = settings.leftButtonColor.A != 0;
     m_rightPointerEnabled = settings.rightButtonColor.A != 0;
     m_alwaysPointerEnabled = settings.alwaysColor.A != 0;
-    m_spotlightMode = settings.spotlightMode && settings.alwaysColor.A != 0;
-
-    if (m_spotlightMode)
-    {
-        m_leftPointerEnabled = false;
-        m_rightPointerEnabled = false;
-    }
-
-    if (instance->m_visible)
-    {
-        instance->StopDrawing();
-        instance->StartDrawing();
-    }
 }
 
-void Highlighter::BringToFront()
-{
+void Highlighter::BringToFront() {
     // HACK: Draw with 1 pixel off. Otherwise Windows glitches the task bar transparency when a transparent window fill the whole screen.
     SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
 }
@@ -548,7 +488,8 @@ bool Highlighter::MyRegisterClass(HINSTANCE hInstance)
     m_hwndOwner = CreateWindow(L"static", nullptr, WS_POPUP, 0, 0, 0, 0, nullptr, nullptr, hInstance, nullptr);
 
     DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_NOREDIRECTIONBITMAP | WS_EX_TOOLWINDOW;
-    return CreateWindowExW(exStyle, m_className, m_windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hInstance, nullptr) != nullptr;
+    return CreateWindowExW(exStyle, m_className, m_windowTitle, WS_POPUP,
+        CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hInstance, nullptr) != nullptr;
 }
 
 void Highlighter::Terminate()

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.h

@@ -18,7 +18,6 @@ struct MouseHighlighterSettings
     int fadeDelayMs = MOUSE_HIGHLIGHTER_DEFAULT_DELAY_MS;
     int fadeDurationMs = MOUSE_HIGHLIGHTER_DEFAULT_DURATION_MS;
     bool autoActivate = MOUSE_HIGHLIGHTER_DEFAULT_AUTO_ACTIVATE;
-    bool spotlightMode = false;
 };
 
 int MouseHighlighterMain(HINSTANCE hinst, MouseHighlighterSettings settings);

src/modules/MouseUtils/MouseHighlighter/dllmain.cpp

@@ -18,7 +18,6 @@ namespace
     const wchar_t JSON_KEY_HIGHLIGHT_FADE_DELAY_MS[] = L"highlight_fade_delay_ms";
     const wchar_t JSON_KEY_HIGHLIGHT_FADE_DURATION_MS[] = L"highlight_fade_duration_ms";
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
-    const wchar_t JSON_KEY_SPOTLIGHT_MODE[] = L"spotlight_mode";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -368,16 +367,6 @@ public:
             {
                 Logger::warn("Failed to initialize auto activate from settings. Will use default value");
             }
-            try
-            {
-                // Parse spotlight mode
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_MODE);
-                highlightSettings.spotlightMode = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize spotlight mode settings. Will use default value");
-            }
         }
         else
         {

src/modules/MouseUtils/MouseHighlighter/trace.cpp

@@ -30,13 +30,3 @@ void Trace::StartHighlightingSession() noexcept
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
-
-// Log that spotlight mode is enabled
-void Trace::StartSpotlightSession() noexcept
-{
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "MouseHighlighter_StartSpotlightSession",
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-}

src/modules/MouseUtils/MouseHighlighter/trace.h

@@ -10,7 +10,4 @@ public:
 
     // Log that the user activated the module by starting a highlighting session
     static void StartHighlightingSession() noexcept;
-
-    // Log that spotlight mode is enabled
-    static void StartSpotlightSession() noexcept;
 };

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

@@ -155,7 +155,6 @@ public partial class CommandBarViewModel : ObservableObject,
             ContextMenuStack.Add(new ContextMenuStackViewModel(command));
             OnPropertyChanging(nameof(ContextMenu));
             OnPropertyChanged(nameof(ContextMenu));
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
             return ContextKeybindingResult.KeepOpen;
         }
         else

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

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
@@ -21,7 +20,7 @@ internal sealed partial class FallbackReloadItem : FallbackCommandItem
 
     public override void UpdateQuery(string query)
     {
-        _reloadCommand.Name = query.StartsWith("r", StringComparison.OrdinalIgnoreCase) ? "Reload" : string.Empty;
+        _reloadCommand.Name = query.StartsWith('r') ? "Reload" : string.Empty;
         Title = _reloadCommand.Name;
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs

@@ -14,15 +14,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Data;
 
 internal sealed partial class IndexerListItem : ListItem
 {
-    internal static readonly bool IsActionsFeatureEnabled = GetFeatureFlag();
-
-    private static bool GetFeatureFlag()
-    {
-        var env = System.Environment.GetEnvironmentVariable("CMDPAL_ENABLE_ACTIONS_LIST");
-        return !string.IsNullOrEmpty(env) &&
-           (env == "1" || env.Equals("true", System.StringComparison.OrdinalIgnoreCase));
-    }
-
     internal string FilePath { get; private set; }
 
     public IndexerListItem(
@@ -54,7 +45,7 @@ internal sealed partial class IndexerListItem : ListItem
             ..context,
             new CommandContextItem(new OpenWithCommand(indexerItem))];
 
-        if (IsActionsFeatureEnabled && ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))
+        if (ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))
         {
             var actionsListContextItem = new ActionsListContextItem(indexerItem.FullPath);
             if (actionsListContextItem.AnyActions())

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

@@ -19,8 +19,7 @@ public partial class IndexerCommandsProvider : CommandProvider
         Id = "Files";
         DisplayName = Resources.IndexerCommandsProvider_DisplayName;
         Icon = Icons.FileExplorer;
-
-        if (IndexerListItem.IsActionsFeatureEnabled && ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))
+        if (ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))
         {
             _ = ActionRuntimeManager.InstanceAsync;
         }

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

@@ -17,7 +17,6 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
     private readonly Lock _resultsLock = new();
 
     private IList<ListItem> _results = new List<ListItem>();
-    private bool _dataLoaded;
 
     private SettingsManager _settingsManager;
 
@@ -34,23 +33,11 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
 
     public override IListItem[] GetItems()
     {
-        ListItem[] results;
-        lock (_resultsLock)
-        {
-            if (_dataLoaded)
-            {
-                results = _results.ToArray();
-                _dataLoaded = false;
-                return results;
-            }
-        }
-
         DoExecuteSearch(string.Empty);
 
         lock (_resultsLock)
         {
-            results = _results.ToArray();
-            _dataLoaded = false;
+            ListItem[] results = _results.ToArray();
             return results;
         }
     }
@@ -88,7 +75,6 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
         lock (_resultsLock)
         {
             this._results = result;
-            _dataLoaded = true;
         }
 
         RaiseItemsChanged(this._results.Count);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/CloseWindowCommand.cs

@@ -20,7 +20,7 @@ internal sealed partial class CloseWindowCommand : InvokableCommand
 
     public CloseWindowCommand(Window window)
     {
-        Icon = new IconInfo("\uE894");
+        Icon = new IconInfo("\xE8BB");
         Name = $"{Resources.windowwalker_Close}";
         _window = window;
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/KillProcessCommand.cs

@@ -15,13 +15,13 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Commands;
 
-internal sealed partial class EndTaskCommand : InvokableCommand
+internal sealed partial class KillProcessCommand : InvokableCommand
 {
     private readonly Window _window;
 
-    public EndTaskCommand(Window window)
+    public KillProcessCommand(Window window)
     {
-        Icon = new IconInfo("\uF140");
+        Icon = new IconInfo("\xE74D"); // Delete symbol
         Name = $"{Resources.windowwalker_Kill}";
         _window = window;
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs

@@ -33,7 +33,7 @@ internal sealed class ContextMenuHelper
         if (!windowData.Process.IsShellProcess && !(windowData.Process.IsUwpApp && string.Equals(windowData.Process.Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
             && !(windowData.Process.IsFullAccessDenied && SettingsManager.Instance.HideKillProcessOnElevatedProcesses))
         {
-            contextMenu.Add(new CommandContextItem(new EndTaskCommand(windowData))
+            contextMenu.Add(new CommandContextItem(new KillProcessCommand(windowData))
             {
                 RequestedShortcut = KeyChordHelpers.FromModifiers(true, false, false, false, (int)VirtualKey.Delete, 0),
                 IsCritical = true,

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

@@ -124,7 +124,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Info: Ending the Explorer process isn&apos;t possible..
+        ///   Looks up a localized string similar to Info: Killing the Explorer process isn&apos;t possible..
         /// </summary>
         public static string windowwalker_ExplorerInfoTitle {
             get {
@@ -133,7 +133,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End task.
+        ///   Looks up a localized string similar to Kill process.
         /// </summary>
         public static string windowwalker_Kill {
             get {
@@ -142,7 +142,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are going to end the following process:.
+        ///   Looks up a localized string similar to Your are going to kill the following process:.
         /// </summary>
         public static string windowwalker_KillMessage {
             get {
@@ -160,7 +160,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End task confirmation.
+        ///   Looks up a localized string similar to Kill process confirmation.
         /// </summary>
         public static string windowwalker_KillMessageTitle {
             get {

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

@@ -166,23 +166,23 @@
     <comment>Explorer is here the program File Explorer</comment>
   </data>
   <data name="windowwalker_ExplorerInfoTitle" xml:space="preserve">
-    <value>Info: Ending the Explorer process isn't possible.</value>
+    <value>Info: Killing the Explorer process isn't possible.</value>
     <comment>Explorer is here the program File Explorer</comment>
   </data>
   <data name="windowwalker_Close" xml:space="preserve">
     <value>Close window</value>
   </data>
   <data name="windowwalker_Kill" xml:space="preserve">
-    <value>End task</value>
+    <value>Kill process</value>
   </data>
   <data name="windowwalker_KillMessage" xml:space="preserve">
-    <value>The following process will be ended:</value>
+    <value>Your are going to kill the following process:</value>
   </data>
   <data name="windowwalker_KillMessageQuestion" xml:space="preserve">
     <value>Continue?</value>
   </data>
   <data name="windowwalker_KillMessageTitle" xml:space="preserve">
-    <value>End task confirmation</value>
+    <value>Kill process confirmation</value>
   </data>
   <data name="windowwalker_KillMessageUwp" xml:space="preserve">
     <value>Because this is an app process, all instances of the app will be killed. Continue?</value>

src/modules/cmdpal/ext/SamplePagesExtension/Program.cs

@@ -25,7 +25,7 @@ public class Program
             server.RegisterExtension(() => extensionInstance);
 
             // This will make the main thread wait until the event is signalled by the extension class.
-            // Since we have a single instance of the extension object, we exit as soon as it is disposed.
+            // Since we have single instance of the extension object, we exit as soon as it is disposed.
             extensionDisposedEvent.WaitOne();
         }
         else

src/settings-ui/Settings.UI.Library/MouseHighlighterProperties.cs

@@ -41,9 +41,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("auto_activate")]
         public BoolProperty AutoActivate { get; set; }
 
-        [JsonPropertyName("spotlight_mode")]
-        public BoolProperty SpotlightMode { get; set; }
-
         public MouseHighlighterProperties()
         {
             ActivationShortcut = DefaultActivationShortcut;
@@ -55,7 +52,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             HighlightFadeDelayMs = new IntProperty(500);
             HighlightFadeDurationMs = new IntProperty(250);
             AutoActivate = new BoolProperty(false);
-            SpotlightMode = new BoolProperty(false);
         }
     }
 }

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

@@ -214,24 +214,15 @@
                         HeaderIcon="{ui:FontIcon Glyph=}"
                         IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor">
                                 <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor">
                                 <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_AlwaysColor">
                                 <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterAlwaysColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="HighlightMode">
-                                <ComboBox
-                                    x:Uid="MouseUtils_MouseHighlighter_SpotlightModeType"
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    SelectedIndex="{x:Bind ViewModel.IsSpotlightModeEnabled, Converter={StaticResource ReverseBoolToComboBoxIndexConverter}, Mode=TwoWay}">
-                                    <ComboBoxItem x:Uid="HighlightMode_Spotlight_Mode" />
-                                    <ComboBoxItem x:Uid="HighlightMode_Circle_Highlight_Mode" />
-                                </ComboBox>
-                            </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_HighlightRadius">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"

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

@@ -5068,16 +5068,4 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="BugReportUnderConstruction" xml:space="preserve">
     <value>Bug report package is being created</value>
   </data>
-  <data name="HighlightMode.Description" xml:space="preserve">
-    <value>Highlight the cursor or dim the screen to spotlight it</value>
-  </data>
-  <data name="HighlightMode.Header" xml:space="preserve">
-    <value>Highlight mode</value>
-  </data>
-  <data name="HighlightMode_Circle_Highlight_Mode.Content" xml:space="preserve">
-    <value>Circle highlight</value>
-  </data>
-  <data name="HighlightMode_Spotlight_Mode.Content" xml:space="preserve">
-    <value>Spotlight</value>
-  </data>
 </root>

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

@@ -72,7 +72,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             string alwaysColor = MouseHighlighterSettingsConfig.Properties.AlwaysColor.Value;
             _highlighterAlwaysColor = !string.IsNullOrEmpty(alwaysColor) ? alwaysColor : "#00FF0000";
-            _isSpotlightModeEnabled = MouseHighlighterSettingsConfig.Properties.SpotlightMode.Value;
 
             _highlighterRadius = MouseHighlighterSettingsConfig.Properties.HighlightRadius.Value;
             _highlightFadeDelayMs = MouseHighlighterSettingsConfig.Properties.HighlightFadeDelayMs.Value;
@@ -561,20 +560,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public bool IsSpotlightModeEnabled
-        {
-            get => _isSpotlightModeEnabled;
-            set
-            {
-                if (_isSpotlightModeEnabled != value)
-                {
-                    _isSpotlightModeEnabled = value;
-                    MouseHighlighterSettingsConfig.Properties.SpotlightMode.Value = value;
-                    NotifyMouseHighlighterPropertyChanged();
-                }
-            }
-        }
-
         public int MouseHighlighterRadius
         {
             get
@@ -931,7 +916,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private string _highlighterLeftButtonClickColor;
         private string _highlighterRightButtonClickColor;
         private string _highlighterAlwaysColor;
-        private bool _isSpotlightModeEnabled;
         private int _highlighterRadius;
         private int _highlightFadeDelayMs;
         private int _highlightFadeDurationMs;