Revert "Add Drag and Drop For Environment Variables (#40105)"

This reverts commit 1b6b446915.

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

@@ -209,7 +209,6 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
-CIBUILD
 cidl
 CIELCh
 cim

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

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

installer/PowerToysSetupVNext/Core.wxs

@@ -61,16 +61,6 @@
         </RegistryKey>
         <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
       </Component>
-      <Directory Id="SvgsFolder" Name="svgs">
-        <Component Id="svgs_icons" Guid="A9B7C5D3-E1F2-4A6B-8C9D-0E1F2A3B4C5D" Bitness="always64">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="svgs_icons" Value="" KeyPath="yes" />
-          </RegistryKey>
-          <File Id="icon.ico" Source="$(var.BinDir)svgs\icon.ico" />
-          <File Id="PowerToysWhite.ico" Source="$(var.BinDir)svgs\PowerToysWhite.ico" />
-          <File Id="PowerToysDark.ico" Source="$(var.BinDir)svgs\PowerToysDark.ico" />
-        </Component>
-      </Directory>
     </DirectoryRef>
 
     <?if $(var.PerUser) = "true" ?>
@@ -122,7 +112,6 @@
         <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveSvgsFolder" Directory="SvgsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
       </Component>
       <ComponentRef Id="powertoys_exe" />
@@ -131,7 +120,6 @@
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
-      <ComponentRef Id="svgs_icons" />
       <ComponentRef Id="DesktopShortcut" />
       <?if $(var.PerUser) = "true" ?>
       <ComponentRef Id="powertoys_env_path_user" />

src/common/ManagedCommon/OSVersionHelper.cs

@@ -10,7 +10,7 @@ namespace ManagedCommon
     {
         public static bool IsWindows10()
         {
-            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build < 22000;
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Minor < 22000;
         }
 
         public static bool IsWindows11()

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

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

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

@@ -547,15 +547,6 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
-        // Apply a penalty to fallback items so they rank below direct matches.
-        // Fallbacks that dynamically match queries (like RDP connections) should
-        // appear after apps and direct command matches.
-        if (isFallback && max > 1)
-        {
-            // Reduce fallback scores by 50% to prioritize direct matches
-            max = max * 0.5;
-        }
-
         var matchSomething = max
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BuildInfo.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.Reflection;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.CmdPal.UI.Helpers;
@@ -17,41 +18,19 @@ internal static class BuildInfo
     // Runtime AOT detection
     public static bool IsNativeAot => !RuntimeFeature.IsDynamicCodeSupported;
 
-    // build-time values
-    public static bool PublishTrimmed
-    {
-        get
-        {
-#if BUILD_INFO_PUBLISH_TRIMMED
-          return true;
-#else
-            return false;
-#endif
-        }
-    }
+    // From assembly metadata (build-time values)
+    public static bool PublishTrimmed => GetBoolMetadata("PublishTrimmed", false);
 
-    // build-time values
-    public static bool PublishAot
-    {
-        get
-        {
-#if BUILD_INFO_PUBLISH_AOT
-            return true;
-#else
-            return false;
-#endif
-        }
-    }
+    // From assembly metadata (build-time values)
+    public static bool PublishAot => GetBoolMetadata("PublishAot", false);
 
-    public static bool IsCiBuild
-    {
-        get
-        {
-#if BUILD_INFO_CIBUILD
-            return true;
-#else
-            return false;
-#endif
-        }
-    }
+    public static bool IsCiBuild => GetBoolMetadata("CIBuild", false);
+
+    private static string? GetMetadata(string key) =>
+        Assembly.GetExecutingAssembly()
+            .GetCustomAttributes<AssemblyMetadataAttribute>()
+            .FirstOrDefault(a => a.Key == key)?.Value;
+
+    private static bool GetBoolMetadata(string key, bool defaultValue) =>
+        bool.TryParse(GetMetadata(key), out var result) ? result : defaultValue;
 }

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

@@ -53,7 +53,7 @@
 
   <PropertyGroup>
     <!-- This disables the auto-generated main, so we can be single-instanced -->
-    <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
   </PropertyGroup>
 
   <!-- BODGY: XES Versioning and WinAppSDK get into a fight about the app manifest, which breaks WinAppSDK. -->
@@ -291,15 +291,24 @@
   </ItemGroup>
   <!-- </AdaptiveCardsWorkaround> -->
 
-  <!-- Build information  -->
-  <PropertyGroup Condition=" '$(PublishAot)' == 'true' ">
-	<DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_AOT</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(PublishTrimmed)' == 'true' ">
-    <DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_TRIMMED</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);BUILD_INFO_CIBUILD</DefineConstants>
-  </PropertyGroup>
+  <!-- Metadata for build information  -->
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>PublishTrimmed</_Parameter1>
+      <_Parameter2>$(PublishTrimmed)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>PublishAot</_Parameter1>
+      <_Parameter2>$(PublishAot)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>CIBuild</_Parameter1>
+      <_Parameter2>$(CIBuild)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>CommandPaletteBranding</_Parameter1>
+      <_Parameter2>$(CommandPaletteBranding)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
 
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -372,7 +372,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Windows Command Palette</value>
   </data>
   <data name="Settings_GeneralPage_About_SettingsExpander.Description" xml:space="preserve">
