update the config

.github/actions/spell-check/allow/code.txt

@@ -273,4 +273,4 @@ mengyuanchen
 testhost
 
 #Tools
-OIP
+OIP

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

@@ -8,7 +8,6 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
-acfs
 AClient
 AColumn
 acrt
@@ -198,7 +197,6 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
-clp
 CLSCTX
 clsids
 Clusion
@@ -275,7 +273,6 @@ CURSORINFO
 cursorpos
 customaction
 CUSTOMACTIONTEST
-CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
@@ -526,7 +523,6 @@ FZE
 gacutil
 Gaeilge
 Gaidhlig
-gameid
 GC'ed
 GCLP
 gdi
@@ -717,7 +713,6 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
-installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -1012,7 +1007,6 @@ netsh
 newcolor
 NEWDIALOGSTYLE
 NEWFILE
-NEWFILEHEADER
 newitem
 newpath
 newplus
@@ -1046,7 +1040,6 @@ NOINHERITLAYOUT
 NOINTERFACE
 NOINVERT
 NOLINKINFO
-nologo
 NOMCX
 NOMINMAX
 NOMIRRORBITMAP
@@ -1279,7 +1272,6 @@ pstm
 PStr
 pstream
 pstrm
-pswd
 PSYSTEM
 psz
 ptb
@@ -1310,7 +1302,6 @@ QUNS
 QXZ
 RAII
 RAlt
-Rappl
 randi
 Rasterization
 Rasterize
@@ -1426,7 +1417,6 @@ searchterm
 SEARCHUI
 SECONDARYDISPLAY
 secpol
-securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
 SENDCHANGE
@@ -1580,7 +1570,6 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
-steamapps
 STGC
 STGM
 STGMEDIUM
@@ -1662,7 +1651,6 @@ telephon
 templatenamespace
 testprocess
 TEXCOORD
-TEXTBOXNEWLINE
 TEXTEXTRACTOR
 TEXTINCLUDE
 tfopen
@@ -1983,11 +1971,3 @@ ZOOMITX
 ZXk
 ZXNs
 zzz
-ACIE
-AOklab
-BCIE
-BOklab
-culori
-Evercoder
-LCh
-CIELCh

.pipelines/ESRPSigning_core.json

@@ -220,7 +220,6 @@
                 "WinUI3Apps\\PowerToys.Settings.exe",
 
                 "PowerToys.CmdPalModuleInterface.dll",
-                "CmdPalKeyboardService.dll",
                 "*Microsoft.CmdPal.UI_*.msix"
             ],
             "SigningInfo": {
@@ -331,8 +330,6 @@
                 "TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                 "WinUI3Apps\\OpenAI.dll",
-                "Testably.Abstractions.FileSystem.Interface.dll",
-                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                 "ColorCode.Core.dll", 
                 "ColorCode.UWP.dll",
                 "UnitsNet.dll",

.pipelines/UpdateVersions.ps1

@@ -1,24 +1,16 @@
 Param(
-  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.7",
+  [string]$winAppSdkVersionNumber = "1.6",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False,
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=3)]
-  [string]$rootPath = $(Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)),
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+  [boolean]$useExperimentalVersion = $False
 )
 
 function Update-NugetConfig {
     param (
-        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
+        [string]$filePath = "nuget.config"
     )
 
     Write-Host "Updating nuget.config file"
@@ -43,33 +35,7 @@ function Update-NugetConfig {
     $xml.Save($filePath)
 }
 
-function Read-FileWithEncoding {
-    param (
-        [string]$Path
-    )
-
-    $reader = New-Object System.IO.StreamReader($Path, $true)  # auto-detect encoding
-    $content = $reader.ReadToEnd()
-    $encoding = $reader.CurrentEncoding
-    $reader.Close()
-
-    return [PSCustomObject]@{
-        Content  = $content
-        Encoding = $encoding
-    }
-}
-
-function Write-FileWithEncoding {
-    param (
-        [string]$Path,
-        [string]$Content,
-        [System.Text.Encoding]$Encoding
-    )
-
-    $writer = New-Object System.IO.StreamWriter($Path, $false, $Encoding)
-    $writer.Write($Content)
-    $writer.Close()
-}
+$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -113,54 +79,50 @@ if ($latestVersion) {
 }
 
 # Update packages.config files
-Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse packages.config | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
         $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName 
     }
 }
 
 # Update Directory.Packages.props file
-$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
+$propsFile = "Directory.Packages.props"
 if (Test-Path $propsFile) {
-    $file = Read-FileWithEncoding -Path $propsFile
-    $content = $file.Content
+    $content = Get-Content $propsFile -Raw
     if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
         $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
+        Set-Content -Path $propsFile -Value $content
         Write-Host "Modified " $propsFile
     }
 }
 
 # Update .vcxproj files
-Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match '\\Microsoft.WindowsAppSDK.') {
         $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
         $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName
     }
 }
 
 # Update .csproj files
-Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.csproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
     if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
         $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
         Write-Host "Modified " $_.FullName 
     }
 }

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

@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.7
+    default: 1.6
   - name: useExperimentalVersion
     type: boolean
     default: false

.pipelines/v2/release.yml

@@ -148,7 +148,5 @@ extends:
             parameters:
               versionNumber: ${{ parameters.versionNumber }}
               includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              ${{ if ne(parameters.publishSymbolsToPublic, true) }}:
-                symbolExpiryTime: 10 # For private builds, expire symbols within 10 days. The default is 100 years.
               subscription: $(SymbolPublishingServiceConnection)
               symbolProject: $(SymbolPublishingProject)

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -17,7 +17,6 @@ steps:
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
-      -rootPath "$(build.sourcesdirectory)"
 
 - script: echo $(WinAppSDKVersion)
   displayName: 'Display WinAppSDK Version Found'

Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />

NOTICE.md