-    <value>© 2026. All rights reserved.</value>
+    <value>© 2025. All rights reserved.</value>
   </data>
   <data name="Settings_GeneralPage_About_GithubLink_Hyperlink.Content" xml:space="preserve">
     <value>View GitHub repository</value>

src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs

@@ -55,7 +55,7 @@ public class BasicTests : CommandPaletteTestBase
 
         SetTimeAndDaterExtensionSearchBox("year");
 
-        Assert.IsNotNull(this.Find<NavigationViewItem>("2026"));
+        Assert.IsNotNull(this.Find<NavigationViewItem>("2025"));
     }
 
     [TestMethod]

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

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

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

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

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

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

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

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

src/runner/general_settings.cpp

@@ -367,21 +367,11 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
     if (json::has(general_configs, L"show_theme_adaptive_tray_icon", json::JsonValueType::Boolean))
     {
         bool new_theme_adaptive = general_configs.GetNamedBoolean(L"show_theme_adaptive_tray_icon");
-        Logger::info(L"apply_general_settings: show_theme_adaptive_tray_icon current={}, new={}",
-                     show_theme_adaptive_tray_icon, new_theme_adaptive);
         if (show_theme_adaptive_tray_icon != new_theme_adaptive)
         {
             show_theme_adaptive_tray_icon = new_theme_adaptive;
             set_tray_icon_theme_adaptive(show_theme_adaptive_tray_icon);
         }
-        else
-        {
-            Logger::info(L"apply_general_settings: show_theme_adaptive_tray_icon unchanged, skipping update");
-        }
-    }
-    else
-    {
-        Logger::warn(L"apply_general_settings: show_theme_adaptive_tray_icon not found in config");
     }
 
     if (json::has(general_configs, L"ignored_conflict_properties", json::JsonValueType::Object))

src/runner/tray_icon.cpp

@@ -273,19 +273,12 @@ static HICON get_icon(Theme theme)
 {
     std::wstring icon_path = get_module_folderpath();
     icon_path += theme == Theme::Dark ? L"\\svgs\\PowerToysWhite.ico" : L"\\svgs\\PowerToysDark.ico";
-    Logger::trace(L"get_icon: Loading icon from path: {}", icon_path);
-
-    HICON icon = static_cast<HICON>(LoadImage(NULL,
+    return static_cast<HICON>(LoadImage(NULL,
                                         icon_path.c_str(),
                                         IMAGE_ICON,
                                         0,
                                         0,
                                         LR_LOADFROMFILE | LR_DEFAULTSIZE | LR_SHARED));
-    if (!icon)
-    {
-        Logger::warn(L"get_icon: Failed to load icon from {}, error: {}", icon_path, GetLastError());
-    }
-    return icon;
 }
 
 
@@ -381,45 +374,13 @@ void set_tray_icon_visible(bool shouldIconBeVisible)
 
 void set_tray_icon_theme_adaptive(bool theme_adaptive)
 {
-    Logger::info(L"set_tray_icon_theme_adaptive: Called with theme_adaptive={}, current theme_adaptive_enabled={}",
-                 theme_adaptive, theme_adaptive_enabled);
-
-    auto h_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-    HICON icon = nullptr;
-
-    if (theme_adaptive)
-    {
-        icon = get_icon(theme_listener.AppTheme);
-        if (!icon)
-        {
-            Logger::warn(L"set_tray_icon_theme_adaptive: Failed to load theme adaptive icon, falling back to default");
-        }
-    }
-
-    // If not requesting adaptive icon, or if adaptive icon failed to load, use default icon
-    if (!icon)
-    {
-        icon = LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
-        if (theme_adaptive && icon)
-        {
-            // We requested adaptive but had to fall back, so update the flag
-            theme_adaptive = false;
-            Logger::info(L"set_tray_icon_theme_adaptive: Using default icon as fallback");
-        }
-    }
-
     theme_adaptive_enabled = theme_adaptive;
-
+    auto h_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+    HICON const icon = theme_adaptive ? get_icon(theme_listener.AppTheme) : LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
     if (icon)
     {
         tray_icon_data.hIcon = icon;
-        BOOL result = Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
-        Logger::info(L"set_tray_icon_theme_adaptive: Icon updated, theme_adaptive_enabled={}, Shell_NotifyIcon result={}",
-                     theme_adaptive_enabled, result);
-    }
-    else
-    {
-        Logger::error(L"set_tray_icon_theme_adaptive: Failed to load any icon");
+        Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
     }
 }
 

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

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