@@ -75,40 +75,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```
 
-## Utility: Command Palette Built-in Extensions
-
-### Calculator
-
-#### Mages
-
-We use the Mages NuGet package for calculating the result of expression.
-
-**Source**: [https://github.com/FlorianRappl/Mages](https://github.com/FlorianRappl/Mages)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2025 Florian Rappl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## Utility: File Explorer Add-ins
 
 ### Monaco Editor
@@ -1472,8 +1438,8 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.7.250401001
-- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.WindowsAppSDK 1.6.250205002
+- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4

installer/PowerToysSetup/Product.wxs

@@ -79,7 +79,10 @@
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
       <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
+
+      <?if $(var.CIBuild) = "true" ?>
+        <ComponentGroupRef Id="CmdPalComponentGroup" />
+      <?endif?>
     </Feature>
 
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />

src/Common.Dotnet.CsWinRT.props

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
-
   <PropertyGroup>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>

src/Common.Dotnet.PrepareGeneratedFolder.targets

@@ -1,16 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
-    <PropertyGroup>
-      <!-- Only create the base 'generated' folder -->
-      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
-    </PropertyGroup>
-
-    <!-- Create 'generated' folder if missing -->
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-
-    <!-- Optional logging for debugging -->
-    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
-  </Target>
-
-</Project>

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -141,40 +141,6 @@ namespace ManagedCommon
             return lab;
         }
 
-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklab color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        public static (double Lightness, double ChromaticityA, double ChromaticityB) ConvertToOklabColor(Color color)
-        {
-            var linear = ConvertSRGBToLinearRGB(color.R / 255d, color.G / 255d, color.B / 255d);
-            var oklab = GetOklabColorFromLinearRGB(linear.R, linear.G, linear.B);
-            return oklab;
-        }
-
-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklch color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        public static (double Lightness, double Chroma, double Hue) ConvertToOklchColor(Color color)
-        {
-            var oklab = ConvertToOklabColor(color);
-            var oklch = GetOklchColorFromOklab(oklab.Lightness, oklab.ChromaticityA, oklab.ChromaticityB);
-
-            return oklch;
-        }
-
-        public static (double R, double G, double B) ConvertSRGBToLinearRGB(double r, double g, double b)
-        {
-            // inverse companding, gamma correction must be undone
-            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
-            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
-            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
-            return (rLinear, gLinear, bLinear);
-        }
-
         /// <summary>
         /// Convert a given <see cref="Color"/> to a CIE XYZ color (XYZ)
         /// The constants of the formula matches this Wikipedia page, but at a higher precision:
@@ -190,7 +156,10 @@ namespace ManagedCommon
             double g = color.G / 255d;
             double b = color.B / 255d;
 
-            (double rLinear, double gLinear, double bLinear) = ConvertSRGBToLinearRGB(r, g, b);
+            // inverse companding, gamma correction must be undone
+            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
+            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
+            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
 
             return (
                 (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
@@ -241,63 +210,6 @@ namespace ManagedCommon
             return (l, a, b);
         }
 
-        /// <summary>
-        /// Convert a linear RGB color <see cref="double"/> to an Oklab color.
-        /// The constants of this formula come from https://github.com/Evercoder/culori/blob/2bedb8f0507116e75f844a705d0b45cf279b15d0/src/oklab/convertLrgbToOklab.js
-        /// and the implementation is based on https://bottosson.github.io/posts/oklab/
-        /// </summary>
-        /// <param name="r">Linear R value</param>
-        /// <param name="g">Linear G value</param>
-        /// <param name="b">Linear B value</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        private static (double Lightness, double ChromaticityA, double ChromaticityB)
-            GetOklabColorFromLinearRGB(double r, double g, double b)
-        {
-            double l = (0.41222147079999993 * r) + (0.5363325363 * g) + (0.0514459929 * b);
-            double m = (0.2119034981999999 * r) + (0.6806995450999999 * g) + (0.1073969566 * b);
-            double s = (0.08830246189999998 * r) + (0.2817188376 * g) + (0.6299787005000002 * b);
-
-            double l_ = Math.Cbrt(l);
-            double m_ = Math.Cbrt(m);
-            double s_ = Math.Cbrt(s);
-
-            return (
-                (0.2104542553 * l_) + (0.793617785 * m_) - (0.0040720468 * s_),
-                (1.9779984951 * l_) - (2.428592205 * m_) + (0.4505937099 * s_),
-                (0.0259040371 * l_) + (0.7827717662 * m_) - (0.808675766 * s_)
-            );
-        }
-
-        /// <summary>
-        /// Convert an Oklab color <see cref="double"/> from Cartesian form to its polar form Oklch
-        /// https://bottosson.github.io/posts/oklab/#the-oklab-color-space
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetOklchColorFromOklab(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            return GetLCHColorFromLAB(lightness, chromaticity_a, chromaticity_b);
-        }
-
-        /// <summary>
-        /// Convert a color in Cartesian form (Lab) to its polar form (LCh)
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The lightness, chroma, and hue angle</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetLCHColorFromLAB(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            // Lab to LCh transformation
-            double chroma = Math.Sqrt(Math.Pow(chromaticity_a, 2) + Math.Pow(chromaticity_b, 2));
-            double hue = Math.Round(chroma, 3) == 0 ? 0.0 : ((Math.Atan2(chromaticity_b, chromaticity_a) * 180d / Math.PI) + 360d) % 360d;
-            return (lightness, chroma, hue);
-        }
-
         /// <summary>
         /// Convert a given <see cref="Color"/> to a natural color (hue, whiteness, blackness)
         /// </summary>
@@ -364,17 +276,12 @@ namespace ManagedCommon
             { "Br", 'p' },   // brightness       percent
             { "In", 'p' },   // intensity        percent
             { "Ll", 'p' },   // lightness (HSL)  percent
+            { "Lc", 'p' },   // lightness(CIELAB)percent
             { "Va", 'p' },   // value            percent
             { "Wh", 'p' },   // whiteness        percent
             { "Bn", 'p' },   // blackness        percent
-            { "Lc", 'p' },   // lightness (CIE)         percent
-            { "Ca", 'p' },   // chromaticityA (CIELAB)  percent
-            { "Cb", 'p' },   // chromaticityB (CIELAB)  percent
-            { "Lo", 'p' },   // lightness (Oklab/Oklch) percent
-            { "Oa", 'p' },   // chromaticityA (Oklab)   percent
-            { "Ob", 'p' },   // chromaticityB (Oklab)   percent
-            { "Oc", 'p' },   // chroma (Oklch)          percent
-            { "Oh", 'p' },   // hue angle (Oklch)       percent
+            { "Ca", 'p' },   // chromaticityA    percent
+            { "Cb", 'p' },   // chromaticityB    percent
             { "Xv", 'i' },   // X value          int
             { "Yv", 'i' },   // Y value          int
             { "Zv", 'i' },   // Z value          int
@@ -517,10 +424,6 @@ namespace ManagedCommon
                     var (lightnessC, _, _) = ConvertToCIELABColor(color);
                     lightnessC = Math.Round(lightnessC, 2);
                     return lightnessC.ToString(CultureInfo.InvariantCulture);
-                case "Lo":
-                    var (lightnessO, _, _) = ConvertToOklabColor(color);
-                    lightnessO = Math.Round(lightnessO, 2);
-                    return lightnessO.ToString(CultureInfo.InvariantCulture);
                 case "Wh":
                     var (_, whiteness, _) = ConvertToHWBColor(color);
                     whiteness = Math.Round(whiteness * 100);
@@ -537,22 +440,6 @@ namespace ManagedCommon
                     var (_, _, chromaticityB) = ConvertToCIELABColor(color);
                     chromaticityB = Math.Round(chromaticityB, 2);
                     return chromaticityB.ToString(CultureInfo.InvariantCulture);
-                case "Oa":
-                    var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
-                    chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
-                    return chromaticityAOklab.ToString(CultureInfo.InvariantCulture);
-                case "Ob":
-                    var (_, _, chromaticityBOklab) = ConvertToOklabColor(color);
-                    chromaticityBOklab = Math.Round(chromaticityBOklab, 2);
-                    return chromaticityBOklab.ToString(CultureInfo.InvariantCulture);
-                case "Oc":
-                    var (_, chromaOklch, _) = ConvertToOklchColor(color);
-                    chromaOklch = Math.Round(chromaOklch, 2);
-                    return chromaOklch.ToString(CultureInfo.InvariantCulture);
-                case "Oh":
-                    var (_, _, hueOklch) = ConvertToOklchColor(color);
-                    hueOklch = Math.Round(hueOklch, 2);
-                    return hueOklch.ToString(CultureInfo.InvariantCulture);
                 case "Xv":
                     var (x, _, _) = ConvertToCIEXYZColor(color);
                     x = Math.Round(x * 100, 4);
@@ -608,10 +495,8 @@ namespace ManagedCommon
                 case "HSI": return "hsi(%Hu, %Si%, %In%)";
                 case "HWB": return "hwb(%Hu, %Wh%, %Bn%)";
                 case "NCol": return "%Hn, %Wh%, %Bn%";
-                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                 case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
-                case "Oklab": return "oklab(%Lo, %Oa, %Ob)";
-                case "Oklch": return "oklch(%Lo, %Oc, %Oh)";
+                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                 case "VEC4": return "(%Reff, %Grff, %Blff, 1f)";
                 case "Decimal": return "%Dv";
                 case "HEX Int": return "0xFF%ReX%GrX%BlX";

src/common/ManagedCommon/IdRecoveryHelper.cs

@@ -1,51 +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.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public static class IdRecoveryHelper
-    {
-        /// <summary>
-        /// Fixes invalid IDs in the given list by assigning unique values.
-        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
-        /// </summary>
-        /// <param name="items">The list of items that may contain invalid IDs.</param>
-        public static void RecoverInvalidIds<T>(IEnumerable<T> items)
-            where T : class, IHasId
-        {
-            var idSet = new HashSet<int>();
-            int newId = 0;
-            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
-
-            // Iterate through the list and fix invalid IDs
-            foreach (var item in sortedItems)
-            {
-                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
-                if (!idSet.Add(item.Id))
-                {
-                    // Find the next available unique ID
-                    while (idSet.Contains(newId))
-                    {
-                        newId++;
-                    }
-
-                    item.Id = newId;
-                    idSet.Add(newId); // Add the newly assigned ID to the set
-                }
-            }
-        }
-    }
-
-    public interface IHasId
-    {
-        int Id { get; set; }
-    }
-}

src/common/utils/package.h

@@ -301,7 +301,6 @@ namespace package
         if (!std::filesystem::exists(directoryPath))
         {
             Logger::error(L"The directory '" + directoryPath + L"' does not exist.");
-            return {};
         }
 
         const std::regex pattern(R"(^.+\.(appx|msix|msixbundle)$)", std::regex_constants::icase);

src/modules/AdvancedPaste/AdvancedPaste/Helpers/OcrHelpers.cs

@@ -18,19 +18,10 @@ public static class OcrHelpers
 {
     public static async Task<string> ExtractTextAsync(SoftwareBitmap bitmap, CancellationToken cancellationToken)
     {
-        var ocrLanguage = GetOCRLanguage();
+        var ocrLanguage = GetOCRLanguage() ?? throw new InvalidOperationException("Unable to determine OCR language");
         cancellationToken.ThrowIfCancellationRequested();
 
-        OcrEngine ocrEngine;
-        if (ocrLanguage is not null)
-        {
-            ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine from specified language");
-        }
-        else
-        {
-            ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages() ?? throw new InvalidOperationException("Unable to create OCR engine from user profile language");
-        }
-
+        var ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine");
         cancellationToken.ThrowIfCancellationRequested();
 
         var ocrResult = await ocrEngine.RecognizeAsync(bitmap);

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -15,6 +15,8 @@
     <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
+    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
+    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -54,4 +56,7 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
+  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+  </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -153,7 +153,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
 </packages>

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -121,22 +121,6 @@ namespace AppLauncher
         // packaged apps: try launching first by AppUserModel.ID
         // usage example: elevated Terminal
         if (!launched && !app.appUserModelId.empty() && !app.packageFullName.empty())
-        {
-            Logger::trace(L"Launching {} as {} - {app.packageFullName}", app.name, app.appUserModelId, app.packageFullName);
-            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
-            if (res.isOk())
-            {
-                launched = true;
-            }
-            else
-            {
-                launchErrors.push_back({ std::filesystem::path(app.path).filename(), res.error() });
-            }
-        }
-
-        // win32 app with appUserModelId:
-        // usage example: steam games
-        if (!launched && !app.appUserModelId.empty())
         {
             Logger::trace(L"Launching {} as {}", app.name, app.appUserModelId);
             auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);

src/modules/Workspaces/WorkspacesLib/AppUtils.cpp

@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "AppUtils.h"
-#include "SteamHelper.h"
 
 #include <atlbase.h>
 #include <propvarutil.h>
@@ -35,8 +34,6 @@ namespace Utils
 
             constexpr const wchar_t* EdgeFilename = L"msedge.exe";
             constexpr const wchar_t* ChromeFilename = L"chrome.exe";
-
-            constexpr const wchar_t* SteamUrlProtocol = L"steam:";
         }
 
         AppList IterateAppsFolder()
@@ -141,34 +138,6 @@ namespace Utils
                                 else if (prop == NonLocalizable::PackageInstallPathProp || prop == NonLocalizable::InstallPathProp)
                                 {
                                     data.installPath = propVariantString.m_pData;
-
-                                    if (!data.installPath.empty())
-                                    {
-                                        const bool isSteamProtocol = data.installPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-
-                                        if (isSteamProtocol)
-                                        {
-                                            Logger::info(L"Found steam game: protocol path: {}", data.installPath);
-                                            data.protocolPath = data.installPath;
-
-                                            try
-                                            {
-                                                auto gameId = Steam::GetGameIdFromUrlProtocolPath(data.installPath);
-                                                auto gameFolder = Steam::GetSteamGameInfoFromAcfFile(gameId);
-
-                                                if (gameFolder)
-                                                {
-                                                    data.installPath = gameFolder->gameInstallationPath;
-                                                    Logger::info(L"Found steam game: physical path: {}", data.installPath);
-                                                }
-                                            }
-                                            catch (std::exception ex)
-                                            {
-                                                Logger::error(L"Failed to get installPath for game {}", data.installPath);
-                                                Logger::error("Error: {}", ex.what());
-                                            }
-                                        }
-                                    }
                                 }
                             }
 
@@ -428,10 +397,5 @@ namespace Utils
         {
             return installPath.ends_with(NonLocalizable::ChromeFilename);
         }
-
-        bool AppData::IsSteamGame() const
-        {
-            return protocolPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-        }
     }
 }

src/modules/Workspaces/WorkspacesLib/AppUtils.h

@@ -13,12 +13,10 @@ namespace Utils
             std::wstring packageFullName;
             std::wstring appUserModelId;
             std::wstring pwaAppId;
-            std::wstring protocolPath;
             bool canLaunchElevated = false;
 
             bool IsEdge() const;
             bool IsChrome() const;
-            bool IsSteamGame() const;
         };
 
         using AppList = std::vector<AppData>;

src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp

@@ -1,171 +0,0 @@
-#include "pch.h"
-#include "SteamHelper.h"
-#include <fstream>
-#include <sstream>
-#include <unordered_map>
-#include <filesystem>
-#include <regex>
-#include <string>
-
-namespace Utils
-{
-
-    static std::wstring Utf8ToWide(const std::string& utf8)
-    {
-        if (utf8.empty())
-            return L"";
-
-        int size = MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), nullptr, 0);
-        if (size <= 0)
-            return L"";
-
-        std::wstring wide(size, L'\0');
-        MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), wide.data(), size);
-        return wide;
-    }
-
-    namespace Steam
-    {
-        using namespace std;
-        namespace fs = std::filesystem;
-
-        static std::optional<std::wstring> GetSteamExePathFromRegistry()
-        {
-            static std::optional<std::wstring> cachedPath;
-            if (cachedPath.has_value())
-            {
-                return cachedPath;
-            }
-
-            const std::vector<HKEY> roots = { HKEY_CLASSES_ROOT, HKEY_LOCAL_MACHINE, HKEY_USERS };
-            const std::vector<std::wstring> subKeys = {
-                L"steam\\shell\\open\\command",
-                L"Software\\Classes\\steam\\shell\\open\\command",
-            };
-
-            for (HKEY root : roots)
-            {
-                for (const auto& subKey : subKeys)
-                {
-                    HKEY hKey;
-                    if (RegOpenKeyExW(root, subKey.c_str(), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
-                    {
-                        wchar_t value[512];
-                        DWORD size = sizeof(value);
-                        DWORD type = 0;
-
-                        if (RegQueryValueExW(hKey, nullptr, nullptr, &type, reinterpret_cast<LPBYTE>(value), &size) == ERROR_SUCCESS &&
-                            (type == REG_SZ || type == REG_EXPAND_SZ))
-                        {
-                            std::wregex exeRegex(LR"delim("([^"]+steam\.exe)")delim");
-                            std::wcmatch match;
-                            if (std::regex_search(value, match, exeRegex) && match.size() > 1)
-                            {
-                                RegCloseKey(hKey);
-                                cachedPath = match[1].str();
-                                return cachedPath;
-                            }
-                        }
-
-                        RegCloseKey(hKey);
-                    }
-                }
-            }
-
-            cachedPath = std::nullopt;
-            return std::nullopt;
-        }
-
-        static fs::path GetSteamBasePath()
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return fs::path(*steamFolderOpt).parent_path() / L"steamapps";
-        }
-
-        static fs::path GetAcfFilePath(const std::wstring& gameId)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / (L"appmanifest_" + gameId + L".acf");
-        }
-
-        static fs::path GetGameInstallPath(const std::wstring& gameFolderName)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / L"common" / gameFolderName;
-        }
-
-        static unordered_map<wstring, wstring> ParseAcfFile(const fs::path& acfPath)
-        {
-            unordered_map<wstring, wstring> result;
-
-            ifstream file(acfPath);
-            if (!file.is_open())
-                return result;
-
-            string line;
-            while (getline(file, line))
-            {
-                smatch matches;
-                static const regex pattern(R"delim("([^"]+)"\s+"([^"]+)")delim");
-
-                if (regex_search(line, matches, pattern) && matches.size() == 3)
-                {
-                    wstring key = Utf8ToWide(matches[1].str());
-                    wstring value = Utf8ToWide(matches[2].str());
-                    result[key] = value;
-                }
-            }
-
-            return result;
-        }
-
-        std::unique_ptr<Steam::SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId)
-        {
-            fs::path acfPath = Steam::GetAcfFilePath(gameId);
-
-            if (!fs::exists(acfPath))
-                return nullptr;
-
-            auto kv = ParseAcfFile(acfPath);
-            if (kv.empty() || kv.find(L"installdir") == kv.end())
-                return nullptr;
-
-            fs::path gamePath = Steam::GetGameInstallPath(kv[L"installdir"]);
-            if (!fs::exists(gamePath))
-                return nullptr;
-
-            auto game = std::make_unique<Steam::SteamGame>();
-            game->gameId = gameId;
-            game->gameInstallationPath = gamePath.wstring();
-            return game;
-        }
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath)
-        {
-            const std::wstring steamGamePrefix = L"steam://rungameid/";
-
-            if (urlPath.rfind(steamGamePrefix, 0) == 0)
-            {
-                return urlPath.substr(steamGamePrefix.length());
-            }
-
-            return L"";
-        }
-
-    }
-}

src/modules/Workspaces/WorkspacesLib/SteamHelper.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include "pch.h"
-
-namespace Utils
-{
-    namespace NonLocalizable
-    {
-        const std::wstring AcfFileNameTemplate = L"appmanifest_<gameid>.acfs";
-    }
-
-    namespace Steam
-    {
-        struct SteamGame
-        {
-            std::wstring gameId;
-            std::wstring gameInstallationPath;
-        };
-
-        std::unique_ptr<SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId);
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath);
-    }
-}

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -41,7 +41,6 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="PwaHelper.h" />
     <ClInclude Include="Result.h" />
-    <ClInclude Include="SteamHelper.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="utils.h" />
     <ClInclude Include="WbemHelper.h" />
@@ -58,7 +57,6 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="PwaHelper.cpp" />
-    <ClCompile Include="SteamGameHelper.cpp" />
     <ClCompile Include="two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="WbemHelper.cpp" />
     <ClCompile Include="WorkspacesData.cpp" />

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters

@@ -53,9 +53,6 @@
     <ClInclude Include="StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SteamHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -91,9 +88,6 @@
     <ClCompile Include="WbemHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SteamGameHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp

@@ -71,8 +71,6 @@ namespace SnapshotUtils
                 continue;
             }
 
-            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
-
             DWORD pid{};
             GetWindowThreadProcessId(window, &pid);
 
@@ -120,19 +118,10 @@ namespace SnapshotUtils
             auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
             if (!data.has_value() || data->name.empty())
             {
-                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), processPath);
+                Logger::info(L"Installed app not found: {}", processPath);
                 continue;
             }
 
-            if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-            {
-                // Only care about steam games if it has no thick frame to remain consistent with
-                // the behavior as before.
-                continue;
-            }
-
-            Logger::info(L"Found app for window:{},{}", reinterpret_cast<void*>(window), processPath);
-
             auto appData = data.value();
 
             bool isEdge = appData.IsEdge();

src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp

@@ -200,14 +200,6 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
         }
 
         auto data = Utils::Apps::GetApp(processPath, pid, m_installedApps);
-
-        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-        {
-            // Only care about steam games if it has no thick frame to remain consistent with 
-            // the behavior as before.
-            continue;
-        }
-
         if (!data.has_value())
         {
             continue;

src/modules/Workspaces/workspaces-common/WindowFilter.h

@@ -9,12 +9,10 @@ namespace WindowFilter
     {
         auto style = GetWindowLong(window, GWL_STYLE);
         bool isPopup = WindowUtils::HasStyle(style, WS_POPUP);
+        bool hasThickFrame = WindowUtils::HasStyle(style, WS_THICKFRAME);
         bool hasCaption = WindowUtils::HasStyle(style, WS_CAPTION);
         bool hasMinimizeMaximizeButtons = WindowUtils::HasStyle(style, WS_MINIMIZEBOX) || WindowUtils::HasStyle(style, WS_MAXIMIZEBOX);
-
-        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
-
-        if (isPopup && !(hasCaption || hasMinimizeMaximizeButtons))
+        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
         {
             // popup windows we want to snap: e.g. Calculator, Telegram
             // popup windows we don't want to snap: start menu, notification popup, tray window, etc.

src/modules/Workspaces/workspaces-common/WindowUtils.h

@@ -121,11 +121,4 @@ namespace WindowUtils
 
         return std::wstring(title);
     }
-
-    
-    inline bool HasThickFrame(HWND window)
-    {
-        auto style = GetWindowLong(window, GWL_STYLE);
-        return WindowUtils::HasStyle(style, WS_THICKFRAME);
-    }
 }

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -2,7 +2,6 @@
 <Project DefaultTargets="Build"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="..\Microsoft.CmdPal.UI\CmdPal.pre.props" Condition="Exists('..\Microsoft.CmdPal.UI\CmdPal.pre.prop')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -50,21 +49,13 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>
-        EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;
-        %(PreprocessorDefinitions);
-        $(CommandPaletteBranding)
-      </PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'">
-        IS_DEV_BRANDING;%(PreprocessorDefinitions)
-      </PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />

src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp

@@ -208,7 +208,7 @@ public:
         try
         {
             std::wstring packageName = L"Microsoft.CommandPalette";
-#ifdef IS_DEV_BRANDING
+#ifdef _DEBUG
             packageName = L"Microsoft.CommandPalette.Dev";
 #endif
             if (!package::GetRegisteredPackage(packageName, false).has_value())
@@ -245,21 +245,12 @@ public:
             errorMessage += e.what();
             Logger::error(errorMessage);
         }
-        try
-        {
-#ifdef IS_DEV_BRANDING
-            LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App", L"RunFromPT", false);
+
+#if _DEBUG
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App", L"RunFromPT", false);
 #else
-            LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette_8wekyb3d8bbwe!App", L"RunFromPT", false);
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette_8wekyb3d8bbwe!App", L"RunFromPT", false);
 #endif
-        }
-        catch (std::exception& e)
-        {
-            std::string errorMessage{ "Exception thrown while trying to launch CmdPal: " };
-            errorMessage += e.what();
-            Logger::error(errorMessage);
-            throw;
-        }
     }
 
     virtual void disable()

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

@@ -9,7 +9,7 @@
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
     <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.3" />

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

@@ -4,9 +4,9 @@
 
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
-using Windows.System;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
@@ -25,8 +25,6 @@ public partial class CommandBarViewModel : ObservableObject,
 
             field = value;
             SetSelectedItem(value);
-
-            OnPropertyChanged(nameof(SelectedItem));
         }
     }
 
@@ -49,9 +47,7 @@ public partial class CommandBarViewModel : ObservableObject,
     public partial PageViewModel? CurrentPage { get; set; }
 
     [ObservableProperty]
-    public partial ObservableCollection<ContextMenuStackViewModel> ContextMenuStack { get; set; } = [];
-
-    public ContextMenuStackViewModel? ContextMenu => ContextMenuStack.LastOrDefault();
+    public partial ObservableCollection<CommandContextItemViewModel> ContextCommands { get; set; } = [];
 
     public CommandBarViewModel()
     {
@@ -104,97 +100,35 @@ public partial class CommandBarViewModel : ObservableObject,
         if (SelectedItem.MoreCommands.Count() > 1)
         {
             ShouldShowContextMenu = true;
-
-            ContextMenuStack.Clear();
-            ContextMenuStack.Add(new ContextMenuStackViewModel(SelectedItem));
-            OnPropertyChanged(nameof(ContextMenu));
+            ContextCommands = [.. SelectedItem.AllCommands];
         }
         else
         {
             ShouldShowContextMenu = false;
         }
-
-        OnPropertyChanged(nameof(HasSecondaryCommand));
-        OnPropertyChanged(nameof(SecondaryCommand));
-        OnPropertyChanged(nameof(ShouldShowContextMenu));
     }
 
     // InvokeItemCommand is what this will be in Xaml due to source generator
     // this comes in when an item in the list is tapped
-    // [RelayCommand]
-    public ContextKeybindingResult InvokeItem(CommandContextItemViewModel item) =>
-        PerformCommand(item);
+    [RelayCommand]
+    private void InvokeItem(CommandContextItemViewModel item) =>
+       WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.Command.Model, item.Model));
 
     // this comes in when the primary button is tapped
     public void InvokePrimaryCommand()
     {
-        PerformCommand(SecondaryCommand);
+        if (PrimaryCommand != null)
+        {
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand.Command.Model, PrimaryCommand.Model));
+        }
     }
 
     // this comes in when the secondary button is tapped
     public void InvokeSecondaryCommand()
     {
-        PerformCommand(SecondaryCommand);
-    }
-
-    public ContextKeybindingResult CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
-    {
-        var matchedItem = ContextMenu?.CheckKeybinding(ctrl, alt, shift, win, key);
-        return matchedItem != null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
-    }
-
-    private ContextKeybindingResult PerformCommand(CommandItemViewModel? command)
-    {
-        if (command == null)
+        if (SecondaryCommand != null)
         {
-            return ContextKeybindingResult.Unhandled;
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand.Command.Model, SecondaryCommand.Model));
         }
-
-        if (command.HasMoreCommands)
-        {
-            ContextMenuStack.Add(new ContextMenuStackViewModel(command));
-            OnPropertyChanging(nameof(ContextMenu));
-            OnPropertyChanged(nameof(ContextMenu));
-            return ContextKeybindingResult.KeepOpen;
-        }
-        else
-        {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
-            return ContextKeybindingResult.Hide;
-        }
-    }
-
-    public bool CanPopContextStack()
-    {
-        return ContextMenuStack.Count > 1;
-    }
-
-    public void PopContextStack()
-    {
-        if (ContextMenuStack.Count > 1)
-        {
-            ContextMenuStack.RemoveAt(ContextMenuStack.Count - 1);
-        }
-
-        OnPropertyChanging(nameof(ContextMenu));
-        OnPropertyChanged(nameof(ContextMenu));
-    }
-
-    public void ClearContextStack()
-    {
-        while (ContextMenuStack.Count > 1)
-        {
-            ContextMenuStack.RemoveAt(ContextMenuStack.Count - 1);
-        }
-
-        OnPropertyChanging(nameof(ContextMenu));
-        OnPropertyChanged(nameof(ContextMenu));
     }
 }
-
-public enum ContextKeybindingResult
-{
-    Unhandled,
-    Hide,
-    KeepOpen,
-}

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

@@ -9,16 +9,12 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context)
 {
-    private readonly KeyChord nullKeyChord = new(0, 0, 0);
-
     public new ExtensionObject<ICommandContextItem> Model { get; } = new(contextItem);
 
     public bool IsCritical { get; private set; }
 
     public KeyChord? RequestedShortcut { get; private set; }
 
-    public bool HasRequestedShortcut => RequestedShortcut != null && (RequestedShortcut.Value != nullKeyChord);
-
     public override void InitializeProperties()
     {
         if (IsInitialized)
@@ -35,9 +31,6 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
         }
 
         IsCritical = contextItem.IsCritical;
-
-        // I actually don't think this will ever actually be null, because
-        // KeyChord is a struct, which isn't nullable in WinRT
         if (contextItem.RequestedShortcut != null)
         {
             RequestedShortcut = new(

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

@@ -48,7 +48,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     public List<CommandContextItemViewModel> MoreCommands { get; private set; } = [];
 
-    IEnumerable<CommandContextItemViewModel> IContextMenuContext.MoreCommands => MoreCommands;
+    IEnumerable<CommandContextItemViewModel> ICommandBarContext.MoreCommands => MoreCommands;
 
     public bool HasMoreCommands => MoreCommands.Count > 0;
 
@@ -187,26 +187,23 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         // use Initialize straight up
         MoreCommands.ForEach(contextItem =>
         {
-            contextItem.SlowInitializeProperties();
+            contextItem.InitializeProperties();
         });
 
-        if (!string.IsNullOrEmpty(model.Command.Name))
+        _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
         {
-            _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
-            {
-                _itemTitle = Name,
-                Subtitle = Subtitle,
-                Command = Command,
+            _itemTitle = Name,
+            Subtitle = Subtitle,
+            Command = Command,
 
-                // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
-            };
+            // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
+        };
 
-            // Only set the icon on the context item for us if our command didn't
-            // have its own icon
-            if (!Command.HasIcon)
-            {
-                _defaultCommandContextItem._listItemIcon = _listItemIcon;
-            }
+        // Only set the icon on the context item for us if our command didn't
+        // have its own icon
+        if (!Command.HasIcon)
+        {
+            _defaultCommandContextItem._listItemIcon = _listItemIcon;
         }
 
         Initialized |= InitializedState.SelectionInitialized;

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

@@ -167,7 +167,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 
                     Commands.ForEach(contextItem =>
                     {
-                        contextItem.SlowInitializeProperties();
+                        contextItem.InitializeProperties();
                     });
                 }
                 else

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

@@ -1,82 +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.Collections.ObjectModel;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.System;
-
-namespace Microsoft.CmdPal.UI.ViewModels;
-
-public partial class ContextMenuStackViewModel : ObservableObject
-{
-    [ObservableProperty]
-    public partial ObservableCollection<CommandContextItemViewModel> FilteredItems { get; set; }
-
-    private readonly IContextMenuContext _context;
-    private string _lastSearchText = string.Empty;
-
-    // private Dictionary<KeyChord, CommandContextItemViewModel>? _contextKeybindings;
-    public ContextMenuStackViewModel(IContextMenuContext context)
-    {
-        _context = context;
-        FilteredItems = [.. context.AllCommands];
-    }
-
-    public void SetSearchText(string searchText)
-    {
-        if (searchText == _lastSearchText)
-        {
-            return;
-        }
-
-        _lastSearchText = searchText;
-
-        var commands = _context.AllCommands.Where(c => c.ShouldBeVisible);
-        if (string.IsNullOrEmpty(searchText))
-        {
-            ListHelpers.InPlaceUpdateList(FilteredItems, commands);
-            return;
-        }
-
-        var newResults = ListHelpers.FilterList<CommandContextItemViewModel>(commands, searchText, ScoreContextCommand);
-        ListHelpers.InPlaceUpdateList(FilteredItems, newResults);
-    }
-
-    private static int ScoreContextCommand(string query, CommandContextItemViewModel item)
-    {
-        if (string.IsNullOrEmpty(query) || string.IsNullOrWhiteSpace(query))
-        {
-            return 1;
-        }
-
-        if (string.IsNullOrEmpty(item.Title))
-        {
-            return 0;
-        }
-
-        var nameMatch = StringMatcher.FuzzySearch(query, item.Title);
-
-        var descriptionMatch = StringMatcher.FuzzySearch(query, item.Subtitle);
-
-        return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
-    }
-
-    public CommandContextItemViewModel? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
-    {
-        var keybindings = _context.Keybindings();
-        if (keybindings != null)
-        {
-            // Does the pressed key match any of the keybindings?
-            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
-            if (keybindings.TryGetValue(pressedKeyChord, out var item))
-            {
-                return item;
-            }
-        }
-
-        return null;
-    }
-}

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

@@ -434,7 +434,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 break;
             case nameof(EmptyContent):
                 EmptyContent = new(new(model.EmptyContent), PageContext);
-                EmptyContent.SlowInitializeProperties();
+                EmptyContent.InitializeProperties();
                 break;
             case nameof(IsLoading):
                 UpdateEmptyContent();
@@ -452,8 +452,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
             return;
         }
 
-        UpdateProperty(nameof(EmptyContent));
-
         DoOnUiThread(
            () =>
            {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/PerformCommandMessage.cs

@@ -51,12 +51,6 @@ public record PerformCommandMessage
         Context = context.Unsafe;
     }
 
-    public PerformCommandMessage(CommandContextItemViewModel contextCommand)
-    {
-        Command = contextCommand.Command.Model;
-        Context = contextCommand.Model.Unsafe;
-    }
-
     public PerformCommandMessage(ConfirmResultViewModel vm)
     {
         Command = vm.PrimaryCommand.Model;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/TryCommandKeybindingMessage.cs

@@ -1,12 +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 Windows.System;
-
-namespace Microsoft.CmdPal.UI.ViewModels.Messages;
-
-public record TryCommandKeybindingMessage(bool Ctrl, bool Alt, bool Shift, bool Win, VirtualKey Key)
-{
-    public bool Handled { get; set; }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/UpdateCommandBarMessage.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
-using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.UI.ViewModels.Messages;
 
@@ -14,42 +13,22 @@ public record UpdateCommandBarMessage(ICommandBarContext? ViewModel)
 {
 }
 
-public interface IContextMenuContext : INotifyPropertyChanged
-{
-    public IEnumerable<CommandContextItemViewModel> MoreCommands { get; }
-
-    public bool HasMoreCommands { get; }
-
-    public List<CommandContextItemViewModel> AllCommands { get; }
-
-    /// <summary>
-    /// Generates a mapping of key -> command item for this particular item's
-    /// MoreCommands. (This won't include the primary Command, but it will
-    /// include the secondary one). This map can be used to quickly check if a
-    /// shortcut key was pressed
-    /// </summary>
-    /// <returns>a dictionary of KeyChord -> Context commands, for all commands
-    /// that have a shortcut key set.</returns>
-    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
-    {
-        return MoreCommands
-            .Where(c => c.HasRequestedShortcut)
-            .ToDictionary(
-            c => c.RequestedShortcut ?? new KeyChord(0, 0, 0),
-            c => c);
-    }
-}
-
 // Represents everything the command bar needs to know about to show command
 // buttons at the bottom.
 //
 // This is implemented by both ListItemViewModel and ContentPageViewModel,
 // the two things with sub-commands.
-public interface ICommandBarContext : IContextMenuContext
+public interface ICommandBarContext : INotifyPropertyChanged
 {
+    public IEnumerable<CommandContextItemViewModel> MoreCommands { get; }
+
+    public bool HasMoreCommands { get; }
+
     public string SecondaryCommandName { get; }
 
     public CommandItemViewModel? PrimaryCommand { get; }
 
     public CommandItemViewModel? SecondaryCommand { get; }
+
+    public List<CommandContextItemViewModel> AllCommands { get; }
 }

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

@@ -40,8 +40,6 @@ public partial class SettingsModel : ObservableObject
 
     public bool ShowSystemTrayIcon { get; set; } = true;
 
-    public bool IgnoreShortcutWhenFullscreen { get; set; } = true;
-
     public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];
 
     public Dictionary<string, CommandAlias> Aliases { get; set; } = [];

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

@@ -108,16 +108,6 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
-    public bool IgnoreShortcutWhenFullscreen
-    {
-        get => _settings.IgnoreShortcutWhenFullscreen;
-        set
-        {
-            _settings.IgnoreShortcutWhenFullscreen = value;
-            Save();
-        }
-    }
-
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)

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

@@ -36,7 +36,7 @@
 
             <!--  Template for actions in the mode actions dropdown button  -->
             <DataTemplate x:Key="ContextMenuViewModelTemplate" x:DataType="viewmodels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
+                <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -53,16 +53,37 @@
                         Grid.Column="1"
                         VerticalAlignment="Center"
                         Text="{x:Bind Title, Mode=OneWay}" />
-                    <TextBlock
+                    <!--<TextBlock
                         Grid.Column="2"
                         Margin="16,0,0,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
+                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />-->
                 </Grid>
             </DataTemplate>
+
+            <animations:ImplicitAnimationSet x:Name="ShowAnimations">
+                <animations:OpacityAnimation
+                    From="0"
+                    To="1.0"
+                    Duration="0:0:0.340" />
+                <animations:ScaleAnimation
+                    From="0.85"
+                    To="1"
+                    Duration="0:0:0.350" />
+            </animations:ImplicitAnimationSet>
+            <animations:ImplicitAnimationSet x:Name="HideAnimations">
+                <animations:OpacityAnimation
+                    From="1.0"
+                    To="0"
+                    Duration="0:0:0.240" />
+                <animations:ScaleAnimation
+                    From="1"
+                    To="0.85"
+                    Duration="0:0:0.350" />
+            </animations:ImplicitAnimationSet>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -72,8 +93,8 @@
         ColumnSpacing="8">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
         <Grid
@@ -114,6 +135,9 @@
         <Button
             x:Name="SettingsIconButton"
             x:Uid="SettingsButton"
+            animations:Implicit.HideAnimations="{StaticResource HideAnimations}"
+            animations:Implicit.ShowAnimations="{StaticResource ShowAnimations}"
+            ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
             Style="{StaticResource SubtleButtonStyle}"
             Tapped="SettingsIcon_Tapped"
             Visibility="{x:Bind CurrentPageViewModel.IsNested, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
@@ -133,8 +157,6 @@
             VerticalAlignment="Center"
             Style="{StaticResource CaptionTextBlockStyle}"
             Text="{x:Bind CurrentPageViewModel.Title, Mode=OneWay}"
-            TextTrimming="CharacterEllipsis"
-            TextWrapping="NoWrap"
             Visibility="{x:Bind CurrentPageViewModel.IsNested, Mode=OneWay}" />
         <StackPanel
             Grid.Column="2"
@@ -145,8 +167,10 @@
             <Button
                 x:Name="PrimaryButton"
                 Padding="6,4,4,4"
+                animations:Implicit.HideAnimations="{StaticResource HideAnimations}"
+                animations:Implicit.ShowAnimations="{StaticResource ShowAnimations}"
+                ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
-                AutomationProperties.Name="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}"
                 Background="Transparent"
                 Style="{StaticResource SubtleButtonStyle}"
                 Tapped="PrimaryButton_Tapped"
@@ -174,8 +198,10 @@
             <Button
                 x:Name="SecondaryButton"
                 Padding="6,4,4,4"
+                animations:Implicit.HideAnimations="{StaticResource HideAnimations}"
+                animations:Implicit.ShowAnimations="{StaticResource ShowAnimations}"
+                ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
-                AutomationProperties.Name="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}"
                 Style="{StaticResource SubtleButtonStyle}"
                 Tapped="SecondaryButton_Tapped"
                 Visibility="{x:Bind ViewModel.HasSecondaryCommand, Mode=OneWay}">
@@ -219,48 +245,35 @@
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
                 Padding="4"
+                animations:Implicit.HideAnimations="{StaticResource HideAnimations}"
+                animations:Implicit.ShowAnimations="{StaticResource ShowAnimations}"
+                ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
                 Content="{ui:FontIcon Glyph=&#xE712;,
                                       FontSize=16}"
                 Style="{StaticResource SubtleButtonStyle}"
-                ToolTipService.ToolTip="Ctrl+K"
+                ToolTipService.ToolTip="Ctrl+k"
                 Visibility="{x:Bind ViewModel.ShouldShowContextMenu, Mode=OneWay}">
                 <Button.Flyout>
-                    <Flyout
-                        Closing="Flyout_Closing"
-                        Opened="Flyout_Opened"
-                        Placement="TopEdgeAlignedRight">
-                        <StackPanel>
-
-                            <ListView
-                                x:Name="CommandsDropdown"
-                                MinWidth="248"
-                                Margin="-16,-12,-16,-12"
-                                IsItemClickEnabled="True"
-                                ItemClick="CommandsDropdown_ItemClick"
-                                ItemTemplate="{StaticResource ContextMenuViewModelTemplate}"
-                                ItemsSource="{x:Bind ViewModel.ContextMenu.FilteredItems, Mode=OneWay}"
-                                KeyDown="CommandsDropdown_KeyDown"
-                                SelectionMode="Single">
-                                <ListView.ItemContainerStyle>
-                                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-                                        <Setter Property="MinHeight" Value="0" />
-                                        <Setter Property="Padding" Value="12,7,12,7" />
-                                    </Style>
-                                </ListView.ItemContainerStyle>
-                                <ListView.ItemContainerTransitions>
-                                    <TransitionCollection />
-                                </ListView.ItemContainerTransitions>
-                            </ListView>
-
-                            <TextBox
-                                x:Name="ContextFilterBox"
-                                x:Uid="ContextFilterBox"
-                                Margin="-12,12,-12,-12"
-                                KeyDown="ContextFilterBox_KeyDown"
-                                PreviewKeyDown="ContextFilterBox_PreviewKeyDown"
-                                TextChanged="ContextFilterBox_TextChanged" />
-
-                        </StackPanel>
+                    <Flyout Placement="TopEdgeAlignedRight">
+                        <ListView
+                            x:Name="CommandsDropdown"
+                            MinWidth="248"
+                            Margin="-16,-12,-16,-12"
+                            IsItemClickEnabled="True"
+                            ItemClick="CommandsDropdown_ItemClick"
+                            ItemTemplate="{StaticResource ContextMenuViewModelTemplate}"
+                            ItemsSource="{x:Bind ViewModel.ContextCommands, Mode=OneWay}"
+                            SelectionMode="None">
+                            <ListView.ItemContainerStyle>
+                                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                                    <Setter Property="MinHeight" Value="0" />
+                                    <Setter Property="Padding" Value="12,7,12,7" />
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                            <ListView.ItemContainerTransitions>
+                                <TransitionCollection />
+                            </ListView.ItemContainerTransitions>
+                        </ListView>
                     </Flyout>
                 </Button.Flyout>
             </Button>

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

@@ -6,22 +6,18 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Views;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
-using Windows.System;
-using Windows.UI.Core;
 
 namespace Microsoft.CmdPal.UI.Controls;
 
 public sealed partial class CommandBar : UserControl,
     IRecipient<OpenContextMenuMessage>,
-    IRecipient<TryCommandKeybindingMessage>,
     ICurrentPageAware
 {
-    public CommandBarViewModel ViewModel { get; } = new();
+    public CommandBarViewModel ViewModel { get; set; } = new();
 
     public PageViewModel? CurrentPageViewModel
     {
@@ -39,9 +35,6 @@ public sealed partial class CommandBar : UserControl,
 
         // RegisterAll isn't AOT compatible
         WeakReferenceMessenger.Default.Register<OpenContextMenuMessage>(this);
-        WeakReferenceMessenger.Default.Register<TryCommandKeybindingMessage>(this);
-
-        ViewModel.PropertyChanged += ViewModel_PropertyChanged;
     }
 
     public void Receive(OpenContextMenuMessage message)
@@ -56,41 +49,8 @@ public sealed partial class CommandBar : UserControl,
             ShowMode = FlyoutShowMode.Standard,
         };
         MoreCommandsButton.Flyout.ShowAt(MoreCommandsButton, options);
-        UpdateUiForStackChange();
-    }
-
-    public void Receive(TryCommandKeybindingMessage msg)
-    {
-        if (!ViewModel.ShouldShowContextMenu)
-        {
-            return;
-        }
-
-        var result = ViewModel?.CheckKeybinding(msg.Ctrl, msg.Alt, msg.Shift, msg.Win, msg.Key);
-
-        if (result == ContextKeybindingResult.Hide)
-        {
-            msg.Handled = true;
-        }
-        else if (result == ContextKeybindingResult.KeepOpen)
-        {
-            if (!MoreCommandsButton.Flyout.IsOpen)
-            {
-                var options = new FlyoutShowOptions
-                {
-                    ShowMode = FlyoutShowMode.Standard,
-                };
-                MoreCommandsButton.Flyout.ShowAt(MoreCommandsButton, options);
-            }
-
-            UpdateUiForStackChange();
-
-            msg.Handled = true;
-        }
-        else if (result == ContextKeybindingResult.Unhandled)
-        {
-            msg.Handled = false;
-        }
+        CommandsDropdown.SelectedIndex = 0;
+        CommandsDropdown.Focus(FocusState.Programmatic);
     }
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS has a tendency to delete XAML bound methods over-aggressively")]
@@ -125,160 +85,8 @@ public sealed partial class CommandBar : UserControl,
     {
         if (e.ClickedItem is CommandContextItemViewModel item)
         {
-            if (ViewModel?.InvokeItem(item) == ContextKeybindingResult.Hide)
-            {
-                MoreCommandsButton.Flyout.Hide();
-            }
-            else
-            {
-                UpdateUiForStackChange();
-            }
-        }
-    }
-
-    private void CommandsDropdown_KeyDown(object sender, KeyRoutedEventArgs e)
-    {
-        if (e.Handled)
-        {
-            return;
-        }
-
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-            InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
-        var result = ViewModel?.CheckKeybinding(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-
-        if (result == ContextKeybindingResult.Hide)
-        {
-            e.Handled = true;
+            ViewModel?.InvokeItemCommand.Execute(item);
             MoreCommandsButton.Flyout.Hide();
-            WeakReferenceMessenger.Default.Send<FocusSearchBoxMessage>();
         }
-        else if (result == ContextKeybindingResult.KeepOpen)
-        {
-            e.Handled = true;
-        }
-        else if (result == ContextKeybindingResult.Unhandled)
-        {
-            e.Handled = false;
-        }
-    }
-
-    private void Flyout_Opened(object sender, object e)
-    {
-        UpdateUiForStackChange();
-    }
-
-    private void Flyout_Closing(FlyoutBase sender, FlyoutBaseClosingEventArgs args)
-    {
-        ViewModel?.ClearContextStack();
-        WeakReferenceMessenger.Default.Send<FocusSearchBoxMessage>();
-    }
-
-    private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        var prop = e.PropertyName;
-        if (prop == nameof(ViewModel.ContextMenu))
-        {
-            UpdateUiForStackChange();
-        }
-    }
-
-    private void ContextFilterBox_TextChanged(object sender, TextChangedEventArgs e)
-    {
-        ViewModel.ContextMenu?.SetSearchText(ContextFilterBox.Text);
-
-        if (CommandsDropdown.SelectedIndex == -1)
-        {
-            CommandsDropdown.SelectedIndex = 0;
-        }
-    }
-
-    private void ContextFilterBox_KeyDown(object sender, KeyRoutedEventArgs e)
-    {
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-            InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
-        if (e.Key == VirtualKey.Enter)
-        {
-            if (CommandsDropdown.SelectedItem is CommandContextItemViewModel item)
-            {
-                if (ViewModel?.InvokeItem(item) == ContextKeybindingResult.Hide)
-                {
-                    MoreCommandsButton.Flyout.Hide();
-                    WeakReferenceMessenger.Default.Send<FocusSearchBoxMessage>();
-                }
-                else
-                {
-                    UpdateUiForStackChange();
-                }
-
-                e.Handled = true;
-            }
-        }
-        else if (e.Key == VirtualKey.Escape ||
-            (e.Key == VirtualKey.Left && altPressed))
-        {
-            if (ViewModel.CanPopContextStack())
-            {
-                ViewModel.PopContextStack();
-                UpdateUiForStackChange();
-            }
-            else
-            {
-                MoreCommandsButton.Flyout.Hide();
-                WeakReferenceMessenger.Default.Send<FocusSearchBoxMessage>();
-            }
-
-            e.Handled = true;
-        }
-
-        CommandsDropdown_KeyDown(sender, e);
-    }
-
-    private void ContextFilterBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
-    {
-        if (e.Key == VirtualKey.Up)
-        {
-            // navigate previous
-            if (CommandsDropdown.SelectedIndex > 0)
-            {
-                CommandsDropdown.SelectedIndex--;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = CommandsDropdown.Items.Count - 1;
-            }
-
-            e.Handled = true;
-        }
-        else if (e.Key == VirtualKey.Down)
-        {
-            // navigate next
-            if (CommandsDropdown.SelectedIndex < CommandsDropdown.Items.Count - 1)
-            {
-                CommandsDropdown.SelectedIndex++;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = 0;
-            }
-
-            e.Handled = true;
-        }
-    }
-
-    private void UpdateUiForStackChange()
-    {
-        ContextFilterBox.Text = string.Empty;
-        ViewModel.ContextMenu?.SetSearchText(string.Empty);
-        CommandsDropdown.SelectedIndex = 0;
-        ContextFilterBox.Focus(FocusState.Programmatic);
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs

@@ -105,9 +105,7 @@ public sealed partial class SearchBar : UserControl,
 
         var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
         var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-            InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
+
         if (ctrlPressed && e.Key == VirtualKey.Enter)
         {
             // ctrl+enter
@@ -166,16 +164,6 @@ public sealed partial class SearchBar : UserControl,
         {
             WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
         }
-
-        if (!e.Handled)
-        {
-            // The CommandBar is responsible for handling all the item keybindings,
-            // since the bound context item may need to then show another
-            // context menu
-            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-            WeakReferenceMessenger.Default.Send(msg);
-            e.Handled = msg.Handled;
-        }
     }
 
     private void FilterBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -293,5 +281,5 @@ public sealed partial class SearchBar : UserControl,
 
     public void Receive(GoHomeMessage message) => ClearSearch();
 
-    public void Receive(FocusSearchBoxMessage message) => FilterBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+    public void Receive(FocusSearchBoxMessage message) => this.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
 }

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

@@ -38,7 +38,6 @@
             <Setter Property="IsTabStop" Value="False" />
             <Setter Property="HorizontalAlignment" Value="Center" />
             <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="AutomationProperties.AutomationControlType" Value="Custom" />
             <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
             <Setter Property="Padding" Value="{ThemeResource TagPadding}" />
             <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -57,7 +56,6 @@
                             Padding="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            AutomationProperties.Name="{TemplateBinding Text}"
                             Background="{TemplateBinding Background}"
                             BackgroundSizing="{TemplateBinding BackgroundSizing}"
                             BorderBrush="{TemplateBinding BorderBrush}"

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml

@@ -28,22 +28,21 @@
             NotEmptyValue="Visible" />
 
         <DataTemplate x:Key="TagTemplate" x:DataType="viewmodels:TagViewModel">
-            <cpcontrols:Tag
-                AutomationProperties.Name="{x:Bind Text, Mode=OneWay}"
-                BackgroundColor="{x:Bind Background, Mode=OneWay}"
-                FontSize="12"
-                ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
-                Icon="{x:Bind Icon, Mode=OneWay}"
-                Text="{x:Bind Text, Mode=OneWay}"
-                ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
+            <ItemContainer>
+                <cpcontrols:Tag
+                    BackgroundColor="{x:Bind Background, Mode=OneWay}"
+                    FontSize="12"
+                    ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
+                    Icon="{x:Bind Icon, Mode=OneWay}"
+                    Text="{x:Bind Text, Mode=OneWay}"
+                    ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
+            </ItemContainer>
         </DataTemplate>
 
         <!--  https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items  -->
         <DataTemplate x:Key="ListItemViewModelTemplate" x:DataType="viewmodels:ListItemViewModel">
-            <Grid
-                Padding="0,12,0,12"
-                AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
-                ColumnSpacing="12">
+
+            <Grid Padding="0,12,0,12" ColumnSpacing="12">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="28" />
                     <ColumnDefinition Width="*" />
@@ -56,7 +55,6 @@
                     Width="20"
                     Height="20"
                     Margin="4,0,4,0"
-                    AutomationProperties.AccessibilityView="Raw"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                     SourceKey="{x:Bind Icon, Mode=OneWay}"
                     SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
@@ -138,15 +136,14 @@
             </controls:Case>
             <controls:Case Value="True">
                 <StackPanel
-                    Margin="24"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Orientation="Vertical"
                     Spacing="4">
                     <cpcontrols:IconBox
                         x:Name="IconBorder"
-                        Width="48"
-                        Height="48"
+                        Width="56"
+                        Height="56"
                         Margin="8"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                         SourceKey="{x:Bind ViewModel.EmptyContent.Icon, Mode=OneWay}"
@@ -155,15 +152,11 @@
                         Margin="0,4,0,0"
                         HorizontalAlignment="Center"
                         FontWeight="SemiBold"
-                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap" />
+                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}" />
                     <TextBlock
                         HorizontalAlignment="Center"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap" />
+                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}" />
                 </StackPanel>
             </controls:Case>
         </controls:SwitchPresenter>

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/NativeMethods.cs

@@ -1,26 +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.Runtime.InteropServices;
-using System.Security;
-
-namespace Microsoft.CmdPal.UI.Helpers;
-
-[SuppressUnmanagedCodeSecurity]
-internal static class NativeMethods
-{
-    [DllImport("shell32.dll")]
-    public static extern int SHQueryUserNotificationState(out UserNotificationState state);
-}
-
-internal enum UserNotificationState : int
-{
-    QUNS_NOT_PRESENT = 1,
-    QUNS_BUSY,
-    QUNS_RUNNING_D3D_FULL_SCREEN,
-    QUNS_PRESENTATION_MODE,
-    QUNS_ACCEPTS_NOTIFICATIONS,
-    QUNS_QUIET_TIME,
-    QUNS_APP,
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowHelper.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.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.UI.Helpers;
-
-internal sealed partial class WindowHelper
-{
-    public static bool IsWindowFullscreen()
-    {
-        UserNotificationState state;
-
-        // https://learn.microsoft.com/en-us/windows/win32/api/shellapi/ne-shellapi-query_user_notification_state
-        if (Marshal.GetExceptionForHR(NativeMethods.SHQueryUserNotificationState(out state)) == null)
-        {
-            if (state == UserNotificationState.QUNS_RUNNING_D3D_FULL_SCREEN ||
-                state == UserNotificationState.QUNS_BUSY ||
-                state == UserNotificationState.QUNS_PRESENTATION_MODE)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

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

@@ -43,7 +43,6 @@ public sealed partial class MainWindow : Window,
     private readonly WNDPROC? _hotkeyWndProc;
     private readonly WNDPROC? _originalWndProc;
     private readonly List<TopLevelHotkey> _hotkeys = [];
-    private bool _ignoreHotKeyWhenFullScreen = true;
 
     // Stylistically, window messages are WM_*
 #pragma warning disable SA1310 // Field names should not contain underscore
@@ -158,8 +157,6 @@ public sealed partial class MainWindow : Window,
         SetupHotkey(settings);
         SetupTrayIcon(settings.ShowSystemTrayIcon);
 
-        _ignoreHotKeyWhenFullScreen = settings.IgnoreShortcutWhenFullscreen;
-
         // This will prevent our window from appearing in alt+tab or the taskbar.
         // You'll _need_ to use the hotkey to summon it.
         AppWindow.IsShownInSwitchers = System.Diagnostics.Debugger.IsAttached;
@@ -507,15 +504,6 @@ public sealed partial class MainWindow : Window,
                     var hotkeyIndex = (int)wParam.Value;
                     if (hotkeyIndex < _hotkeys.Count)
                     {
-                        if (_ignoreHotKeyWhenFullScreen)
-                        {
-                            // If we're in full screen mode, ignore the hotkey
-                            if (WindowHelper.IsWindowFullscreen())
-                            {
-                                return (LRESULT)IntPtr.Zero;
-                            }
-                        }
-
                         var hotkey = _hotkeys[hotkeyIndex];
                         HandleSummon(hotkey.CommandId);
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml

@@ -41,7 +41,6 @@
             <DataTemplate x:Key="TagTemplate" x:DataType="viewModels:TagViewModel">
                 <cpcontrols:Tag
                     HorizontalAlignment="Left"
-                    AutomationProperties.Name="{x:Bind Text, Mode=OneWay}"
                     BackgroundColor="{x:Bind Background, Mode=OneWay}"
                     FontSize="12"
                     ForegroundColor="{x:Bind Foreground, Mode=OneWay}"
@@ -148,36 +147,27 @@
                         Visibility="{x:Bind ViewModel.CurrentPage.IsNested, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
                         <animations:Implicit.ShowAnimations>
                             <animations:OpacityAnimation
-                                EasingMode="EaseIn"
-                                EasingType="Cubic"
                                 From="0"
                                 To="1.0"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.340" />
                             <animations:ScaleAnimation
-                                EasingMode="EaseIn"
-                                EasingType="Cubic"
                                 From="0.5"
                                 To="1"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.350" />
                         </animations:Implicit.ShowAnimations>
                         <animations:Implicit.HideAnimations>
                             <animations:OpacityAnimation
-                                EasingMode="EaseOut"
-                                EasingType="Cubic"
                                 From="1.0"
                                 To="0"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.240" />
                             <animations:ScaleAnimation
-                                EasingMode="EaseOut"
-                                EasingType="Cubic"
                                 From="1"
                                 To="0.5"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.350" />
                         </animations:Implicit.HideAnimations>
                     </Image>
                     <Button
                         x:Name="BackButton"
-                        x:Uid="BackButton"
                         Margin="4,0,4,0"
                         Padding="4"
                         HorizontalAlignment="Center"
@@ -188,42 +178,35 @@
                         FontSize="16"
                         Style="{StaticResource SubtleButtonStyle}"
                         Tapped="BackButton_Tapped"
+                        ToolTipService.ToolTip="Back"
                         Visibility="{x:Bind ViewModel.CurrentPage.IsNested, Mode=OneWay}">
                         <animations:Implicit.ShowAnimations>
                             <animations:OpacityAnimation
-                                EasingMode="EaseIn"
-                                EasingType="Cubic"
                                 From="0"
                                 To="1.0"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.340" />
                             <animations:ScaleAnimation
                                 From="0.5"
                                 To="1"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.350" />
                             <animations:TranslationAnimation
                                 From="16,0,0"
                                 To="0,0,0"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.350" />
                         </animations:Implicit.ShowAnimations>
                         <animations:Implicit.HideAnimations>
                             <animations:OpacityAnimation
-                                EasingMode="EaseOut"
-                                EasingType="Cubic"
                                 From="1.0"
                                 To="0"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.340" />
                             <animations:ScaleAnimation
-                                EasingMode="EaseOut"
-                                EasingType="Cubic"
                                 From="1"
                                 To="0.5"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.350" />
                             <animations:TranslationAnimation
-                                EasingMode="EaseOut"
-                                EasingType="Cubic"
                                 From="0,0,0"
                                 To="16,0,0"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.350" />
                         </animations:Implicit.HideAnimations>
                     </Button>
                     <cpcontrols:IconBox
@@ -240,29 +223,29 @@
                             <animations:OpacityAnimation
                                 From="0"
                                 To="1.0"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.450" />
                             <animations:ScaleAnimation
                                 From="0.8"
                                 To="1"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.500" />
                             <animations:TranslationAnimation
                                 From="8,0,0"
                                 To="0,0,0"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.400" />
                         </animations:Implicit.ShowAnimations>
                         <animations:Implicit.HideAnimations>
                             <animations:OpacityAnimation
                                 From="1.0"
                                 To="0"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.340" />
                             <animations:ScaleAnimation
                                 From="1"
                                 To="0.8"
-                                Duration="0:0:0.333" />
+                                Duration="0:0:0.350" />
                             <animations:TranslationAnimation
                                 From="0,0,0"
                                 To="8,0,0"
-                                Duration="0:0:0.187" />
+                                Duration="0:0:0.350" />
                         </animations:Implicit.HideAnimations>
                     </cpcontrols:IconBox>
                 </StackPanel>
@@ -289,13 +272,13 @@
                     <animations:OpacityAnimation
                         From="0"
                         To="1.0"
-                        Duration="0:0:0.333" />
+                        Duration="0:0:0.340" />
                 </animations:Implicit.ShowAnimations>
                 <animations:Implicit.HideAnimations>
                     <animations:OpacityAnimation
                         From="1.0"
                         To="0"
-                        Duration="0:0:0.333" />
+                        Duration="0:0:0.340" />
                 </animations:Implicit.HideAnimations>
             </ProgressBar>
 
@@ -330,21 +313,21 @@
                         <animations:OpacityAnimation
                             From="0"
                             To="1.0"
-                            Duration="0:0:0.187" />
+                            Duration="0:0:0.270" />
                         <animations:TranslationAnimation
                             From="24,0,0"
                             To="0,0,0"
-                            Duration="0:0:0.187" />
+                            Duration="0:0:0.280" />
                     </animations:Implicit.ShowAnimations>
                     <animations:Implicit.HideAnimations>
                         <animations:OpacityAnimation
                             From="1.0"
                             To="0"
-                            Duration="0:0:0.187" />
+                            Duration="0:0:0.180" />
                         <animations:TranslationAnimation
                             From="0,0,0"
                             To="24,0,0"
-                            Duration="0:0:0.187" />
+                            Duration="0:0:0.220" />
                     </animations:Implicit.HideAnimations>
                     <Grid Margin="12">
                         <Grid.RowDefinitions>
@@ -356,10 +339,10 @@
 
                         <cpcontrols:IconBox
                             x:Name="HeroImageBorder"
-                            Width="64"
-                            Margin="16,8,16,16"
+                            MinWidth="64"
+                            MinHeight="64"
+                            MaxHeight="96"
                             HorizontalAlignment="Center"
-                            AutomationProperties.AccessibilityView="Raw"
                             SourceKey="{x:Bind ViewModel.Details.HeroImage, Mode=OneWay}"
                             SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}"
                             Visibility="{x:Bind HasHeroImage, Mode=OneWay}" />
@@ -367,10 +350,8 @@
                         <TextBlock
                             Grid.Row="1"
                             HorizontalAlignment="Center"
-                            FontSize="18"
-                            FontWeight="SemiBold"
+                            Style="{StaticResource SubtitleTextBlockStyle}"
                             Text="{x:Bind ViewModel.Details.Title, Mode=OneWay}"
-                            TextAlignment="Center"
                             TextWrapping="WrapWholeWords"
                             Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -427,6 +427,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             }
 
             _settingsWindow.Activate();
+
+            WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(null));
         });
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml

@@ -48,9 +48,6 @@
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
-                    <controls:SettingsCard x:Uid="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE7FC;}">
-                        <ToggleSwitch IsOn="{x:Bind viewModel.IgnoreShortcutWhenFullscreen, Mode=TwoWay}" />
-                    </controls:SettingsCard>
                     <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
                         <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
                     </controls:SettingsCard>

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

@@ -328,12 +328,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_LowLevelHook_SettingsCard.Description" xml:space="preserve">
     <value>Try this if there are issues with the shortcut (Command Palette might not get focus when triggered from an elevated window)</value>
   </data>
-  <data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Header" xml:space="preserve">
-    <value>Ignore shortcut in fullscreen mode</value>
-  </data>
-  <data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Description" xml:space="preserve">
-    <value>Preventing disruption of the program running in fullscreen by unintentional activation of shortcut</value>
-  </data>
   <data name="Settings_GeneralPage_GoHome_SettingsCard.Header" xml:space="preserve">
     <value>Go home when activated</value>
   </data>
@@ -385,6 +379,9 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_NavigationViewItem_Extensions.Content" xml:space="preserve">
     <value>Extensions</value>
   </data>
+  <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>More commands</value>
+  </data>
   <data name="SettingsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Open Command Palette settings</value>
   </data>
@@ -394,22 +391,10 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="BehaviorSettingsHeader.Text" xml:space="preserve">
     <value>Behavior</value>
   </data>
-  <data name="ContextFilterBox.PlaceholderText" xml:space="preserve">
-    <value>Search commands...</value>
-  </data>
   <data name="Settings_GeneralPage_ShowSystemTrayIcon_SettingsCard.Header" xml:space="preserve">
     <value>Show system tray icon</value>
   </data>
   <data name="Settings_GeneralPage_ShowSystemTrayIcon_SettingsCard.Description" xml:space="preserve">
     <value>Choose if Command Palette is visible in the system tray</value>
   </data>
-  <data name="BackButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Back</value>
-  </data>
-  <data name="BackButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Back</value>
-  </data>
-  <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>More</value>
-  </data>
 </root>

src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup>
     <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.6.250205002</WasdkNuget>
   </PropertyGroup>
   <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
   <PropertyGroup Label="Globals">

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

@@ -2,34 +2,176 @@
 // 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.CmdPal.Ext.Calc.Pages;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.Text;
 using Microsoft.CmdPal.Ext.Calc.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Ext.Calc;
 
 public partial class CalculatorCommandProvider : CommandProvider
 {
-    private readonly ListItem _listItem = new(new CalculatorListPage(settings))
-    {
-        Subtitle = Resources.calculator_top_level_subtitle,
-        MoreCommands = [new CommandContextItem(settings.Settings.SettingsPage)],
-    };
-
-    private readonly FallbackCalculatorItem _fallback = new(settings);
-    private static SettingsManager settings = new();
+    private readonly ListItem _listItem = new(new CalculatorListPage()) { Subtitle = Resources.calculator_top_level_subtitle };
+    private readonly FallbackCalculatorItem _fallback = new();
 
     public CalculatorCommandProvider()
     {
         Id = "Calculator";
         DisplayName = Resources.calculator_display_name;
-        Icon = CalculatorIcons.ProviderIcon;
-        Settings = settings.Settings;
+        Icon = IconHelpers.FromRelativePath("Assets\\Calculator.svg");
     }
 
     public override ICommandItem[] TopLevelCommands() => [_listItem];
 
     public override IFallbackCommandItem[] FallbackCommands() => [_fallback];
 }
+
+// The calculator page is a dynamic list page
+// * The first command is where we display the results. Title=result, Subtitle=query
+//   - The default command is `SaveCommand`.
+//     - When you save, insert into list at spot 1
+//     - change SearchText to the result
+//   - MoreCommands: a single `CopyCommand` to copy the result to the clipboard
+// * The rest of the items are previously saved results
+//   - Command is a CopyCommand
+//   - Each item also sets the TextToSuggest to the result
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
+public sealed partial class CalculatorListPage : DynamicListPage
+{
+    private readonly List<ListItem> _items = [];
+    private readonly SaveCommand _saveCommand = new();
+    private readonly CopyTextCommand _copyContextCommand;
+    private readonly CommandContextItem _copyContextMenuItem;
+    private static readonly CompositeFormat ErrorMessage = System.Text.CompositeFormat.Parse(Properties.Resources.calculator_error);
+
+    public CalculatorListPage()
+    {
+        Icon = IconHelpers.FromRelativePath("Assets\\Calculator.svg");
+        Name = Resources.calculator_title;
+        PlaceholderText = Resources.calculator_placeholder_text;
+        Id = "com.microsoft.cmdpal.calculator";
+
+        _copyContextCommand = new CopyTextCommand(string.Empty);
+        _copyContextMenuItem = new CommandContextItem(_copyContextCommand);
+
+        _items.Add(new(_saveCommand) { Icon = new IconInfo("\uE94E") });
+
+        UpdateSearchText(string.Empty, string.Empty);
+
+        _saveCommand.SaveRequested += HandleSave;
+    }
+
+    private void HandleSave(object sender, object args)
+    {
+        var lastResult = _items[0].Title;
+        if (!string.IsNullOrEmpty(lastResult))
+        {
+            var li = new ListItem(new CopyTextCommand(lastResult))
+            {
+                Title = _items[0].Title,
+                Subtitle = _items[0].Subtitle,
+                TextToSuggest = lastResult,
+            };
+            _items.Insert(1, li);
+            _items[0].Subtitle = string.Empty;
+            SearchText = lastResult;
+            this.RaiseItemsChanged(this._items.Count);
+        }
+    }
+
+    public override void UpdateSearchText(string oldSearch, string newSearch)
+    {
+        var firstItem = _items[0];
+        if (string.IsNullOrEmpty(newSearch))
+        {
+            firstItem.Title = Resources.calculator_placeholder_text;
+            firstItem.Subtitle = string.Empty;
+            firstItem.MoreCommands = [];
+        }
+        else
+        {
+            _copyContextCommand.Text = ParseQuery(newSearch, out var result) ? result : string.Empty;
+            firstItem.Title = result;
+            firstItem.Subtitle = newSearch;
+            firstItem.MoreCommands = [_copyContextMenuItem];
+        }
+    }
+
+    internal static bool ParseQuery(string equation, out string result)
+    {
+        try
+        {
+            var resultNumber = new DataTable().Compute(equation, null);
+            result = resultNumber.ToString() ?? string.Empty;
+            return true;
+        }
+        catch (Exception e)
+        {
+            result = string.Format(CultureInfo.CurrentCulture, ErrorMessage, e.Message);
+            return false;
+        }
+    }
+
+    public override IListItem[] GetItems() => _items.ToArray();
+}
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
+public sealed partial class SaveCommand : InvokableCommand
+{
+    public event TypedEventHandler<object, object> SaveRequested;
+
+    public SaveCommand()
+    {
+        Name = Resources.calculator_save_command_name;
+    }
+
+    public override ICommandResult Invoke()
+    {
+        SaveRequested?.Invoke(this, this);
+        return CommandResult.KeepOpen();
+    }
+}
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
+internal sealed partial class FallbackCalculatorItem : FallbackCommandItem
+{
+    private readonly CopyTextCommand _copyCommand = new(string.Empty);
+    private static readonly IconInfo _cachedIcon = IconHelpers.FromRelativePath("Assets\\Calculator.svg");
+
+    public FallbackCalculatorItem()
+        : base(new NoOpCommand(), Resources.calculator_title)
+    {
+        Command = _copyCommand;
+        _copyCommand.Name = string.Empty;
+        Title = string.Empty;
+        Subtitle = Resources.calculator_placeholder_text;
+        Icon = _cachedIcon;
+    }
+
+    public override void UpdateQuery(string query)
+    {
+        if (CalculatorListPage.ParseQuery(query, out var result))
+        {
+            _copyCommand.Text = result;
+            _copyCommand.Name = string.IsNullOrWhiteSpace(query) ? string.Empty : Resources.calculator_copy_command_name;
+            Title = result;
+
+            // we have to make the subtitle the equation,
+            // so that we will still string match the original query
+            // Otherwise, something like 1+2 will have a title of "3" and not match
+            Subtitle = query;
+        }
+        else
+        {
+            _copyCommand.Text = string.Empty;
+            _copyCommand.Name = string.Empty;
+            Title = string.Empty;
+            Subtitle = string.Empty;
+        }
+    }
+}

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

@@ -1,86 +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.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public static class BracketHelper
-{
-    public static bool IsBracketComplete(string query)
-    {
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            return true;
-        }
-
-        var valueTuples = query
-            .Select(BracketTrail)
-            .Where(r => r != default);
-
-        var trailTest = new Stack<TrailType>();
-
-        foreach (var (direction, type) in valueTuples)
-        {
-            switch (direction)
-            {
-                case TrailDirection.Open:
-                    trailTest.Push(type);
-                    break;
-                case TrailDirection.Close:
-                    // Try to get item out of stack
-                    if (!trailTest.TryPop(out var popped))
-                    {
-                        return false;
-                    }
-
-                    if (type != popped)
-                    {
-                        return false;
-                    }
-
-                    continue;
-                default:
-                    {
-                        throw new ArgumentOutOfRangeException($"Can't process value (Parameter direction: {direction})");
-                    }
-            }
-        }
-
-        return trailTest.Count == 0;
-    }
-
-    private static (TrailDirection Direction, TrailType Type) BracketTrail(char @char)
-    {
-        switch (@char)
-        {
-            case '(':
-                return (TrailDirection.Open, TrailType.Round);
-            case ')':
-                return (TrailDirection.Close, TrailType.Round);
-            case '[':
-                return (TrailDirection.Open, TrailType.Bracket);
-            case ']':
-                return (TrailDirection.Close, TrailType.Bracket);
-            default:
-                return default;
-        }
-    }
-
-    private enum TrailDirection
-    {
-        None,
-        Open,
-        Close,
-    }
-
-    private enum TrailType
-    {
-        None,
-        Bracket,
-        Round,
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.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.Collections.Generic;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-using Mages.Core;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public static class CalculateEngine
-{
-    private static readonly Engine _magesEngine = new Engine(new Configuration
-    {
-        Scope = new Dictionary<string, object>
-        {
-            { "e", Math.E }, // e is not contained in the default mages engine
-        },
-    });
-
-    public const int RoundingDigits = 10;
-
-    public enum TrigMode
-    {
-        Radians,
-        Degrees,
-        Gradians,
-    }
-
-    /// <summary>
-    /// 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)
-    {
-        error = default;
-
-        if (!CalculateHelper.InputValid(input))
-        {
-            return default;
-        }
-
-        // check for division by zero
-        // We check if the string contains a slash followed by space (optional) and zero. Whereas the zero must not be followed by a dot, comma, 'b', 'o' or 'x' as these indicate a number with decimal digits or a binary/octal/hexadecimal value respectively. The zero must also not be followed by other digits.
-        if (new Regex("\\/\\s*0(?!(?:[,\\.0-9]|[box]0*[1-9a-f]))", RegexOptions.IgnoreCase).Match(input).Success)
-        {
-            error = Properties.Resources.calculator_division_by_zero;
-            return default;
-        }
-
-        // mages has quirky log representation
-        // mage has log == ln vs log10
-        input = input.
-                    Replace("log(", "log10(", true, CultureInfo.CurrentCulture).
-                    Replace("ln(", "log(", true, CultureInfo.CurrentCulture);
-
-        input = CalculateHelper.FixHumanMultiplicationExpressions(input);
-
-        // Get the user selected trigonometry unit
-        TrigMode trigMode = settings.TrigUnit;
-
-        // Modify trig functions depending on angle unit setting
-        input = CalculateHelper.UpdateTrigFunctions(input, trigMode);
-
-        // Expand conversions between trig units
-        input = CalculateHelper.ExpandTrigConversions(input, trigMode);
-
-        var result = _magesEngine.Interpret(input);
-
-        // This could happen for some incorrect queries, like pi(2)
-        if (result == null)
-        {
-            error = Properties.Resources.calculator_expression_not_complete;
-            return default;
-        }
-
-        result = TransformResult(result);
-        if (result is string)
-        {
-            error = result as string;
-            return default;
-        }
-
-        if (string.IsNullOrEmpty(result?.ToString()))
-        {
-            return default;
-        }
-
-        var decimalResult = Convert.ToDecimal(result, cultureInfo);
-        var roundedResult = Round(decimalResult);
-
-        return new CalculateResult()
-        {
-            Result = decimalResult,
-            RoundedResult = roundedResult,
-        };
-    }
-
-    public static decimal Round(decimal value)
-    {
-        return Math.Round(value, RoundingDigits, MidpointRounding.AwayFromZero);
-    }
-
-    private static dynamic TransformResult(object result)
-    {
-        if (result.ToString() == "NaN")
-        {
-            return Properties.Resources.calculator_not_a_number;
-        }
-
-        if (result is Function)
-        {
-            return Properties.Resources.calculator_expression_not_complete;
-        }
-
-        if (result is double[,])
-        {
-            // '[10,10]' is interpreted as array by mages engine
-            return Properties.Resources.calculator_double_array_returned;
-        }
-
-        return result;
-    }
-}

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

@@ -1,328 +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.Text.RegularExpressions;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public static class CalculateHelper
-{
-    private static readonly Regex RegValidExpressChar = new Regex(
-        @"^(" +
-        @"%|" +
-        @"ceil\s*\(|floor\s*\(|exp\s*\(|max\s*\(|min\s*\(|abs\s*\(|log(?:2|10)?\s*\(|ln\s*\(|sqrt\s*\(|pow\s*\(|" +
-        @"factorial\s*\(|sign\s*\(|round\s*\(|rand\s*\(\)|randi\s*\([^\)]|" +
-        @"sin\s*\(|cos\s*\(|tan\s*\(|arcsin\s*\(|arccos\s*\(|arctan\s*\(|" +
-        @"sinh\s*\(|cosh\s*\(|tanh\s*\(|arsinh\s*\(|arcosh\s*\(|artanh\s*\(|" +
-        @"rad\s*\(|deg\s*\(|grad\s*\(|" + /* trigonometry unit conversion macros */
-        @"pi|" +
-        @"==|~=|&&|\|\||" +
-        @"((-?(\d+(\.\d*)?)|-?(\.\d+))[Ee](-?\d+))|" + /* expression from CheckScientificNotation between parenthesis */
-        @"e|[0-9]|0[xX][0-9a-fA-F]+|0[bB][01]+|0[oO][0-7]+|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
-        @")+$",
-        RegexOptions.Compiled);
-
-    private const string DegToRad = "(pi / 180) * ";
-    private const string DegToGrad = "(10 / 9) * ";
-    private const string GradToRad = "(pi / 200) * ";
-    private const string GradToDeg = "(9 / 10) * ";
-    private const string RadToDeg = "(180 / pi) * ";
-    private const string RadToGrad = "(200 / pi) * ";
-
-    public static bool InputValid(string input)
-    {
-        if (string.IsNullOrWhiteSpace(input))
-        {
-            throw new ArgumentNullException(paramName: nameof(input));
-        }
-
-        if (!RegValidExpressChar.IsMatch(input))
-        {
-            return false;
-        }
-
-        if (!BracketHelper.IsBracketComplete(input))
-        {
-            return false;
-        }
-
-        // If the input ends with a binary operator then it is not a valid input to mages and the Interpret function would throw an exception. Because we expect here that the user has not finished typing we block those inputs.
-        var trimmedInput = input.TrimEnd();
-        if (trimmedInput.EndsWith('+') || trimmedInput.EndsWith('-') || trimmedInput.EndsWith('*') || trimmedInput.EndsWith('|') || trimmedInput.EndsWith('\\') || trimmedInput.EndsWith('^') || trimmedInput.EndsWith('=') || trimmedInput.EndsWith('&') || trimmedInput.EndsWith('/') || trimmedInput.EndsWith('%'))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public static string FixHumanMultiplicationExpressions(string input)
-    {
-        var output = CheckScientificNotation(input);
-        output = CheckNumberOrConstantThenParenthesisExpr(output);
-        output = CheckNumberOrConstantThenFunc(output);
-        output = CheckParenthesisExprThenFunc(output);
-        output = CheckParenthesisExprThenParenthesisExpr(output);
-        output = CheckNumberThenConstant(output);
-        output = CheckConstantThenConstant(output);
-        return output;
-    }
-
-    private static string CheckScientificNotation(string input)
-    {
-        /**
-         * NOTE: By the time the expression gets to us, it's already in English format.
-         *
-         * Regex explanation:
-         * (-?(\d+({0}\d*)?)|-?({0}\d+)): Used to capture one of two types:
-         * -?(\d+({0}\d*)?): Captures a decimal number starting with a number (e.g. "-1.23")
-         * -?({0}\d+): Captures a decimal number without leading number (e.g. ".23")
-         * e: Captures 'e' or 'E'
-         * (-?\d+): Captures an integer number (e.g. "-1" or "23")
-         */
-        var p = @"(-?(\d+(\.\d*)?)|-?(\.\d+))e(-?\d+)";
-        return Regex.Replace(input, p, "($1 * 10^($5))", RegexOptions.IgnoreCase);
-    }
-
-    /*
-     * num (exp)
-     * const (exp)
-     */
-    private static string CheckNumberOrConstantThenParenthesisExpr(string input)
-    {
-        var output = input;
-        do
-        {
-            input = output;
-            output = Regex.Replace(input, @"(\d+|pi|e)\s*(\()", m =>
-            {
-                if (m.Index > 0 && char.IsLetter(input[m.Index - 1]))
-                {
-                    return m.Value;
-                }
-
-                return $"{m.Groups[1].Value} * {m.Groups[2].Value}";
-            });
-        }
-        while (output != input);
-
-        return output;
-    }
-
-    /*
-     * num func
-     * const func
-     */
-    private static string CheckNumberOrConstantThenFunc(string input)
-    {
-        var output = input;
-        do
-        {
-            input = output;
-            output = Regex.Replace(input, @"(\d+|pi|e)\s*([a-zA-Z]+[0-9]*\s*\()", m =>
-            {
-                if (input[m.Index] == 'e' && input[m.Index + 1] == 'x' && input[m.Index + 2] == 'p')
-                {
-                    return m.Value;
-                }
-
-                if (m.Index > 0 && char.IsLetter(input[m.Index - 1]))
-                {
-                    return m.Value;
-                }
-
-                return $"{m.Groups[1].Value} * {m.Groups[2].Value}";
-            });
-        }
-        while (output != input);
-
-        return output;
-    }
-
-    /*
-     * (exp) func
-     * func func
-     */
-    private static string CheckParenthesisExprThenFunc(string input)
-    {
-        var p = @"(\))\s*([a-zA-Z]+[0-9]*\s*\()";
-        var r = "$1 * $2";
-        return Regex.Replace(input, p, r);
-    }
-
-    /*
-     * (exp) (exp)
-     * func (exp)
-     */
-    private static string CheckParenthesisExprThenParenthesisExpr(string input)
-    {
-        var p = @"(\))\s*(\()";
-        var r = "$1 * $2";
-        return Regex.Replace(input, p, r);
-    }
-
-    /*
-     * num const
-     */
-    private static string CheckNumberThenConstant(string input)
-    {
-        var output = input;
-        do
-        {
-            input = output;
-            output = Regex.Replace(input, @"(\d+)\s*(pi|e)", m =>
-            {
-                if (m.Index > 0 && char.IsLetter(input[m.Index - 1]))
-                {
-                    return m.Value;
-                }
-
-                return $"{m.Groups[1].Value} * {m.Groups[2].Value}";
-            });
-        }
-        while (output != input);
-
-        return output;
-    }
-
-    /*
-     * const const
-     */
-    private static string CheckConstantThenConstant(string input)
-    {
-        var output = input;
-        do
-        {
-            input = output;
-            output = Regex.Replace(input, @"(pi|e)\s*(pi|e)", m =>
-            {
-                if (m.Index > 0 && char.IsLetter(input[m.Index - 1]))
-                {
-                    return m.Value;
-                }
-
-                return $"{m.Groups[1].Value} * {m.Groups[2].Value}";
-            });
-        }
-        while (output != input);
-
-        return output;
-    }
-
-    // Gets the index of the closing bracket of a function
-    private static int FindClosingBracketIndex(string input, int start)
-    {
-        var bracketCount = 0;    // Set count to zero
-        for (var i = start; i < input.Length; i++)
-        {
-            if (input[i] == '(')
-            {
-                bracketCount++;
-            }
-            else if (input[i] == ')')
-            {
-                bracketCount--;
-                if (bracketCount == 0)
-                {
-                    return i;
-                }
-            }
-        }
-
-        return -1;  // Unmatched brackets
-    }
-
-    private static string ModifyTrigFunction(string input, string function, string modification)
-    {
-        // Get the RegEx pattern to match, depending on whether the function is inverse or normal
-        var pattern = function.StartsWith("arc", StringComparison.Ordinal) ? string.Empty : @"(?<!c)";
-        pattern += $@"{function}\s*\(";
-
-        var index = 0;    // Index for match to ensure that the same match is not found twice
-
-        Regex regex = new Regex(pattern);
-        Match match;
-
-        while ((match = regex.Match(input, index)).Success)
-        {
-            index = match.Index + match.Groups[0].Length + modification.Length;    // Get the next index to look from for further matches
-
-            var endIndex = FindClosingBracketIndex(input, match.Index + match.Groups[0].Length - 1);    // Find the index of the closing bracket of the function
-
-            // If no valid bracket index was found, try the next match
-            if (endIndex == -1)
-            {
-                continue;
-            }
-
-            var argument = input.Substring(match.Index + match.Groups[0].Length, endIndex - (match.Index + match.Groups[0].Length));  // Extract the argument between the brackets
-            var replaced = function.StartsWith("arc", StringComparison.Ordinal) ? $"{modification}({match.Groups[0].Value}{argument}))" : $"{match.Groups[0].Value}{modification}({argument}))";  // The string to substitute in, handles differing formats of inverse functions
-
-            input = input.Remove(match.Index, endIndex - match.Index + 1);    // Remove the match from the input
-            input = input.Insert(match.Index, replaced);    // Substitute with the new string
-        }
-
-        return input;
-    }
-
-    public static string UpdateTrigFunctions(string input, CalculateEngine.TrigMode mode)
-    {
-        var modifiedInput = input;
-        if (mode == CalculateEngine.TrigMode.Degrees)
-        {
-            modifiedInput = ModifyTrigFunction(modifiedInput, "sin", DegToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "cos", DegToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "tan", DegToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arcsin", RadToDeg);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arccos", RadToDeg);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arctan", RadToDeg);
-        }
-        else if (mode == CalculateEngine.TrigMode.Gradians)
-        {
-            modifiedInput = ModifyTrigFunction(modifiedInput, "sin", GradToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "cos", GradToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "tan", GradToRad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arcsin", RadToGrad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arccos", RadToGrad);
-            modifiedInput = ModifyTrigFunction(modifiedInput, "arctan", RadToGrad);
-        }
-
-        return modifiedInput;
-    }
-
-    private static string ModifyMathFunction(string input, string function, string modification)
-    {
-        // Create the pattern to match the function, opening bracket, and any spaces in between
-        var pattern = $@"{function}\s*\(";
-        return Regex.Replace(input, pattern, modification + "(");
-    }
-
-    public static string ExpandTrigConversions(string input, CalculateEngine.TrigMode mode)
-    {
-        var modifiedInput = input;
-
-        // Expand "rad", "deg" and "grad" to their respective conversions for the current trig unit
-        if (mode == CalculateEngine.TrigMode.Radians)
-        {
-            modifiedInput = ModifyMathFunction(modifiedInput, "deg", DegToRad);
-            modifiedInput = ModifyMathFunction(modifiedInput, "grad", GradToRad);
-            modifiedInput = ModifyMathFunction(modifiedInput, "rad", string.Empty);
-        }
-        else if (mode == CalculateEngine.TrigMode.Degrees)
-        {
-            modifiedInput = ModifyMathFunction(modifiedInput, "deg", string.Empty);
-            modifiedInput = ModifyMathFunction(modifiedInput, "grad", GradToDeg);
-            modifiedInput = ModifyMathFunction(modifiedInput, "rad", RadToDeg);
-        }
-        else if (mode == CalculateEngine.TrigMode.Gradians)
-        {
-            modifiedInput = ModifyMathFunction(modifiedInput, "deg", DegToGrad);
-            modifiedInput = ModifyMathFunction(modifiedInput, "grad", string.Empty);
-            modifiedInput = ModifyMathFunction(modifiedInput, "rad", RadToGrad);
-        }
-
-        return modifiedInput;
-    }
-}

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

@@ -1,39 +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;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public struct CalculateResult : IEquatable<CalculateResult>
-{
-    public decimal? Result { get; set; }
-
-    public decimal? RoundedResult { get; set; }
-
-    public bool Equals(CalculateResult other)
-    {
-        return Result == other.Result && RoundedResult == other.RoundedResult;
-    }
-
-    public override bool Equals(object obj)
-    {
-        return obj is CalculateResult other && Equals(other);
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(Result, RoundedResult);
-    }
-
-    public static bool operator ==(CalculateResult left, CalculateResult right)
-    {
-        return left.Equals(right);
-    }
-
-    public static bool operator !=(CalculateResult left, CalculateResult right)
-    {
-        return !(left == right);
-    }
-}

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

@@ -1,18 +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 Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public static class CalculatorIcons
-{
-    public static IconInfo ResultIcon => new("\uE94E");
-
-    public static IconInfo SaveIcon => new("\uE74E");
-
-    public static IconInfo ErrorIcon => new("\uE783");
-
-    public static IconInfo ProviderIcon => IconHelpers.FromRelativePath("Assets\\Calculator.svg");
-}

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

@@ -1,53 +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 ManagedCommon;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-internal static class ErrorHandler
-{
-    /// <summary>
-    /// Method to handles errors while calculating
-    /// </summary>
-    /// <param name="isFallbackSearch">Bool to indicate if it is a fallback query.</param>
-    /// <param name="queryInput">User input as string including the action keyword.</param>
-    /// <param name="errorMessage">Error message if applicable.</param>
-    /// <param name="exception">Exception if applicable.</param>
-    /// <returns>List of results to show. Either an error message or an empty list.</returns>
-    /// <exception cref="ArgumentException">Thrown if <paramref name="errorMessage"/> and <paramref name="exception"/> are both filled with their default values.</exception>
-    internal static ListItem OnError(bool isFallbackSearch, string queryInput, string errorMessage, Exception exception = default)
-    {
-        string userMessage;
-
-        if (errorMessage != default)
-        {
-            Logger.LogError($"Failed to calculate <{queryInput}>: {errorMessage}");
-            userMessage = errorMessage;
-        }
-        else if (exception != default)
-        {
-            Logger.LogError($"Exception when query for <{queryInput}>", exception);
-            userMessage = exception.Message;
-        }
-        else
-        {
-            throw new ArgumentException("The arguments error and exception have default values. One of them has to be filled with valid error data (error message/exception)!");
-        }
-
-        return isFallbackSearch ? null : CreateErrorResult(userMessage);
-    }
-
-    private static ListItem CreateErrorResult(string errorMessage)
-    {
-        return new ListItem(new NoOpCommand())
-        {
-            Title = Properties.Resources.calculator_calculation_failed_title,
-            Subtitle = errorMessage,
-            Icon = CalculatorIcons.ErrorIcon,
-        };
-    }
-}

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

@@ -1,144 +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 System.Text;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-/// <summary>
-/// Tries to convert all numbers in a text from one culture format to another.
-/// </summary>
-public class NumberTranslator
-{
-    private readonly CultureInfo sourceCulture;
-    private readonly CultureInfo targetCulture;
-    private readonly Regex splitRegexForSource;
-    private readonly Regex splitRegexForTarget;
-
-    private NumberTranslator(CultureInfo sourceCulture, CultureInfo targetCulture)
-    {
-        this.sourceCulture = sourceCulture;
-        this.targetCulture = targetCulture;
-
-        splitRegexForSource = GetSplitRegex(this.sourceCulture);
-        splitRegexForTarget = GetSplitRegex(this.targetCulture);
-    }
-
-    /// <summary>
-    /// Create a new <see cref="NumberTranslator"/>.
-    /// </summary>
-    /// <param name="sourceCulture">source culture</param>
-    /// <param name="targetCulture">target culture</param>
-    /// <returns>Number translator for target culture</returns>
-    public static NumberTranslator Create(CultureInfo sourceCulture, CultureInfo targetCulture)
-    {
-        ArgumentNullException.ThrowIfNull(sourceCulture);
-
-        ArgumentNullException.ThrowIfNull(targetCulture);
-
-        return new NumberTranslator(sourceCulture, targetCulture);
-    }
-
-    /// <summary>
-    /// Translate from source to target culture.
-    /// </summary>
-    /// <param name="input">input string to translate</param>
-    /// <returns>translated string</returns>
-    public string Translate(string input)
-    {
-        return Translate(input, sourceCulture, targetCulture, splitRegexForSource);
-    }
-
-    /// <summary>
-    /// Translate from target to source culture.
-    /// </summary>
-    /// <param name="input">input string to translate back to source culture</param>
-    /// <returns>source culture string</returns>
-    public string TranslateBack(string input)
-    {
-        return Translate(input, targetCulture, sourceCulture, splitRegexForTarget);
-    }
-
-    private static string Translate(string input, CultureInfo cultureFrom, CultureInfo cultureTo, Regex splitRegex)
-    {
-        var outputBuilder = new StringBuilder();
-        var hexRegex = new Regex(@"(?:(0x[\da-fA-F]+))");
-
-        var hexTokens = hexRegex.Split(input);
-
-        foreach (var hexToken in hexTokens)
-        {
-            if (hexToken.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
-            {
-                // Mages engine has issues processing large hex number (larger than 7 hex digits + 0x prefix = 9 characters). So we convert it to decimal and pass it to the engine.
-                if (hexToken.Length > 9)
-                {
-                    try
-                    {
-                        var num = Convert.ToInt64(hexToken, 16);
-                        var numStr = num.ToString(cultureFrom);
-                        outputBuilder.Append(numStr);
-                    }
-                    catch (Exception)
-                    {
-                        outputBuilder.Append(hexToken);
-                    }
-                }
-                else
-                {
-                    outputBuilder.Append(hexToken);
-                }
-
-                continue;
-            }
-
-            var tokens = splitRegex.Split(hexToken);
-            foreach (var token in tokens)
-            {
-                var leadingZeroCount = 0;
-
-                // Count leading zero characters.
-                foreach (var c in token)
-                {
-                    if (c != '0')
-                    {
-                        break;
-                    }
-
-                    leadingZeroCount++;
-                }
-
-                // number is all zero characters. no need to add zero characters at the end.
-                if (token.Length == leadingZeroCount)
-                {
-                    leadingZeroCount = 0;
-                }
-
-                decimal number;
-
-                outputBuilder.Append(
-                    decimal.TryParse(token, NumberStyles.Number, cultureFrom, out number)
-                    ? (new string('0', leadingZeroCount) + number.ToString(cultureTo))
-                    : token.Replace(cultureFrom.TextInfo.ListSeparator, cultureTo.TextInfo.ListSeparator));
-            }
-        }
-
-        return outputBuilder.ToString();
-    }
-
-    private static Regex GetSplitRegex(CultureInfo culture)
-    {
-        var splitPattern = $"((?:\\d|{Regex.Escape(culture.NumberFormat.NumberDecimalSeparator)}";
-        if (!string.IsNullOrEmpty(culture.NumberFormat.NumberGroupSeparator))
-        {
-            splitPattern += $"|{Regex.Escape(culture.NumberFormat.NumberGroupSeparator)}";
-        }
-
-        splitPattern += ")+)";
-        return new Regex(splitPattern);
-    }
-}

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

@@ -1,77 +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 System.Text;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Foundation;
-
-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)
-    {
-        ArgumentNullException.ThrowIfNull(query);
-        if (!isFallbackSearch)
-        {
-            ArgumentNullException.ThrowIfNull(handleSave);
-        }
-
-        CultureInfo inputCulture = settings.InputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
-        CultureInfo outputCulture = settings.OutputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
-
-        // Happens if the user has only typed the action key so far
-        if (string.IsNullOrEmpty(query))
-        {
-            return null;
-        }
-
-        NumberTranslator translator = NumberTranslator.Create(inputCulture, new CultureInfo("en-US"));
-        var input = translator.Translate(query.Normalize(NormalizationForm.FormKC));
-
-        if (!CalculateHelper.InputValid(input))
-        {
-            return null;
-        }
-
-        try
-        {
-            // Using CurrentUICulture since this is user facing
-            var result = CalculateEngine.Interpret(settings, input, outputCulture, out var errorMessage);
-
-            // This could happen for some incorrect queries, like pi(2)
-            if (result.Equals(default(CalculateResult)))
-            {
-                // If errorMessage is not default then do error handling
-                return errorMessage == default ? null : ErrorHandler.OnError(isFallbackSearch, query, errorMessage);
-            }
-
-            if (isFallbackSearch)
-            {
-                // Fallback search
-                return ResultHelper.CreateResult(result.RoundedResult, inputCulture, outputCulture, query);
-            }
-
-            return ResultHelper.CreateResult(result.RoundedResult, inputCulture, outputCulture, query, handleSave);
-        }
-        catch (Mages.Core.ParseException)
-        {
-            // Invalid input
-            return ErrorHandler.OnError(isFallbackSearch, query, Properties.Resources.calculator_expression_not_complete);
-        }
-        catch (OverflowException)
-        {
-            // Result to big to convert to decimal
-            return ErrorHandler.OnError(isFallbackSearch, query, Properties.Resources.calculator_not_covert_to_decimal);
-        }
-        catch (Exception e)
-        {
-            // Any other crash occurred
-            // We want to keep the process alive if any the mages library throws any exceptions.
-            return ErrorHandler.OnError(isFallbackSearch, query, default, e);
-        }
-    }
-}

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

@@ -1,103 +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.Collections.Generic;
-using System.Globalization;
-using ManagedCommon;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Foundation;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public static class ResultHelper
-{
-    public static ListItem CreateResult(decimal? roundedResult, CultureInfo inputCulture, CultureInfo outputCulture, string query, TypedEventHandler<object, object> handleSave)
-    {
-        // Return null when the expression is not a valid calculator query.
-        if (roundedResult == null)
-        {
-            return null;
-        }
-
-        var result = roundedResult?.ToString(outputCulture);
-
-        // Create a SaveCommand and subscribe to the SaveRequested event
-        // This can append the result to the history list.
-        var saveCommand = new SaveCommand(result);
-        saveCommand.SaveRequested += handleSave;
-
-        var copyCommandItem = CreateResult(roundedResult, inputCulture, outputCulture, query);
-
-        return new ListItem(saveCommand)
-        {
-            // Using CurrentCulture since this is user facing
-            Icon = CalculatorIcons.ResultIcon,
-            Title = result,
-            Subtitle = query,
-            TextToSuggest = result,
-            MoreCommands = [
-                new CommandContextItem(copyCommandItem.Command)
-                {
-                    Icon = copyCommandItem.Icon,
-                    Title = copyCommandItem.Title,
-                    Subtitle = copyCommandItem.Subtitle,
-                },
-                ..copyCommandItem.MoreCommands,
-            ],
-        };
-    }
-
-    public static ListItem CreateResult(decimal? roundedResult, CultureInfo inputCulture, CultureInfo outputCulture, string query)
-    {
-        // Return null when the expression is not a valid calculator query.
-        if (roundedResult == null)
-        {
-            return null;
-        }
-
-        var decimalResult = roundedResult?.ToString(outputCulture);
-
-        List<CommandContextItem> context = [];
-
-        if (decimal.IsInteger((decimal)roundedResult))
-        {
-            var i = decimal.ToInt64((decimal)roundedResult);
-            try
-            {
-                var hexResult = "0x" + i.ToString("X", outputCulture);
-                context.Add(new CommandContextItem(new CopyTextCommand(hexResult) { Name = Properties.Resources.calculator_copy_hex })
-                {
-                    Title = hexResult,
-                });
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Error parsing hex format", ex);
-            }
-
-            try
-            {
-                var binaryResult = "0b" + i.ToString("B", outputCulture);
-                context.Add(new CommandContextItem(new CopyTextCommand(binaryResult) { Name = Properties.Resources.calculator_copy_binary })
-                {
-                    Title = binaryResult,
-                });
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Error parsing binary format", ex);
-            }
-        }
-
-        return new ListItem(new CopyTextCommand(decimalResult))
-        {
-            // Using CurrentCulture since this is user facing
-            Title = decimalResult,
-            Subtitle = query,
-            TextToSuggest = decimalResult,
-            MoreCommands = context.ToArray(),
-        };
-    }
-}

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

@@ -1,31 +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 Microsoft.CmdPal.Ext.Calc.Properties;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Foundation;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public sealed partial class SaveCommand : InvokableCommand
-{
-    private readonly string _result;
-
-    public event TypedEventHandler<object, object> SaveRequested;
-
-    public SaveCommand(string result)
-    {
-        Name = Resources.calculator_save_command_name;
-        Icon = CalculatorIcons.SaveIcon;
-        _result = result;
-    }
-
-    public override ICommandResult Invoke()
-    {
-        SaveRequested?.Invoke(this, this);
-        ClipboardHelper.SetText(_result);
-        return CommandResult.KeepOpen();
-    }
-}

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

@@ -1,98 +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.Collections.Generic;
-using System.IO;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Calc.Helper;
-
-public class SettingsManager : JsonSettingsManager
-{
-    private static readonly string _namespace = "calculator";
-
-    private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
-
-    private static readonly List<ChoiceSetSetting.Choice> _trigUnitChoices = new()
-    {
-        new ChoiceSetSetting.Choice(Properties.Resources.calculator_settings_trig_unit_radians, "0"),
-        new ChoiceSetSetting.Choice(Properties.Resources.calculator_settings_trig_unit_degrees, "1"),
-        new ChoiceSetSetting.Choice(Properties.Resources.calculator_settings_trig_unit_gradians, "2"),
-    };
-
-    private readonly ChoiceSetSetting _trigUnit = new(
-        Namespaced(nameof(TrigUnit)),
-        Properties.Resources.calculator_settings_trig_unit_mode,
-        Properties.Resources.calculator_settings_trig_unit_mode_description,
-        _trigUnitChoices);
-
-    private readonly ToggleSetting _inputUseEnNumberFormat = new(
-        Namespaced(nameof(InputUseEnglishFormat)),
-        Properties.Resources.calculator_settings_in_en_format,
-        Properties.Resources.calculator_settings_in_en_format_description,
-        false);
-
-    private readonly ToggleSetting _outputUseEnNumberFormat = new(
-        Namespaced(nameof(OutputUseEnglishFormat)),
-        Properties.Resources.calculator_settings_out_en_format,
-        Properties.Resources.calculator_settings_out_en_format_description,
-        false);
-
-    public CalculateEngine.TrigMode TrigUnit
-    {
-        get
-        {
-            if (_trigUnit.Value == null || string.IsNullOrEmpty(_trigUnit.Value))
-            {
-                return CalculateEngine.TrigMode.Radians;
-            }
-
-            var success = int.TryParse(_trigUnit.Value, out var result);
-
-            if (!success)
-            {
-                return CalculateEngine.TrigMode.Radians;
-            }
-
-            switch (result)
-            {
-                case 0:
-                    return CalculateEngine.TrigMode.Radians;
-                case 1:
-                    return CalculateEngine.TrigMode.Degrees;
-                case 2:
-                    return CalculateEngine.TrigMode.Gradians;
-                default:
-                    return CalculateEngine.TrigMode.Radians;
-            }
-        }
-    }
-
-    public bool InputUseEnglishFormat => _inputUseEnNumberFormat.Value;
-
-    public bool OutputUseEnglishFormat => _outputUseEnNumberFormat.Value;
-
-    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();
-
-        Settings.Add(_trigUnit);
-        Settings.Add(_inputUseEnNumberFormat);
-        Settings.Add(_outputUseEnNumberFormat);
-
-        // Load settings from file upon initialization
-        LoadSettings();
-
-        Settings.SettingsChanged += (s, a) => this.SaveSettings();
-    }
-}

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

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Calc</RootNamespace>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
@@ -10,14 +9,9 @@
     <ProjectPriFileName>Microsoft.CmdPal.Ext.Calc.pri</ProjectPriFileName>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Mages" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Pages/CalculatorListPage.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.Collections.Generic;
-using System.Threading;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.CmdPal.Ext.Calc.Properties;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Calc.Pages;
-
-// The calculator page is a dynamic list page
-// * The first command is where we display the results. Title=result, Subtitle=query
-//   - The default command is `SaveCommand`.
-//     - When you save, insert into list at spot 1
-//     - change SearchText to the result
-//   - MoreCommands: a single `CopyCommand` to copy the result to the clipboard
-// * The rest of the items are previously saved results
-//   - Command is a CopyCommand
-//   - Each item also sets the TextToSuggest to the result
-public sealed partial class CalculatorListPage : DynamicListPage
-{
-    private readonly Lock _resultsLock = new();
-    private readonly SettingsManager _settingsManager;
-    private readonly List<ListItem> _items = [];
-    private readonly List<ListItem> history = [];
-    private readonly ListItem _emptyItem;
-
-    // This is the text that saved when the user click the result.
-    // We need to avoid the double calculation. This may cause some wierd behaviors.
-    private string skipQuerySearchText = string.Empty;
-
-    public CalculatorListPage(SettingsManager settings)
-    {
-        _settingsManager = settings;
-        Icon = CalculatorIcons.ProviderIcon;
-        Name = Resources.calculator_title;
-        PlaceholderText = Resources.calculator_placeholder_text;
-        Id = "com.microsoft.cmdpal.calculator";
-
-        _emptyItem = new ListItem(new NoOpCommand())
-        {
-            Title = Resources.calculator_placeholder_text,
-            Icon = CalculatorIcons.ResultIcon,
-        };
-        EmptyContent = new CommandItem(new NoOpCommand())
-        {
-            Icon = CalculatorIcons.ProviderIcon,
-            Title = Resources.calculator_placeholder_text,
-        };
-
-        UpdateSearchText(string.Empty, string.Empty);
-    }
-
-    public override void UpdateSearchText(string oldSearch, string newSearch)
-    {
-        if (oldSearch == newSearch)
-        {
-            return;
-        }
-
-        if (!string.IsNullOrEmpty(skipQuerySearchText) && newSearch == skipQuerySearchText)
-        {
-            // only skip once.
-            skipQuerySearchText = string.Empty;
-            return;
-        }
-
-        skipQuerySearchText = string.Empty;
-
-        _emptyItem.Subtitle = newSearch;
-
-        var result = QueryHelper.Query(newSearch, _settingsManager, false, HandleSave);
-        UpdateResult(result);
-    }
-
-    private void UpdateResult(ListItem result)
-    {
-        lock (_resultsLock)
-        {
-            this._items.Clear();
-
-            if (result != null)
-            {
-                this._items.Add(result);
-            }
-            else
-            {
-                _items.Add(_emptyItem);
-            }
-
-            this._items.AddRange(history);
-        }
-
-        RaiseItemsChanged(this._items.Count);
-    }
-
-    private void HandleSave(object sender, object args)
-    {
-        var lastResult = _items[0].Title;
-        if (!string.IsNullOrEmpty(lastResult))
-        {
-            var li = new ListItem(new CopyTextCommand(lastResult))
-            {
-                Title = _items[0].Title,
-                Subtitle = _items[0].Subtitle,
-                TextToSuggest = lastResult,
-            };
-
-            history.Insert(0, li);
-            _items.Insert(1, li);
-
-            // Why we need to clean the query record? Removed, but if necessary, please move it back.
-            // _items[0].Subtitle = string.Empty;
-
-            // this change will call the UpdateSearchText again.
-            // We need to avoid it.
-            skipQuerySearchText = lastResult;
-            SearchText = lastResult;
-            this.RaiseItemsChanged(this._items.Count);
-        }
-    }
-
-    public override IListItem[] GetItems() => _items.ToArray();
-}

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

@@ -1,52 +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 Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.CmdPal.Ext.Calc.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Calc.Pages;
-
-public sealed partial class FallbackCalculatorItem : FallbackCommandItem
-{
-    private readonly CopyTextCommand _copyCommand = new(string.Empty);
-    private readonly SettingsManager _settings;
-
-    public FallbackCalculatorItem(SettingsManager settings)
-        : base(new NoOpCommand(), Resources.calculator_title)
-    {
-        Command = _copyCommand;
-        _copyCommand.Name = string.Empty;
-        Title = string.Empty;
-        Subtitle = Resources.calculator_placeholder_text;
-        Icon = CalculatorIcons.ProviderIcon;
-        _settings = settings;
-    }
-
-    public override void UpdateQuery(string query)
-    {
-        var result = QueryHelper.Query(query, _settings, true, null);
-
-        if (result == null)
-        {
-            _copyCommand.Text = string.Empty;
-            _copyCommand.Name = string.Empty;
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            MoreCommands = [];
-            return;
-        }
-
-        _copyCommand.Text = result.Title;
-        _copyCommand.Name = string.IsNullOrWhiteSpace(query) ? string.Empty : Resources.calculator_copy_command_name;
-        Title = result.Title;
-
-        // we have to make the subtitle the equation,
-        // so that we will still string match the original query
-        // Otherwise, something like 1+2 will have a title of "3" and not match
-        Subtitle = query;
-
-        MoreCommands = result.MoreCommands;
-    }
-}

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

@@ -60,24 +60,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to calculate the input.
-        /// </summary>
-        public static string calculator_calculation_failed_title {
-            get {
-                return ResourceManager.GetString("calculator_calculation_failed_title", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy binary.
-        /// </summary>
-        public static string calculator_copy_binary {
-            get {
-                return ResourceManager.GetString("calculator_copy_binary", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Copy.
         /// </summary>
@@ -87,15 +69,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Copy hexadecimal.
-        /// </summary>
-        public static string calculator_copy_hex {
-            get {
-                return ResourceManager.GetString("calculator_copy_hex", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Calculator.
         /// </summary>
@@ -105,24 +78,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Expression contains division by zero.
-        /// </summary>
-        public static string calculator_division_by_zero {
-            get {
-                return ResourceManager.GetString("calculator_division_by_zero", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported use of square brackets.
-        /// </summary>
-        public static string calculator_double_array_returned {
-            get {
-                return ResourceManager.GetString("calculator_double_array_returned", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Error: {0}.
         /// </summary>
@@ -132,33 +87,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Expression wrong or incomplete.
-        /// </summary>
-        public static string calculator_expression_not_complete {
-            get {
-                return ResourceManager.GetString("calculator_expression_not_complete", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Calculation result is not a valid number (NaN).
-        /// </summary>
-        public static string calculator_not_a_number {
-            get {
-                return ResourceManager.GetString("calculator_not_a_number", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Result value was either too large or too small for a decimal number.
-        /// </summary>
-        public static string calculator_not_covert_to_decimal {
-            get {
-                return ResourceManager.GetString("calculator_not_covert_to_decimal", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Type an equation....
         /// </summary>
@@ -177,105 +105,6 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Use English (United States) number format for input.
-        /// </summary>
-        public static string calculator_settings_in_en_format {
-            get {
-                return ResourceManager.GetString("calculator_settings_in_en_format", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ignores your system setting and expects numbers in the format &apos;{0}&apos;..
-        /// </summary>
-        public static string calculator_settings_in_en_format_description {
-            get {
-                return ResourceManager.GetString("calculator_settings_in_en_format_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Use English (United States) number format for output.
-        /// </summary>
-        public static string calculator_settings_out_en_format {
-            get {
-                return ResourceManager.GetString("calculator_settings_out_en_format", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ignores your system setting and returns numbers in the format &apos;{0}&apos;..
-        /// </summary>
-        public static string calculator_settings_out_en_format_description {
-            get {
-                return ResourceManager.GetString("calculator_settings_out_en_format_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Replace input if query ends with &apos;=&apos;.
-        /// </summary>
-        public static string calculator_settings_replace_input {
-            get {
-                return ResourceManager.GetString("calculator_settings_replace_input", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When using direct activation, appending &apos;=&apos; to the expression will replace the input with the calculated result (e.g. &apos;=5*3-2=&apos; will change the query to &apos;=13&apos;)..
-        /// </summary>
-        public static string calculator_settings_replace_input_description {
-            get {
-                return ResourceManager.GetString("calculator_settings_replace_input_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Degrees.
-        /// </summary>
-        public static string calculator_settings_trig_unit_degrees {
-            get {
-                return ResourceManager.GetString("calculator_settings_trig_unit_degrees", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Gradians.
-        /// </summary>
-        public static string calculator_settings_trig_unit_gradians {
-            get {
-                return ResourceManager.GetString("calculator_settings_trig_unit_gradians", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Trigonometry Unit.
-        /// </summary>
-        public static string calculator_settings_trig_unit_mode {
-            get {
-                return ResourceManager.GetString("calculator_settings_trig_unit_mode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies the angle unit to use for trigonometry operations.
-        /// </summary>
-        public static string calculator_settings_trig_unit_mode_description {
-            get {
-                return ResourceManager.GetString("calculator_settings_trig_unit_mode_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Radians.
-        /// </summary>
-        public static string calculator_settings_trig_unit_radians {
-            get {
-                return ResourceManager.GetString("calculator_settings_trig_unit_radians", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Calculator.
         /// </summary>

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

@@ -140,63 +140,4 @@
   <data name="calculator_copy_command_name" xml:space="preserve">
     <value>Copy</value>
   </data>
-  <data name="calculator_calculation_failed_title" xml:space="preserve">
-    <value>Failed to calculate the input</value>
-  </data>
-  <data name="calculator_division_by_zero" xml:space="preserve">
-    <value>Expression contains division by zero</value>
-  </data>
-  <data name="calculator_expression_not_complete" xml:space="preserve">
-    <value>Expression wrong or incomplete</value>
-  </data>
-  <data name="calculator_not_a_number" xml:space="preserve">
-    <value>Calculation result is not a valid number (NaN)</value>
-  </data>
-  <data name="calculator_double_array_returned" xml:space="preserve">
-    <value>Unsupported use of square brackets</value>
-  </data>
-  <data name="calculator_settings_trig_unit_gradians" xml:space="preserve">
-    <value>Gradians</value>
-  </data>
-  <data name="calculator_settings_trig_unit_degrees" xml:space="preserve">
-    <value>Degrees</value>
-  </data>
-  <data name="calculator_settings_trig_unit_radians" xml:space="preserve">
-    <value>Radians</value>
-  </data>
-  <data name="calculator_settings_trig_unit_mode" xml:space="preserve">
-    <value>Trigonometry Unit</value>
-  </data>
-  <data name="calculator_settings_trig_unit_mode_description" xml:space="preserve">
-    <value>Specifies the angle unit to use for trigonometry operations</value>
-  </data>
-  <data name="calculator_settings_out_en_format" xml:space="preserve">
-    <value>Use English (United States) number format for output</value>
-  </data>
-  <data name="calculator_settings_out_en_format_description" xml:space="preserve">
-    <value>Ignores your system setting and returns numbers in the format '{0}'.</value>
-    <comment>{0} is a placeholder and will be replaced in code.</comment>
-  </data>
-  <data name="calculator_settings_in_en_format" xml:space="preserve">
-    <value>Use English (United States) number format for input</value>
-  </data>
-  <data name="calculator_settings_in_en_format_description" xml:space="preserve">
-    <value>Ignores your system setting and expects numbers in the format '{0}'.</value>
-    <comment>{0} is a placeholder and will be replaced in code.</comment>
-  </data>
-  <data name="calculator_settings_replace_input" xml:space="preserve">
-    <value>Replace input if query ends with '='</value>
-  </data>
-  <data name="calculator_settings_replace_input_description" xml:space="preserve">
-    <value>When using direct activation, appending '=' to the expression will replace the input with the calculated result (e.g. '=5*3-2=' will change the query to '=13').</value>
-  </data>
-  <data name="calculator_not_covert_to_decimal" xml:space="preserve">
-    <value>Result value was either too large or too small for a decimal number</value>
-  </data>
-  <data name="calculator_copy_hex" xml:space="preserve">
-    <value>Copy hexadecimal</value>
-  </data>
-  <data name="calculator_copy_binary" xml:space="preserve">
-    <value>Copy binary</value>
-  </data>
 </root>

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

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Registry</RootNamespace>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>

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

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
   <PropertyGroup>
 	<Nullable>enable</Nullable>
     <RootNamespace>Microsoft.CmdPal.Ext.Shell</RootNamespace>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/EmptyRecycleBinCommand.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Ext.System;
+namespace Microsoft.CmdPal.Ext.Shell;
 
 public sealed partial class EmptyRecycleBinCommand : InvokableCommand
 {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/EmptyRecycleBinConfirmation.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.Shell;
 using Microsoft.CmdPal.Ext.System.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs

@@ -1,72 +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.Collections.Generic;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.System;
-
-internal sealed partial class FallbackSystemCommandItem : FallbackCommandItem
-{
-    public FallbackSystemCommandItem(SettingsManager settings)
-        : base(new NoOpCommand(), Resources.Microsoft_plugin_ext_fallback_display_title)
-    {
-        Title = string.Empty;
-        Subtitle = string.Empty;
-
-        var isBootedInUefiMode = Win32Helpers.GetSystemFirmwareType() == FirmwareType.Uefi;
-        var hideEmptyRB = settings.HideEmptyRecycleBin;
-        var confirmSystemCommands = settings.ShowDialogToConfirmCommand;
-        var showSuccessOnEmptyRB = settings.ShowSuccessMessageAfterEmptyingRecycleBin;
-
-        systemCommands = Commands.GetSystemCommands(isBootedInUefiMode, hideEmptyRB, confirmSystemCommands, showSuccessOnEmptyRB);
-    }
-
-    private readonly List<IListItem> systemCommands;
-
-    public override void UpdateQuery(string query)
-    {
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            return;
-        }
-
-        IListItem? result = null;
-        var resultScore = 0;
-
-        // find the max score for the query
-        foreach (var command in systemCommands)
-        {
-            var title = command.Title;
-            var subTitle = command.Subtitle;
-            var titleScore = StringMatcher.FuzzySearch(query, title).Score;
-            var subTitleScore = StringMatcher.FuzzySearch(query, subTitle).Score;
-
-            var maxScore = Math.Max(titleScore, subTitleScore);
-            if (maxScore > resultScore)
-            {
-                resultScore = maxScore;
-                result = command;
-            }
-        }
-
-        if (result == null)
-        {
-            Title = string.Empty;
-            Subtitle = string.Empty;
-
-            return;
-        }
-
-        Title = result.Title;
-        Subtitle = result.Subtitle;
-        Icon = result.Icon;
-        Command = result.Command;
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs

@@ -85,7 +85,7 @@ internal static class Commands
         {
             results.AddRange(new[]
             {
-                new ListItem(new OpenInShellCommand(Resources.Microsoft_plugin_command_name_open, "explorer.exe", "shell:RecycleBinFolder"))
+                new ListItem(new OpenInShellCommand(Resources.Microsoft_plugin_command_name_empty, "explorer.exe", "shell:RecycleBinFolder"))
                 {
                     Title = Resources.Microsoft_plugin_sys_RecycleBinOpen,
                     Subtitle = Resources.Microsoft_plugin_sys_RecycleBin_description,
@@ -102,7 +102,7 @@ internal static class Commands
         else
         {
             results.Add(
-                new ListItem(new OpenInShellCommand(Resources.Microsoft_plugin_command_name_open, "explorer.exe", "shell:RecycleBinFolder"))
+                new ListItem(new OpenInShellCommand(Resources.Microsoft_plugin_command_name_empty, "explorer.exe", "shell:RecycleBinFolder"))
                 {
                     Title = Resources.Microsoft_plugin_sys_RecycleBin,
                     Subtitle = Resources.Microsoft_plugin_sys_RecycleBin_description,

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

@@ -186,15 +186,6 @@ namespace Microsoft.CmdPal.Ext.System {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Open System Command.
-        /// </summary>
-        public static string Microsoft_plugin_ext_fallback_display_title {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_ext_fallback_display_title", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Hide disconnected network info.
         /// </summary>

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

@@ -411,7 +411,4 @@
   <data name="Microsoft_plugin_command_name_sleep" xml:space="preserve">
     <value>Sleep</value>
   </data>
-  <data name="Microsoft_plugin_ext_fallback_display_title" xml:space="preserve">
-    <value>Open System Command</value>
-  </data>
 </root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs

@@ -14,7 +14,6 @@ public partial class SystemCommandExtensionProvider : CommandProvider
     private readonly ICommandItem[] _commands;
     private static readonly SettingsManager _settingsManager = new();
     public static readonly SystemCommandPage Page = new(_settingsManager);
-    private readonly FallbackSystemCommandItem _fallbackFileItem = new(_settingsManager);
 
     public SystemCommandExtensionProvider()
     {
@@ -37,6 +36,4 @@ public partial class SystemCommandExtensionProvider : CommandProvider
     {
         return _commands;
     }
-
-    public override IFallbackCommandItem[] FallbackCommands() => [_fallbackFileItem];
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandsCache.cs

@@ -0,0 +1,51 @@
+// 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 System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.System.Helpers;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.System;
+
+public sealed partial class SystemCommandsCache
+{
+    public SystemCommandsCache(SettingsManager manager)
+    {
+        var list = new List<IListItem>();
+        var listLock = new object();
+
+        var a = Task.Run(() =>
+        {
+            var isBootedInUefiMode = Win32Helpers.GetSystemFirmwareType() == FirmwareType.Uefi;
+
+            var separateEmptyRB = manager.HideEmptyRecycleBin;
+            var confirmSystemCommands = manager.ShowDialogToConfirmCommand;
+            var showSuccessOnEmptyRB = manager.ShowSuccessMessageAfterEmptyingRecycleBin;
+
+            // normal system commands are fast and can be returned immediately
+            var systemCommands = Commands.GetSystemCommands(isBootedInUefiMode, separateEmptyRB, confirmSystemCommands, showSuccessOnEmptyRB);
+            lock (listLock)
+            {
+                list.AddRange(systemCommands);
+            }
+        });
+
+        var b = Task.Run(() =>
+        {
+            // Network (ip and mac) results are slow with many network cards and returned delayed.
+            // On global queries the first word/part has to be 'ip', 'mac' or 'address' for network results
+            var networkConnectionResults = Commands.GetNetworkConnectionResults(manager);
+            lock (listLock)
+            {
+                list.AddRange(networkConnectionResults);
+            }
+        });
+
+        Task.WaitAll(a, b);
+        CachedCommands = list.ToArray();
+    }
+
+    public IListItem[] CachedCommands { get; }
+}

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

@@ -1,104 +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.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.TimeDate;
-
-internal sealed partial class FallbackTimeDateItem : FallbackCommandItem
-{
-    private readonly HashSet<string> _validOptions;
-    private SettingsManager _settingsManager;
-
-    public FallbackTimeDateItem(SettingsManager settings)
-         : base(new NoOpCommand(), Resources.Microsoft_plugin_timedate_fallback_display_title)
-    {
-        Title = string.Empty;
-        Subtitle = string.Empty;
-        _settingsManager = settings;
-        _validOptions = new(StringComparer.OrdinalIgnoreCase)
-        {
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagDate", CultureInfo.CurrentCulture),
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagDateNow", CultureInfo.CurrentCulture),
-
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagTime", CultureInfo.CurrentCulture),
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagTimeNow", CultureInfo.CurrentCulture),
-
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagFormat", CultureInfo.CurrentCulture),
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagFormatNow", CultureInfo.CurrentCulture),
-
-            Resources.ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagWeek", CultureInfo.CurrentCulture),
-        };
-    }
-
-    public override void UpdateQuery(string query)
-    {
-        if (!_settingsManager.EnableFallbackItems || string.IsNullOrWhiteSpace(query) || !IsValidQuery(query))
-        {
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            Command = new NoOpCommand();
-            return;
-        }
-
-        var availableResults = AvailableResultsList.GetList(false, _settingsManager);
-        ListItem result = null;
-        var maxScore = 0;
-
-        foreach (var f in availableResults)
-        {
-            var score = f.Score(query, f.Label, f.AlternativeSearchTag);
-            if (score > maxScore)
-            {
-                maxScore = score;
-                result = f.ToListItem();
-            }
-        }
-
-        if (result != null)
-        {
-            Title = result.Title;
-            Subtitle = result.Subtitle;
-            Icon = result.Icon;
-        }
-        else
-        {
-            Title = string.Empty;
-            Subtitle = string.Empty;
-            Command = new NoOpCommand();
-        }
-    }
-
-    private bool IsValidQuery(string query)
-    {
-        if (_validOptions.Contains(query))
-        {
-            return true;
-        }
-
-        foreach (var option in _validOptions)
-        {
-            if (option == null)
-            {
-                continue;
-            }
-
-            var parts = option.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Any(part => string.Equals(part, query, StringComparison.OrdinalIgnoreCase)))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

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

@@ -4,9 +4,11 @@
 using System.Runtime.CompilerServices;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
+[assembly: InternalsVisibleTo("Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests")]
+
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
 
-internal sealed class AvailableResult
+internal class AvailableResult
 {
     /// <summary>
     /// Gets or sets the time/date value
@@ -28,11 +30,6 @@ internal sealed class AvailableResult
     /// </summary>
     internal ResultIconType IconType { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value to show additional error details
-    /// </summary>
-    internal string ErrorDetails { get; set; } = string.Empty;
-
     /// <summary>
     /// Returns the path to the icon
     /// </summary>
@@ -45,7 +42,6 @@ internal sealed class AvailableResult
             ResultIconType.Time => ResultHelper.TimeIcon,
             ResultIconType.Date => ResultHelper.CalendarIcon,
             ResultIconType.DateTime => ResultHelper.TimeDateIcon,
-            ResultIconType.Error => ResultHelper.ErrorIcon,
             _ => null,
         };
     }
@@ -57,7 +53,6 @@ internal sealed class AvailableResult
             Title = this.Value,
             Subtitle = this.Label,
             Icon = this.GetIconInfo(),
-            Details = string.IsNullOrEmpty(this.ErrorDetails) ? null : new Details() { Body = this.ErrorDetails },
         };
     }
 
@@ -86,5 +81,4 @@ public enum ResultIconType
     Time,
     Date,
     DateTime,
-    Error,
 }

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

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
 
@@ -33,7 +32,6 @@ internal static class AvailableResultsList
         var dateTimeNowUtc = dateTimeNow.ToUniversalTime();
         var firstWeekRule = firstWeekOfYear ?? TimeAndDateHelper.GetCalendarWeekRule(settings.FirstWeekOfYear);
         var firstDayOfTheWeek = firstDayOfWeek ?? TimeAndDateHelper.GetFirstDayOfWeek(settings.FirstDayOfWeek);
-        var weekOfYear = calendar.GetWeekOfYear(dateTimeNow, firstWeekRule, firstDayOfTheWeek);
 
         results.AddRange(new[]
         {
@@ -60,103 +58,17 @@ internal static class AvailableResultsList
                 AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagFormat"),
                 IconType = ResultIconType.DateTime,
             },
-            new AvailableResult()
-            {
-                Value = weekOfYear.ToString(CultureInfo.CurrentCulture),
-                Label = Resources.Microsoft_plugin_timedate_WeekOfYear,
-                AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagDate"),
-                IconType = ResultIconType.Date,
-            },
         });
 
-        if (isKeywordSearch)
+        if (isKeywordSearch || !settings.OnlyDateTimeNowGlobal)
         {
             // We use long instead of int for unix time stamp because int is too small after 03:14:07 UTC 2038-01-19
             var unixTimestamp = ((DateTimeOffset)dateTimeNowUtc).ToUnixTimeSeconds();
             var unixTimestampMilliseconds = ((DateTimeOffset)dateTimeNowUtc).ToUnixTimeMilliseconds();
+            var weekOfYear = calendar.GetWeekOfYear(dateTimeNow, firstWeekRule, firstDayOfTheWeek);
             var era = DateTimeFormatInfo.CurrentInfo.GetEraName(calendar.GetEra(dateTimeNow));
             var eraShort = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedEraName(calendar.GetEra(dateTimeNow));
 
-            // Custom formats
-            foreach (var f in settings.CustomFormats)
-            {
-                var formatParts = f.Split("=", 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-                var formatSyntax = formatParts.Length == 2 ? formatParts[1] : string.Empty;
-                var searchTags = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagCustom");
-                var dtObject = dateTimeNow;
-
-                // If Length = 0 then empty string.
-                if (formatParts.Length >= 1)
-                {
-                    try
-                    {
-                        // Verify and check input and update search tags
-                        if (formatParts.Length == 1)
-                        {
-                            throw new FormatException("Format syntax part after equal sign is missing.");
-                        }
-
-                        var containsCustomSyntax = TimeAndDateHelper.StringContainsCustomFormatSyntax(formatSyntax);
-                        if (formatSyntax.StartsWith("UTC:", StringComparison.InvariantCulture))
-                        {
-                            searchTags = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagCustomUtc");
-                            dtObject = dateTimeNowUtc;
-                        }
-
-                        // Get formated date
-                        var value = TimeAndDateHelper.ConvertToCustomFormat(dtObject, unixTimestamp, unixTimestampMilliseconds, weekOfYear, eraShort, Regex.Replace(formatSyntax, "^UTC:", string.Empty), firstWeekRule, firstDayOfTheWeek);
-                        try
-                        {
-                            value = dtObject.ToString(value, CultureInfo.CurrentCulture);
-                        }
-                        catch
-                        {
-                            if (!containsCustomSyntax)
-                            {
-                                throw;
-                            }
-                            else
-                            {
-                                // Do not fail as we have custom format syntax. Instead fix backslashes.
-                                value = Regex.Replace(value, @"(?<!\\)\\", string.Empty).Replace("\\\\", "\\");
-                            }
-                        }
-
-                        // Add result
-                        results.Add(new AvailableResult()
-                        {
-                            Value = value,
-                            Label = formatParts[0],
-                            AlternativeSearchTag = searchTags,
-                            IconType = ResultIconType.DateTime,
-                        });
-                    }
-                    catch (ArgumentOutOfRangeException e)
-                    {
-                        results.Add(new AvailableResult()
-                        {
-                            Value = Resources.Microsoft_plugin_timedate_ErrorConvertCustomFormat,
-                            Label = formatParts[0] + " - " + Resources.Microsoft_plugin_timedate_show_details,
-                            AlternativeSearchTag = searchTags,
-                            IconType = ResultIconType.Error,
-                            ErrorDetails = e.Message,
-                        });
-                    }
-                    catch (Exception e)
-                    {
-                        results.Add(new AvailableResult()
-                        {
-                            Value = Resources.Microsoft_plugin_timedate_InvalidCustomFormat + " " + formatSyntax,
-                            Label = formatParts[0] + " - " + Resources.Microsoft_plugin_timedate_show_details,
-                            AlternativeSearchTag = searchTags,
-                            IconType = ResultIconType.Error,
-                            ErrorDetails = e.Message,
-                        });
-                    }
-                }
-            }
-
-            // Predefined formats
             results.AddRange(new[]
             {
                 new AvailableResult()
@@ -237,13 +149,6 @@ internal static class AvailableResultsList
                     IconType = ResultIconType.Date,
                 },
                 new AvailableResult()
-                {
-                    Value = DateTime.DaysInMonth(dateTimeNow.Year, dateTimeNow.Month).ToString(CultureInfo.CurrentCulture),
-                    Label = Resources.Microsoft_plugin_timedate_DaysInMonth,
-                    AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagDate"),
-                    IconType = ResultIconType.Date,
-                },
-                new AvailableResult()
                 {
                     Value = dateTimeNow.DayOfYear.ToString(CultureInfo.CurrentCulture),
                     Label = Resources.Microsoft_plugin_timedate_DayOfYear,
@@ -258,6 +163,13 @@ internal static class AvailableResultsList
                     IconType = ResultIconType.Date,
                 },
                 new AvailableResult()
+                {
+                    Value = weekOfYear.ToString(CultureInfo.CurrentCulture),
+                    Label = Resources.Microsoft_plugin_timedate_WeekOfYear,
+                    AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagDate"),
+                    IconType = ResultIconType.Date,
+                },
+                new AvailableResult()
                 {
                     Value = DateTimeFormatInfo.CurrentInfo.GetMonthName(dateTimeNow.Month),
                     Label = Resources.Microsoft_plugin_timedate_Month,
@@ -286,13 +198,6 @@ internal static class AvailableResultsList
                     IconType = ResultIconType.Date,
                 },
                 new AvailableResult()
-                {
-                    Value = DateTime.IsLeapYear(dateTimeNow.Year) ? Resources.Microsoft_plugin_timedate_LeapYear : Resources.Microsoft_plugin_timedate_NoLeapYear,
-                    Label = Resources.Microsoft_plugin_timedate_LeapYear,
-                    AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagDate"),
-                    IconType = ResultIconType.Date,
-                },
-                new AvailableResult()
                 {
                     Value = era,
                     Label = Resources.Microsoft_plugin_timedate_Era,
@@ -313,31 +218,13 @@ internal static class AvailableResultsList
                     AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagDate"),
                     IconType = ResultIconType.Date,
                 },
-            });
-
-            try
-            {
-                results.Add(new AvailableResult()
+                new AvailableResult()
                 {
                     Value = dateTimeNow.ToFileTime().ToString(CultureInfo.CurrentCulture),
                     Label = Resources.Microsoft_plugin_timedate_WindowsFileTime,
                     AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagFormat"),
                     IconType = ResultIconType.DateTime,
-                });
-            }
-            catch
-            {
-                results.Add(new AvailableResult()
-                {
-                    Value = Resources.Microsoft_plugin_timedate_ErrorConvertWft,
-                    Label = Resources.Microsoft_plugin_timedate_WindowsFileTime,
-                    AlternativeSearchTag = ResultHelper.SelectStringFromResources(isSystemDateTime, "Microsoft_plugin_timedate_SearchTagFormat"),
-                    IconType = ResultIconType.Error,
-                });
-            }
-
-            results.AddRange(new[]
-            {
+                },
                 new AvailableResult()
                 {
                     Value = dateTimeNowUtc.ToString("u"),

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

@@ -2,8 +2,9 @@
 // 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.CommandPalette.Extensions;
+using System.IO;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
@@ -32,24 +33,21 @@ internal static class ResultHelper
 
     public static IconInfo TimeDateIcon { get; } = new IconInfo("\uEC92");
 
-    public static IconInfo ErrorIcon { get; } = IconHelpers.FromRelativePaths("Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.light.png", "Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.dark.png");
-
     /// <summary>
-    /// Gets a result with an error message that input can't be parsed
+    /// Gets a result with an error message that only numbers can't be parsed
     /// </summary>
     /// <returns>Element of type <see cref="Result"/>.</returns>
-#pragma warning disable CA1863 // Use 'CompositeFormat'
+    internal static ListItem CreateNumberErrorResult() => new ListItem(new NoOpCommand())
+    {
+        Title = Resources.Microsoft_plugin_timedate_ErrorResultTitle,
+        Subtitle = Resources.Microsoft_plugin_timedate_ErrorResultSubTitle,
+        Icon = IconHelpers.FromRelativePaths("Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.light.png", "Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.dark.png"),
+    };
+
     internal static ListItem CreateInvalidInputErrorResult() => new ListItem(new NoOpCommand())
     {
         Title = Resources.Microsoft_plugin_timedate_InvalidInput_ErrorMessageTitle,
-        Icon = ErrorIcon,
-        Details = new Details()
-        {
-            Title = Resources.Microsoft_plugin_timedate_InvalidInput_DetailsHeader,
-
-            // Because of translation we can't use 'CompositeFormat'.
-            Body = string.Format(CultureInfo.CurrentCulture, Resources.Microsoft_plugin_timedate_InvalidInput_SupportedInput, "**", "\n\n", "\n\n* "),
-        },
+        Subtitle = Resources.Microsoft_plugin_timedate_InvalidInput_ErrorMessageSubTitle,
+        Icon = IconHelpers.FromRelativePaths("Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.light.png", "Microsoft.CmdPal.Ext.TimeDate\\Assets\\Warning.dark.png"),
     };
-#pragma warning restore CA1863 // Use 'CompositeFormat'
 }

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

@@ -13,11 +13,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
 
 public class SettingsManager : JsonSettingsManager
 {
-    // Line break character used in WinUI3 TextBox and TextBlock.
-    private const char TEXTBOXNEWLINE = '\r';
-
-    private const string CUSTOMFORMATPLACEHOLDER = "MyFormat=dd-MMM-yyyy\rMySecondFormat=dddd (Da\\y nu\\mber: DOW)\rMyUtcFormat=UTC:hh:mm:ss";
-
     private static readonly string _namespace = "timeDate";
 
     private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
@@ -75,11 +70,11 @@ public class SettingsManager : JsonSettingsManager
         Resources.Microsoft_plugin_timedate_SettingFirstDayOfWeek,
         _firstDayOfWeekChoices);
 
-    private readonly ToggleSetting _enableFallbackItems = new(
-        Namespaced(nameof(EnableFallbackItems)),
-        Resources.Microsoft_plugin_timedate_SettingEnableFallbackItems,
-        Resources.Microsoft_plugin_timedate_SettingEnableFallbackItems_Description,
-        true);
+    private readonly ToggleSetting _onlyDateTimeNowGlobal = new(
+        Namespaced(nameof(OnlyDateTimeNowGlobal)),
+        Resources.Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal,
+        Resources.Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal_Description,
+        true); // TODO -- double check default value
 
     private readonly ToggleSetting _timeWithSeconds = new(
         Namespaced(nameof(TimeWithSecond)),
@@ -93,11 +88,11 @@ public class SettingsManager : JsonSettingsManager
         Resources.Microsoft_plugin_timedate_SettingDateWithWeekday_Description,
         false); // TODO -- double check default value
 
-    private readonly TextSetting _customFormats = new(
-        Namespaced(nameof(CustomFormats)),
-        Resources.Microsoft_plugin_timedate_Setting_CustomFormats,
-        Resources.Microsoft_plugin_timedate_Setting_CustomFormats + TEXTBOXNEWLINE + string.Format(CultureInfo.CurrentCulture, Resources.Microsoft_plugin_timedate_Setting_CustomFormatsDescription.ToString(), "DOW", "DIM", "WOM", "WOY", "EAB", "WFT", "UXT", "UMS", "OAD", "EXC", "EXF", "UTC:"),
-        string.Empty);
+    private readonly ToggleSetting _hideNumberMessageOnGlobalQuery = new(
+        Namespaced(nameof(HideNumberMessageOnGlobalQuery)),
+        Resources.Microsoft_plugin_timedate_SettingHideNumberMessageOnGlobalQuery,
+        Resources.Microsoft_plugin_timedate_SettingHideNumberMessageOnGlobalQuery,
+        true); // TODO -- double check default value
 
     public int FirstWeekOfYear
     {
@@ -139,13 +134,13 @@ public class SettingsManager : JsonSettingsManager
         }
     }
 
-    public bool EnableFallbackItems => _enableFallbackItems.Value;
+    public bool OnlyDateTimeNowGlobal => _onlyDateTimeNowGlobal.Value;
 
     public bool TimeWithSecond => _timeWithSeconds.Value;
 
     public bool DateWithWeekday => _dateWithWeekday.Value;
 
-    public List<string> CustomFormats => _customFormats.Value.Split(TEXTBOXNEWLINE).ToList();
+    public bool HideNumberMessageOnGlobalQuery => _hideNumberMessageOnGlobalQuery.Value;
 
     internal static string SettingsJsonPath()
     {
@@ -160,15 +155,12 @@ public class SettingsManager : JsonSettingsManager
     {
         FilePath = SettingsJsonPath();
 
-        Settings.Add(_enableFallbackItems);
-        Settings.Add(_timeWithSeconds);
-        Settings.Add(_dateWithWeekday);
         Settings.Add(_firstWeekOfYear);
         Settings.Add(_firstDayOfWeek);
-
-        _customFormats.Multiline = true;
-        _customFormats.Placeholder = CUSTOMFORMATPLACEHOLDER;
-        Settings.Add(_customFormats);
+        Settings.Add(_onlyDateTimeNowGlobal);
+        Settings.Add(_timeWithSeconds);
+        Settings.Add(_dateWithWeekday);
+        Settings.Add(_hideNumberMessageOnGlobalQuery);
 
         // Load settings from file upon initialization
         LoadSettings();

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

@@ -4,42 +4,12 @@
 
 using System;
 using System.Globalization;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
 
 internal static class TimeAndDateHelper
 {
-    /* htcfreek:Currently not used.
-     * private static readonly Regex _regexSpecialInputFormats = new Regex(@"^.*(u|ums|ft|oa|exc|exf)\d"); */
-
-    private static readonly Regex _regexCustomDateTimeFormats = new Regex(@"(?<!\\)(DOW|DIM|WOM|WOY|EAB|WFT|UXT|UMS|OAD|EXC|EXF)");
-    private static readonly Regex _regexCustomDateTimeDim = new Regex(@"(?<!\\)DIM");
-    private static readonly Regex _regexCustomDateTimeDow = new Regex(@"(?<!\\)DOW");
-    private static readonly Regex _regexCustomDateTimeWom = new Regex(@"(?<!\\)WOM");
-    private static readonly Regex _regexCustomDateTimeWoy = new Regex(@"(?<!\\)WOY");
-    private static readonly Regex _regexCustomDateTimeEab = new Regex(@"(?<!\\)EAB");
-    private static readonly Regex _regexCustomDateTimeWft = new Regex(@"(?<!\\)WFT");
-    private static readonly Regex _regexCustomDateTimeUxt = new Regex(@"(?<!\\)UXT");
-    private static readonly Regex _regexCustomDateTimeUms = new Regex(@"(?<!\\)UMS");
-    private static readonly Regex _regexCustomDateTimeOad = new Regex(@"(?<!\\)OAD");
-    private static readonly Regex _regexCustomDateTimeExc = new Regex(@"(?<!\\)EXC");
-    private static readonly Regex _regexCustomDateTimeExf = new Regex(@"(?<!\\)EXF");
-
-    private const long UnixTimeSecondsMin = -62135596800;
-    private const long UnixTimeSecondsMax = 253402300799;
-    private const long UnixTimeMillisecondsMin = -62135596800000;
-    private const long UnixTimeMillisecondsMax = 253402300799999;
-    private const long WindowsFileTimeMin = 0;
-    private const long WindowsFileTimeMax = 2650467707991000000;
-    private const double OADateMin = -657434.99999999;
-    private const double OADateMax = 2958465.99999999;
-    private const double Excel1900DateMin = 1;
-    private const double Excel1900DateMax = 2958465.99998843;
-    private const double Excel1904DateMin = 0;
-    private const double Excel1904DateMax = 2957003.99998843;
-
     /// <summary>
     /// Get the format for the time string
     /// </summary>
@@ -83,25 +53,18 @@ internal static class TimeAndDateHelper
     /// Returns the number week in the month (Used code from 'David Morton' from <see href="https://social.msdn.microsoft.com/Forums/vstudio/bf504bba-85cb-492d-a8f7-4ccabdf882cb/get-week-number-for-month"/>)
     /// </summary>
     /// <param name="date">date</param>
-    /// <param name="formatSettingFirstDayOfWeek">Setting for the first day in the week.</param>
     /// <returns>Number of week in the month</returns>
     internal static int GetWeekOfMonth(DateTime date, DayOfWeek formatSettingFirstDayOfWeek)
     {
-        var weekCount = 1;
+        var beginningOfMonth = new DateTime(date.Year, date.Month, 1);
+        var adjustment = 1; // We count from 1 to 7 and not from 0 to 6
 
-        for (var i = 1; i <= date.Day; i++)
+        while (date.Date.AddDays(1).DayOfWeek != formatSettingFirstDayOfWeek)
         {
-            DateTime d = new(date.Year, date.Month, i);
-
-            // Count week number +1 if day is the first day of a week and not day 1 of the month.
-            // (If we count on day one of a month we would start the month with week number 2.)
-            if (i > 1 && d.DayOfWeek == formatSettingFirstDayOfWeek)
-            {
-                weekCount += 1;
-            }
+            date = date.AddDays(1);
         }
 
-        return weekCount;
+        return (int)Math.Truncate((double)date.Subtract(beginningOfMonth).TotalDays / 7f) + adjustment;
     }
 
     /// <summary>
@@ -117,170 +80,40 @@ internal static class TimeAndDateHelper
         return ((date.DayOfWeek + daysInWeek - formatSettingFirstDayOfWeek) % daysInWeek) + adjustment;
     }
 
-    internal static double ConvertToOleAutomationFormat(DateTime date, OADateFormats type)
-    {
-        var v = date.ToOADate();
-
-        switch (type)
-        {
-            case OADateFormats.Excel1904:
-                // Excel with base 1904: Adjust by -1462
-                v -= 1462;
-
-                // Date starts at 1/1/1904 = 0
-                if (Math.Truncate(v) < 0)
-                {
-                    throw new ArgumentOutOfRangeException("Not a valid Excel date.", innerException: null);
-                }
-
-                return v;
-            case OADateFormats.Excel1900:
-                // Excel with base 1900: Adjust by -1 if v < 61
-                v = v < 61 ? v - 1 : v;
-
-                // Date starts at 1/1/1900 = 1
-                if (Math.Truncate(v) < 1)
-                {
-                    throw new ArgumentOutOfRangeException("Not a valid Excel date.", innerException: null);
-                }
-
-                return v;
-            default:
-                // OLE Automation date: Return as is.
-                return v;
-        }
-    }
-
     /// <summary>
     /// Convert input string to a <see cref="DateTime"/> object in local time
     /// </summary>
     /// <param name="input">String with date/time</param>
     /// <param name="timestamp">The new <see cref="DateTime"/> object</param>
-    /// <param name="inputParsingErrorMsg">Error message shown to the user</param>
     /// <returns>True on success, otherwise false</returns>
-    internal static bool ParseStringAsDateTime(in string input, out DateTime timestamp, out string inputParsingErrorMsg)
+    internal static bool ParseStringAsDateTime(in string input, out DateTime timestamp)
     {
-        inputParsingErrorMsg = string.Empty;
-        CompositeFormat errorMessage = CompositeFormat.Parse(Resources.Microsoft_plugin_timedate_InvalidInput_SupportedRange);
-
         if (DateTime.TryParse(input, out timestamp))
         {
             // Known date/time format
             return true;
         }
-        else if (Regex.IsMatch(input, @"^u[\+-]?\d+$"))
+        else if (Regex.IsMatch(input, @"^u[\+-]?\d{1,10}$") && long.TryParse(input.TrimStart('u'), out var secondsU))
         {
             // Unix time stamp
             // We use long instead of int, because int is too small after 03:14:07 UTC 2038-01-19
-            var canParse = long.TryParse(input.TrimStart('u'), out var secondsU);
-
-            // Value has to be in the range from -62135596800 to 253402300799
-            if (!canParse || secondsU < UnixTimeSecondsMin || secondsU > UnixTimeSecondsMax)
-            {
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_Unix, UnixTimeSecondsMin, UnixTimeSecondsMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
             timestamp = DateTimeOffset.FromUnixTimeSeconds(secondsU).LocalDateTime;
             return true;
         }
-        else if (Regex.IsMatch(input, @"^ums[\+-]?\d+$"))
+        else if (Regex.IsMatch(input, @"^ums[\+-]?\d{1,13}$") && long.TryParse(input.TrimStart("ums".ToCharArray()), out var millisecondsUms))
         {
             // Unix time stamp in milliseconds
             // We use long instead of int because int is too small after 03:14:07 UTC 2038-01-19
-            var canParse = long.TryParse(input.TrimStart("ums".ToCharArray()), out var millisecondsUms);
-
-            // Value has to be in the range from -62135596800000 to 253402300799999
-            if (!canParse || millisecondsUms < UnixTimeMillisecondsMin || millisecondsUms > UnixTimeMillisecondsMax)
-            {
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_Unix_Milliseconds, UnixTimeMillisecondsMin, UnixTimeMillisecondsMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
             timestamp = DateTimeOffset.FromUnixTimeMilliseconds(millisecondsUms).LocalDateTime;
             return true;
         }
-        else if (Regex.IsMatch(input, @"^ft\d+$"))
+        else if (Regex.IsMatch(input, @"^ft\d+$") && long.TryParse(input.TrimStart("ft".ToCharArray()), out var secondsFt))
         {
-            var canParse = long.TryParse(input.TrimStart("ft".ToCharArray()), out var secondsFt);
-
             // Windows file time
-            // Value has to be in the range from 0 to 2650467707991000000
-            if (!canParse || secondsFt < WindowsFileTimeMin || secondsFt > WindowsFileTimeMax)
-            {
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_WindowsFileTime, WindowsFileTimeMin, WindowsFileTimeMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
             // DateTime.FromFileTime returns as local time.
             timestamp = DateTime.FromFileTime(secondsFt);
             return true;
         }
-        else if (Regex.IsMatch(input, @"^oa[+-]?\d+[,.0-9]*$"))
-        {
-            var canParse = double.TryParse(input.TrimStart("oa".ToCharArray()), out var oADate);
-
-            // OLE Automation date
-            // Input has to be in the range from -657434.99999999 to 2958465.99999999
-            // DateTime.FromOADate returns as local time.
-            if (!canParse || oADate < OADateMin || oADate > OADateMax)
-            {
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_OADate, OADateMin, OADateMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
-            timestamp = DateTime.FromOADate(oADate);
-            return true;
-        }
-        else if (Regex.IsMatch(input, @"^exc[+-]?\d+[,.0-9]*$"))
-        {
-            var canParse = double.TryParse(input.TrimStart("exc".ToCharArray()), out var excDate);
-
-            // Excel's 1900 date value
-            // Input has to be in the range from 1 (0 = Fake date) to 2958465.99998843 and not 60 whole number
-            // Because of a bug in Excel and the way it behaves before 3/1/1900 we have to adjust all inputs lower than 61 for +1
-            // DateTime.FromOADate returns as local time.
-            if (!canParse || excDate < 0 || excDate > Excel1900DateMax)
-            {
-                // For the if itself we use 0 as min value that we can show a special message if input is 0.
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_Excel1900, Excel1900DateMin, Excel1900DateMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
-            if (Math.Truncate(excDate) == 0 || Math.Truncate(excDate) == 60)
-            {
-                inputParsingErrorMsg = Resources.Microsoft_plugin_timedate_InvalidInput_FakeExcel1900;
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
-            excDate = excDate <= 60 ? excDate + 1 : excDate;
-            timestamp = DateTime.FromOADate(excDate);
-            return true;
-        }
-        else if (Regex.IsMatch(input, @"^exf[+-]?\d+[,.0-9]*$"))
-        {
-            var canParse = double.TryParse(input.TrimStart("exf".ToCharArray()), out var exfDate);
-
-            // Excel's 1904 date value
-            // Input has to be in the range from 0 to 2957003.99998843
-            // Because Excel uses 01/01/1904 as base we need to adjust for +1462
-            // DateTime.FromOADate returns as local time.
-            if (!canParse || exfDate < Excel1904DateMin || exfDate > Excel1904DateMax)
-            {
-                inputParsingErrorMsg = string.Format(CultureInfo.CurrentCulture, errorMessage, Resources.Microsoft_plugin_timedate_Excel1904, Excel1904DateMin, Excel1904DateMax);
-                timestamp = new DateTime(1, 1, 1, 1, 1, 1);
-                return false;
-            }
-
-            timestamp = DateTime.FromOADate(exfDate + 1462);
-            return true;
-        }
         else
         {
             timestamp = new DateTime(1, 1, 1, 1, 1, 1);
@@ -288,87 +121,14 @@ internal static class TimeAndDateHelper
         }
     }
 
-    /* htcfreek:Currently not required
     /// <summary>
-    /// Test if input is special parsing for Unix time, Unix time in milliseconds, file time, ...
+    /// Test if input is special parsing for Unix time, Unix time in milliseconds or File time.
     /// </summary>
     /// <param name="input">String with date/time</param>
     /// <returns>True if yes, otherwise false</returns>
     internal static bool IsSpecialInputParsing(string input)
     {
-        return _regexSpecialInputFormats.IsMatch(input);
-    }*/
-
-    /// <summary>
-    /// Converts a DateTime object based on the format string
-    /// </summary>
-    /// <param name="date">Date/time object.</param>
-    /// <param name="unix">Value for replacing "Unix Time Stamp".</param>
-    /// <param name="unixMilliseconds">Value for replacing "Unix Time Stamp in milliseconds".</param>
-    /// <param name="calWeek">Value for relacing calendar week.</param>
-    /// <param name="eraShortFormat">Era abbreviation.</param>
-    /// <param name="format">Format definition.</param>
-    /// <returns>Formated date/time string.</returns>
-    internal static string ConvertToCustomFormat(DateTime date, long unix, long unixMilliseconds, int calWeek, string eraShortFormat, string format, CalendarWeekRule firstWeekRule, DayOfWeek firstDayOfTheWeek)
-    {
-        var result = format;
-
-        // DOW: Number of day in week
-        result = _regexCustomDateTimeDow.Replace(result, GetNumberOfDayInWeek(date, firstDayOfTheWeek).ToString(CultureInfo.CurrentCulture));
-
-        // DIM: Days in Month
-        result = _regexCustomDateTimeDim.Replace(result, DateTime.DaysInMonth(date.Year, date.Month).ToString(CultureInfo.CurrentCulture));
-
-        // WOM: Week of Month
-        result = _regexCustomDateTimeWom.Replace(result, GetWeekOfMonth(date, firstDayOfTheWeek).ToString(CultureInfo.CurrentCulture));
-
-        // WOY: Week of Year
-        result = _regexCustomDateTimeWoy.Replace(result, calWeek.ToString(CultureInfo.CurrentCulture));
-
-        // EAB: Era abbreviation
-        result = _regexCustomDateTimeEab.Replace(result, eraShortFormat);
-
-        // WFT: Week of Month
-        if (_regexCustomDateTimeWft.IsMatch(result))
-        {
-            // Special handling as very early dates can't convert.
-            result = _regexCustomDateTimeWft.Replace(result, date.ToFileTime().ToString(CultureInfo.CurrentCulture));
-        }
-
-        // UXT: Unix time stamp
-        result = _regexCustomDateTimeUxt.Replace(result, unix.ToString(CultureInfo.CurrentCulture));
-
-        // UMS: Unix time stamp milli seconds
-        result = _regexCustomDateTimeUms.Replace(result, unixMilliseconds.ToString(CultureInfo.CurrentCulture));
-
-        // OAD: OLE Automation date
-        result = _regexCustomDateTimeOad.Replace(result, ConvertToOleAutomationFormat(date, OADateFormats.OLEAutomation).ToString(CultureInfo.CurrentCulture));
-
-        // EXC: Excel date value with base 1900
-        if (_regexCustomDateTimeExc.IsMatch(result))
-        {
-            // Special handling as very early dates can't convert.
-            result = _regexCustomDateTimeExc.Replace(result, ConvertToOleAutomationFormat(date, OADateFormats.Excel1900).ToString(CultureInfo.CurrentCulture));
-        }
-
-        // EXF: Excel date value with base 1904
-        if (_regexCustomDateTimeExf.IsMatch(result))
-        {
-            // Special handling as very early dates can't convert.
-            result = _regexCustomDateTimeExf.Replace(result, ConvertToOleAutomationFormat(date, OADateFormats.Excel1904).ToString(CultureInfo.CurrentCulture));
-        }
-
-        return result;
-    }
-
-    /// <summary>
-    /// Test a string for our custom date and time format syntax
-    /// </summary>
-    /// <param name="str">String to test.</param>
-    /// <returns>True if yes and otherwise false</returns>
-    internal static bool StringContainsCustomFormatSyntax(string str)
-    {
-        return _regexCustomDateTimeFormats.IsMatch(str);
+        return Regex.IsMatch(input, @"^.*(u|ums|ft)\d");
     }
 
     /// <summary>
@@ -427,13 +187,3 @@ internal enum FormatStringType
     Date,
     DateTime,
 }
-
-/// <summary>
-/// Different versions of Date formats based on OLE Automation date
-/// </summary>
-internal enum OADateFormats
-{
-    OLEAutomation,
-    Excel1900,
-    Excel1904,
-}

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

@@ -29,18 +29,15 @@ public sealed partial class TimeDateCalculator
     /// <returns>List of Wox <see cref="Result"/>s.</returns>
     public static List<ListItem> ExecuteSearch(SettingsManager settings, string query)
     {
-        var isEmptySearchInput = string.IsNullOrWhiteSpace(query);
+        var isEmptySearchInput = string.IsNullOrEmpty(query);
         List<AvailableResult> availableFormats = new List<AvailableResult>();
         List<ListItem> results = new List<ListItem>();
 
         // currently, all of the search in V2 is keyword search.
         var isKeywordSearch = true;
 
-        // Last input parsing error
-        var lastInputParsingErrorMsg = string.Empty;
-
         // Switch search type
-        if (isEmptySearchInput || (!isKeywordSearch))
+        if (isEmptySearchInput || (!isKeywordSearch && settings.OnlyDateTimeNowGlobal))
         {
             // Return all results for system time/date on empty keyword search
             // or only time, date and now results for system time on global queries if the corresponding setting is enabled
@@ -50,13 +47,13 @@ public sealed partial class TimeDateCalculator
         {
             // Search for specified format with specified time/date value
             var userInput = query.Split(InputDelimiter);
-            if (TimeAndDateHelper.ParseStringAsDateTime(userInput[1], out DateTime timestamp, out lastInputParsingErrorMsg))
+            if (TimeAndDateHelper.ParseStringAsDateTime(userInput[1], out DateTime timestamp))
             {
                 availableFormats.AddRange(AvailableResultsList.GetList(isKeywordSearch, settings, null, null, timestamp));
                 query = userInput[0];
             }
         }
-        else if (TimeAndDateHelper.ParseStringAsDateTime(query, out DateTime timestamp, out lastInputParsingErrorMsg))
+        else if (TimeAndDateHelper.ParseStringAsDateTime(query, out DateTime timestamp))
         {
             // Return all formats for specified time/date value
             availableFormats.AddRange(AvailableResultsList.GetList(isKeywordSearch, settings, null, null, timestamp));
@@ -91,15 +88,19 @@ public sealed partial class TimeDateCalculator
             }
         }
 
+        // If search term is only a number that can't be parsed return an error message
+        if (!isEmptySearchInput && results.Count == 0 && Regex.IsMatch(query, @"\w+\d+.*$") && !query.Any(char.IsWhiteSpace) && (TimeAndDateHelper.IsSpecialInputParsing(query) || !Regex.IsMatch(query, @"\d+[\.:/]\d+")))
+        {
+            // Without plugin key word show only if message is not hidden by setting
+            if (!settings.HideNumberMessageOnGlobalQuery)
+            {
+                results.Add(ResultHelper.CreateNumberErrorResult());
+            }
+        }
+
         if (results.Count == 0)
         {
-            var er = ResultHelper.CreateInvalidInputErrorResult();
-            if (!string.IsNullOrEmpty(lastInputParsingErrorMsg))
-            {
-                er.Details = new Details() { Body = lastInputParsingErrorMsg };
-            }
-
-            results.Add(er);
+            results.Add(ResultHelper.CreateInvalidInputErrorResult());
         }
 
         return results;

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

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
+  <Import Project="..\..\Microsoft.CmdPal.UI\CmdPal.pre.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.TimeDate</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

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

@@ -30,7 +30,6 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
         PlaceholderText = Resources.Microsoft_plugin_timedate_placeholder_text;
         Id = "com.microsoft.cmdpal.timedate";
         _settingsManager = settingsManager;
-        ShowDetails = true;
     }
 
     public override IListItem[] GetItems()

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

@@ -150,15 +150,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Days in month.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_DaysInMonth {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_DaysInMonth", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Era.
         /// </summary>
@@ -178,47 +169,20 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to convert into custom format.
+        ///   Looks up a localized string similar to Valid prefixes: &apos;u&apos; for Unix Timestamp, &apos;ums&apos; for Unix Timestamp in milliseconds, &apos;ft&apos; for Windows file time.
         /// </summary>
-        public static string Microsoft_plugin_timedate_ErrorConvertCustomFormat {
+        public static string Microsoft_plugin_timedate_ErrorResultSubTitle {
             get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_ErrorConvertCustomFormat", resourceCulture);
+                return ResourceManager.GetString("Microsoft_plugin_timedate_ErrorResultSubTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not a valid Windows file time.
+        ///   Looks up a localized string similar to Error: Invalid number input.
         /// </summary>
-        public static string Microsoft_plugin_timedate_ErrorConvertWft {
+        public static string Microsoft_plugin_timedate_ErrorResultTitle {
             get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_ErrorConvertWft", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Excel&apos;s 1900 date value.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Excel1900 {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Excel1900", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Excel&apos;s 1904 date value.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Excel1904 {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Excel1904", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open Time Data Command.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_fallback_display_title {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_fallback_display_title", resourceCulture);
+                return ResourceManager.GetString("Microsoft_plugin_timedate_ErrorResultTitle", resourceCulture);
             }
         }
         
@@ -241,20 +205,11 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid custom format:.
+        ///   Looks up a localized string similar to Valid prefixes: &apos;u&apos; for Unix Timestamp, &apos;ums&apos; for Unix Timestamp in milliseconds, &apos;ft&apos; for Windows file time.
         /// </summary>
-        public static string Microsoft_plugin_timedate_InvalidCustomFormat {
+        public static string Microsoft_plugin_timedate_InvalidInput_ErrorMessageSubTitle {
             get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidCustomFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Supported input.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_InvalidInput_DetailsHeader {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidInput_DetailsHeader", resourceCulture);
+                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidInput_ErrorMessageSubTitle", resourceCulture);
             }
         }
         
@@ -267,33 +222,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot parse the input as Excel&apos;s 1900 date value because it is a fake date. (In Excel 0 stands for 0/1/1900 and this date doesn&apos;t exist. And 60 stands for 2/29/1900 and this date only exists in Excel for compatibility with Lotus 123.).
-        /// </summary>
-        public static string Microsoft_plugin_timedate_InvalidInput_FakeExcel1900 {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidInput_FakeExcel1900", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A {0}format name{0}, a {0}valid date or time value{0}, or a {0}prefixed number{0}. To search for a format in a specific date/time please use the syntax {0}format::date/time/number{0}.{1}Supported prefixes:{2}&apos;{0}u{0}&apos; for Unix Timestamp{2}&apos;{0}ums{0}&apos; for Unix Timestamp in milliseconds{2}&apos;{0}ft{0}&apos; for Windows file time{2}&apos;{0}oa{0}&apos; for OLE Automation Date{2}&apos;{0}exc{0}&apos; for Excel&apos;s 1900 date value{2}&apos;{0}exf{0}&apos; for Excel&apos;s 1904 date value.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_InvalidInput_SupportedInput {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidInput_SupportedInput", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Your input for {0} is outside the range **from {1} to {2}**..
-        /// </summary>
-        public static string Microsoft_plugin_timedate_InvalidInput_SupportedRange {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_InvalidInput_SupportedRange", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to ISO 8601.
         /// </summary>
@@ -330,15 +258,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Leap year.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_LeapYear {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_LeapYear", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Open.
         /// </summary>
@@ -402,15 +321,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Not a leap year.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_NoLeapYear {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_NoLeapYear", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Now.
         /// </summary>
@@ -429,15 +339,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to OLE Automation Date.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_OADate {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_OADate", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search values or type a custom time stamp....
         /// </summary>
@@ -510,42 +411,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Date and time; Time and Date; Custom format.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SearchTagCustom {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagCustom", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current date and time; Current time and date; Now; Custom format.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SearchTagCustomNow {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagCustomNow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Date and time UTC; Time UTC and Date; Custom UTC format.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SearchTagCustomUtc {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagCustomUtc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current date and time UTC; Current time UTC and date; Now UTC; Custom UTC format.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SearchTagCustomUtcNow {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagCustomUtcNow", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Date.
         /// </summary>
@@ -618,15 +483,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Current Week; Calendar week; Week of the year; Week.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SearchTagWeek {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SearchTagWeek", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Second.
         /// </summary>
@@ -636,24 +492,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Custom formats.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Setting_CustomFormats {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Setting_CustomFormats", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Use date and time string format syntax and {0} (Day of Week), {1} (Days in Month), {2} (Week of Month), {3} (Week of the year), {4} (Era abbreviation), {5} (Windows File Time), {6} (Unix Time), {7} (Unix Time in milliseconds), {8} (OLE Automation date), {9} (Excel&apos;s 1900 based date value), {10} (Excel&apos;s 1904 based date value). If the format starts with {11}, then Universal Time (UTC) is used. (Use a backslash to escape format sequences and the backslash character as text.).
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Setting_CustomFormatsDescription {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Setting_CustomFormatsDescription", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Use system setting.
         /// </summary>
@@ -681,24 +519,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Enable fallback items for TimeDate (week, year, now, time, date).
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SettingEnableFallbackItems {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SettingEnableFallbackItems", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show time and date results when typing keywords like &quot;week&quot;, &quot;year&quot;, &quot;now&quot;, &quot;time&quot;, or &quot;date&quot;.
-        /// </summary>
-        public static string Microsoft_plugin_timedate_SettingEnableFallbackItems_Description {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_SettingEnableFallbackItems_Description", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to First day of the week.
         /// </summary>
@@ -816,6 +636,33 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Hide &apos;Invalid number input&apos; error message on global queries.
+        /// </summary>
+        public static string Microsoft_plugin_timedate_SettingHideNumberMessageOnGlobalQuery {
+            get {
+                return ResourceManager.GetString("Microsoft_plugin_timedate_SettingHideNumberMessageOnGlobalQuery", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show only &apos;Time&apos;, &apos;Date&apos; and &apos;Now&apos; result for system time on global queries.
+        /// </summary>
+        public static string Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal {
+            get {
+                return ResourceManager.GetString("Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Regardless of this setting, for global queries the first word of the query has to be a complete match..
+        /// </summary>
+        public static string Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal_Description {
+            get {
+                return ResourceManager.GetString("Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal_Description", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show time with seconds.
         /// </summary>
@@ -834,15 +681,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Select for more details..
-        /// </summary>
-        public static string Microsoft_plugin_timedate_show_details {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_show_details", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Select or press Ctrl+C to copy.
         /// </summary>

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

@@ -155,8 +155,11 @@
   <data name="Microsoft_plugin_timedate_EraAbbreviation" xml:space="preserve">
     <value>Era abbreviation</value>
   </data>
-  <data name="Microsoft_plugin_timedate_InvalidInput_DetailsHeader" xml:space="preserve">
-    <value>Supported input</value>
+  <data name="Microsoft_plugin_timedate_ErrorResultSubTitle" xml:space="preserve">
+    <value>Valid prefixes: 'u' for Unix Timestamp, 'ums' for Unix Timestamp in milliseconds, 'ft' for Windows file time</value>
+  </data>
+  <data name="Microsoft_plugin_timedate_ErrorResultTitle" xml:space="preserve">
+    <value>Error: Invalid number input</value>
   </data>
   <data name="Microsoft_plugin_timedate_Hour" xml:space="preserve">
     <value>Hour</value>
@@ -265,6 +268,15 @@
   <data name="Microsoft_plugin_timedate_SettingDateWithWeekday_Description" xml:space="preserve">
     <value>This setting applies to the 'Date' and 'Now' result.</value>
   </data>
+  <data name="Microsoft_plugin_timedate_SettingHideNumberMessageOnGlobalQuery" xml:space="preserve">
+    <value>Hide 'Invalid number input' error message on global queries</value>
+  </data>
+  <data name="Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal" xml:space="preserve">
+    <value>Show only 'Time', 'Date' and 'Now' result for system time on global queries</value>
+  </data>
+  <data name="Microsoft_plugin_timedate_SettingOnlyDateTimeNowGlobal_Description" xml:space="preserve">
+    <value>Regardless of this setting, for global queries the first word of the query has to be a complete match.</value>
+  </data>
   <data name="Microsoft_plugin_timedate_SettingTimeWithSeconds" xml:space="preserve">
     <value>Show time with seconds</value>
   </data>
@@ -360,80 +372,7 @@
   <data name="Microsoft_plugin_timedate_main_page_title" xml:space="preserve">
     <value>Time and Date</value>
   </data>
-  <data name="Microsoft_plugin_timedate_InvalidInput_SupportedInput" xml:space="preserve">
-    <value>A {0}format name{0}, a {0}valid date or time value{0}, or a {0}prefixed number{0}. To search for a format in a specific date/time please use the syntax {0}format::date/time/number{0}.{1}Supported prefixes:{2}'{0}u{0}' for Unix Timestamp{2}'{0}ums{0}' for Unix Timestamp in milliseconds{2}'{0}ft{0}' for Windows file time{2}'{0}oa{0}' for OLE Automation Date{2}'{0}exc{0}' for Excel's 1900 date value{2}'{0}exf{0}' for Excel's 1904 date value</value>
-    <comment>The placed holders are replaced with formatting syntax in code.</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_SearchTagCustom" xml:space="preserve">
-    <value>Date and time; Time and Date; Custom format</value>
-    <comment>Don't change order</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_SearchTagCustomUtc" xml:space="preserve">
-    <value>Date and time UTC; Time UTC and Date; Custom UTC format</value>
-    <comment>Don't change order</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_SearchTagCustomNow" xml:space="preserve">
-    <value>Current date and time; Current time and date; Now; Custom format</value>
-    <comment>Don't change order</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_SearchTagCustomUtcNow" xml:space="preserve">
-    <value>Current date and time UTC; Current time UTC and date; Now UTC; Custom UTC format</value>
-    <comment>Don't change order</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_InvalidCustomFormat" xml:space="preserve">
-    <value>Invalid custom format:</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_Setting_CustomFormats" xml:space="preserve">
-    <value>Custom formats</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_Setting_CustomFormatsDescription" xml:space="preserve">
-    <value>Use date and time string format syntax and {0} (Day of Week), {1} (Days in Month), {2} (Week of Month), {3} (Week of the year), {4} (Era abbreviation), {5} (Windows File Time), {6} (Unix Time), {7} (Unix Time in milliseconds), {8} (OLE Automation date), {9} (Excel's 1900 based date value), {10} (Excel's 1904 based date value). If the format starts with {11}, then Universal Time (UTC) is used. (Use a backslash to escape format sequences and the backslash character as text.)</value>
-    <comment>The {n} parts are place holders and get replaced in the code.</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_show_details" xml:space="preserve">
-    <value>Select for more details.</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_ErrorConvertCustomFormat" xml:space="preserve">
-    <value>Failed to convert into custom format</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_ErrorConvertWft" xml:space="preserve">
-    <value>Not a valid Windows file time</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_InvalidInput_SupportedRange" xml:space="preserve">
-    <value>Your input for {0} is outside the range **from {1} to {2}**.</value>
-    <comment>The placeholder will be replace in code.</comment>
-  </data>
-  <data name="Microsoft_plugin_timedate_InvalidInput_FakeExcel1900" xml:space="preserve">
-    <value>Cannot parse the input as Excel's 1900 date value because it is a fake date. (In Excel 0 stands for 0/1/1900 and this date doesn't exist. And 60 stands for 2/29/1900 and this date only exists in Excel for compatibility with Lotus 123.)</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_OADate" xml:space="preserve">
-    <value>OLE Automation Date</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_Excel1900" xml:space="preserve">
-    <value>Excel's 1900 date value</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_Excel1904" xml:space="preserve">
-    <value>Excel's 1904 date value</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_LeapYear" xml:space="preserve">
-    <value>Leap year</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_NoLeapYear" xml:space="preserve">
-    <value>Not a leap year</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_DaysInMonth" xml:space="preserve">
-    <value>Days in month</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_fallback_display_title" xml:space="preserve">
-    <value>Open Time Data Command</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_SearchTagWeek" xml:space="preserve">
-    <value>Current Week; Calendar week; Week of the year; Week</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_SettingEnableFallbackItems" xml:space="preserve">
-    <value>Enable fallback items for TimeDate (week, year, now, time, date)</value>
-  </data>
-  <data name="Microsoft_plugin_timedate_SettingEnableFallbackItems_Description" xml:space="preserve">
-    <value>Show time and date results when typing keywords like "week", "year", "now", "time", or "date"</value>
+  <data name="Microsoft_plugin_timedate_InvalidInput_ErrorMessageSubTitle" xml:space="preserve">
+    <value>Valid prefixes: 'u' for Unix Timestamp, 'ums' for Unix Timestamp in milliseconds, 'ft' for Windows file time</value>
   </data>
 </root>

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

@@ -18,7 +18,6 @@ public partial class TimeDateCommandsProvider : CommandProvider
     private static readonly SettingsManager _settingsManager = new();
     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);
 
     public TimeDateCommandsProvider()
     {
@@ -46,6 +45,4 @@ public partial class TimeDateCommandsProvider : CommandProvider
     }
 
     public override ICommandItem[] TopLevelCommands() => [_command];
-
-    public override IFallbackCommandItem[] FallbackCommands() => [_fallbackTimeDateItem];
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs

@@ -22,12 +22,10 @@ public partial class InstallPackageCommand : InvokableCommand
     private IAsyncOperationWithProgress<UninstallResult, UninstallProgress>? _unInstallAction;
     private Task? _installTask;
 
-    public PackageInstallCommandState InstallCommandState { get; private set; }
+    public bool IsInstalled { get; private set; }
 
     public static IconInfo CompletedIcon { get; } = new("\uE930"); // Completed
 
-    public static IconInfo UpdateIcon { get; } = new("\uE74A"); // Up
-
     public static IconInfo DownloadIcon { get; } = new("\uE896"); // Download
 
     public static IconInfo DeleteIcon { get; } = new("\uE74D"); // Delete
@@ -46,41 +44,23 @@ public partial class InstallPackageCommand : InvokableCommand
 
     internal bool SkipDependencies { get; set; }
 
-    public InstallPackageCommand(CatalogPackage package, PackageInstallCommandState isInstalled)
+    public InstallPackageCommand(CatalogPackage package, bool isInstalled)
     {
         _package = package;
-        InstallCommandState = isInstalled;
+        IsInstalled = isInstalled;
         UpdateAppearance();
     }
 
     internal void FakeChangeStatus()
     {
-        InstallCommandState = InstallCommandState switch
-        {
-            PackageInstallCommandState.Install => PackageInstallCommandState.Uninstall,
-            PackageInstallCommandState.Update => PackageInstallCommandState.Uninstall,
-            PackageInstallCommandState.Uninstall => PackageInstallCommandState.Install,
-            _ => throw new NotImplementedException(),
-        };
+        IsInstalled = !IsInstalled;
         UpdateAppearance();
     }
 
     private void UpdateAppearance()
     {
-        Icon = InstallCommandState switch
-        {
-            PackageInstallCommandState.Install => DownloadIcon,
-            PackageInstallCommandState.Update => UpdateIcon,
-            PackageInstallCommandState.Uninstall => CompletedIcon,
-            _ => throw new NotImplementedException(),
-        };
-        Name = InstallCommandState switch
-        {
-            PackageInstallCommandState.Install => Properties.Resources.winget_install_name,
-            PackageInstallCommandState.Update => Properties.Resources.winget_update_name,
-            PackageInstallCommandState.Uninstall => Properties.Resources.winget_uninstall_name,
-            _ => throw new NotImplementedException(),
-        };
+        Icon = IsInstalled ? CompletedIcon : DownloadIcon;
+        Name = IsInstalled ? Properties.Resources.winget_uninstall_name : Properties.Resources.winget_install_name;
     }
 
     public override ICommandResult Invoke()
@@ -92,7 +72,7 @@ public partial class InstallPackageCommand : InvokableCommand
             return CommandResult.KeepOpen();
         }
 
-        if (InstallCommandState == PackageInstallCommandState.Uninstall)
+        if (IsInstalled)
         {
             // Uninstall
             _installBanner.State = MessageState.Info;
@@ -108,8 +88,7 @@ public partial class InstallPackageCommand : InvokableCommand
 
             _installTask = Task.Run(() => TryDoInstallOperation(_unInstallAction));
         }
-        else if (InstallCommandState is PackageInstallCommandState.Install or
-                 PackageInstallCommandState.Update)
+        else
         {
             // Install
             _installBanner.State = MessageState.Info;
@@ -138,8 +117,7 @@ public partial class InstallPackageCommand : InvokableCommand
         try
         {
             await action.AsTask();
-
-            _installBanner.Message = InstallCommandState == PackageInstallCommandState.Uninstall ?
+            _installBanner.Message = IsInstalled ?
                 string.Format(CultureInfo.CurrentCulture, UninstallPackageFinished, _package.Name) :
                 string.Format(CultureInfo.CurrentCulture, InstallPackageFinished, _package.Name);
 
@@ -147,10 +125,9 @@ public partial class InstallPackageCommand : InvokableCommand
             _installBanner.State = MessageState.Success;
             _installTask = null;
 
-            _ = Task.Run(async () =>
+            _ = Task.Run(() =>
             {
-                await Task.Delay(2500).ConfigureAwait(false);
-
+                Thread.Sleep(2500);
                 if (_installTask == null)
                 {
                     WinGetExtensionHost.Instance.HideStatus(_installBanner);
@@ -251,10 +228,3 @@ public partial class InstallPackageCommand : InvokableCommand
         }
     }
 }
-
-public enum PackageInstallCommandState
-{
-    Uninstall = 0,
-    Update = 1,
-    Install = 2,
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ManagedCommon;
 using Microsoft.CommandPalette.Extensions;
@@ -32,7 +31,7 @@ public partial class InstallPackageListItem : ListItem
     {
         _package = package;
 
-        var version = _package.DefaultInstallVersion ?? _package.InstalledVersion;
+        var version = _package.DefaultInstallVersion;
         var versionTagText = "Unknown";
         if (version != null)
         {
@@ -50,16 +49,7 @@ public partial class InstallPackageListItem : ListItem
 
     private Details? BuildDetails(PackageVersionInfo? version)
     {
-        CatalogPackageMetadata? metadata = null;
-        try
-        {
-            metadata = version?.GetCatalogPackageMetadata();
-        }
-        catch (COMException ex)
-        {
-            Logger.LogWarning($"{ex.ErrorCode}");
-        }
-
+        var metadata = version?.GetCatalogPackageMetadata();
         if (metadata != null)
         {
             if (metadata.Tags.Where(t => t.Equals(WinGetExtensionPage.ExtensionsTag, StringComparison.OrdinalIgnoreCase)).Any())
@@ -159,17 +149,12 @@ public partial class InstallPackageListItem : ListItem
         var status = await _package.CheckInstalledStatusAsync();
         var isInstalled = _package.InstalledVersion != null;
 
-        var installedState = isInstalled ?
-            (_package.IsUpdateAvailable ?
-                PackageInstallCommandState.Update : PackageInstallCommandState.Uninstall) :
-            PackageInstallCommandState.Install;
-
         // might be an uninstall command
-        InstallPackageCommand installCommand = new(_package, installedState);
+        InstallPackageCommand installCommand = new(_package, isInstalled);
 
         if (isInstalled)
         {
-            this.Icon = installCommand.Icon;
+            this.Icon = InstallPackageCommand.CompletedIcon;
             this.Command = new NoOpCommand();
             List<IContextItem> contextMenu = [];
             CommandContextItem uninstallContextItem = new(installCommand)
@@ -195,7 +180,7 @@ public partial class InstallPackageListItem : ListItem
         }
 
         // didn't find the app
-        _installCommand = new InstallPackageCommand(_package, installedState);
+        _installCommand = new InstallPackageCommand(_package, isInstalled);
         this.Command = _installCommand;
 
         Icon = _installCommand.Icon;

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

@@ -330,15 +330,6 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Update.
-        /// </summary>
-        public static string winget_update_name {
-            get {
-                return ResourceManager.GetString("winget_update_name", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to View online.
         /// </summary>

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

@@ -154,10 +154,6 @@
   <value>Install</value>
   <comment></comment>
 </data>
-<data name="winget_update_name" xml:space="preserve">
-  <value>Update</value>
-  <comment></comment>
-</data>
 <data name="winget_uninstalling_package" xml:space="preserve">
   <value>Uninstalling {0}...</value>
   <comment>{0} will be replaced by the name of an app package</comment>