Adjust wait time between clear and send input

* Retry in startExe

* Update baseline image for x64-win11

* Update baseline image for x64-win11

* update job-test-project.yml

---------

Co-authored-by: Xiaofeng Wang (from Dev Box) <xiaofengwang@microsoft.com>

.config/configuration.vsEnterprise.winget

@@ -6,12 +6,16 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Enterprise (Any edition will work)
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Enterprise
         source: winget
@@ -21,6 +25,8 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
+        # Requires elevation for the get and set operations
+        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Enterprise
         channelId: VisualStudio.17.Release

.config/configuration.vsProfessional.winget

@@ -6,12 +6,16 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Professional (Any edition will work)
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Professional
         source: winget
@@ -21,6 +25,8 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
+        # Requires elevation for the get and set operations
+        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Professional
         channelId: VisualStudio.17.Release

.config/configuration.winget

@@ -6,12 +6,16 @@ properties:
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 Community (Any edition will work)
+        # Requires elevation for the set operation
+        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.Community
         source: winget
@@ -21,6 +25,8 @@ properties:
       directives:
         description: Install required VS workloads
         allowPrerelease: true
+        # Requires elevation for the get and set operations
+        securityContext: elevated
       settings:
         productId: Microsoft.VisualStudio.Product.Community
         channelId: VisualStudio.17.Release

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
 name: "🕷️ Bug report"
 description: Report errors or unexpected behavior
-type: Bug
 labels:
 - Issue-Bug
 - Needs-Triage
@@ -8,7 +7,8 @@ body:
 - type: markdown
   attributes:
     value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
-- type: input
+- id: version
+  type: input
   attributes:
     label: Microsoft PowerToys version
     placeholder: X.XX.X
@@ -16,7 +16,8 @@ body:
   validations:
     required: true
 
-- type: dropdown
+- id: installed
+  type: dropdown
   attributes:
     label: Installation method
     description: How / Where was PowerToys installed from?
@@ -33,14 +34,6 @@ body:
   validations:
     required: true
 
-- type: dropdown
-  attributes:
-    label: Running as admin
-    description: Are you running PowerToys as Admin?
-    options:
-      - "Yes"
-      - "No"
-
 - type: dropdown
   attributes:
     label: Area(s) with issue?
@@ -67,7 +60,7 @@ body:
       - Keyboard Manager
       - Mouse Utilities
       - Mouse Without Borders
-      - New+ 
+      - New+
       - Peek
       - PowerRename
       - PowerToys Run
@@ -106,6 +99,19 @@ body:
   validations:
     required: false
 
+- id: additionalInfo
+  type: textarea
+  attributes:
+    label: Additional Information
+    placeholder: |
+      OS version
+      .Net version
+      System Language
+      User or System Installation
+      Running as admin
+  validations:
+    required: false
+    
 - type: textarea
   attributes:
     label: Other Software
@@ -116,3 +122,4 @@ body:
       My Cool Application v0.3 (include a code snippet if it would help!)
   validations:
     required: false
+  

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

@@ -271,6 +271,7 @@ mengyuanchen
 
 # DllName
 testhost
+Testably
 
 #Tools
-OIP
+OIP

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

@@ -188,6 +188,8 @@ zhaoqpcn
 Zoltan
 Zykova
 Sameerjs
+ruslanlap
+vednig
 
 # OTHERS
 

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

@@ -8,6 +8,7 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
+acfs
 AClient
 AColumn
 acrt
@@ -56,12 +57,10 @@ APIIs
 Apm
 APPBARDATA
 APPEXECLINK
-APPICONREFERENCE
 APPLICATIONFRAMEHOST
 appmanifest
 APPMODEL
 APPNAME
-APPPUBLISHER
 appref
 appsettings
 appwindow
@@ -173,9 +172,9 @@ CCHFORMNAME
 CCom
 CContext
 CDeclaration
-cdn
 CElems
 CENTERALIGN
+cer
 certlm
 certmgr
 cfp
@@ -199,6 +198,7 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
+clp
 CLSCTX
 clsids
 Clusion
@@ -254,8 +254,6 @@ createdump
 CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
-CREATETHREAD
-CREATEWINDOW
 CREATEWINDOWFAILED
 CRECT
 CRH
@@ -277,6 +275,7 @@ CURSORINFO
 cursorpos
 customaction
 CUSTOMACTIONTEST
+CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
@@ -308,11 +307,7 @@ DCOM
 DComposition
 DCR
 ddd
-DDEAPPLICATION
-DDECOMMAND
 DDEIf
-DDEIFEXEC
-DDETOPIC
 DDevice
 DDxgi
 Deact
@@ -320,22 +315,21 @@ debugbreak
 declatory
 decryptor
 Dedup
+Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
 DEFAULTICON
 defaultlib
 DEFAULTONLY
-DEFAULTTOFOLDER
 DEFAULTTONEAREST
 DEFAULTTONULL
 DEFAULTTOPRIMARY
-DEFAULTTOSTAR
 DEFERERASE
 DEFPUSHBUTTON
+DEFT
 deinitialization
 DELA
-DELEGATEEXECUTE
 DELETEDKEYIMAGE
 DELETESCANS
 deletethis
@@ -354,7 +348,9 @@ devmgmt
 DEVMODE
 DEVMODEW
 devpal
+DFX
 DIALOGEX
+digicert
 dimm
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -389,7 +385,6 @@ dreamsofameaningfullife
 drivedetectionwarning
 Droid
 DROPFILES
-DROPTARGET
 DSTINVERT
 DSurface
 DTexture
@@ -510,12 +505,10 @@ Fira
 FIXEDFILEINFO
 FIXEDSYS
 flac
-flaticon
 flyouts
 FMask
 fmtid
 FOF
-WANTNUKEWARNING
 FOFX
 FOLDERID
 folderpath
@@ -525,17 +518,18 @@ FORCEMINIMIZE
 FORMATDLGORD
 formatetc
 FORPARSING
-fpvm
 Fqc
 FRAMECHANGED
 frm
 Froml
 FROMTOUCH
+fsanitize
 fsmgmt
 FZE
 gacutil
 Gaeilge
 Gaidhlig
+gameid
 GC'ed
 GCLP
 gdi
@@ -559,7 +553,6 @@ GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
 GHND
-gifv
 GMEM
 GNumber
 gpedit
@@ -643,6 +636,7 @@ HOTKEYF
 hotkeys
 hotlight
 hotspot
+Hostx
 HPAINTBUFFER
 HRAWINPUT
 HREDRAW
@@ -653,7 +647,6 @@ HROW
 hsb
 HSCROLL
 hsi
-HSSH
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -691,12 +684,12 @@ iextn
 IFACEMETHOD
 IFACEMETHODIMP
 IFile
-IGNOREBASECLASS
 IGNOREUNKNOWN
 IGo
 iid
 Iindex
 Ijwhost
+ILD
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
@@ -727,6 +720,7 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
+installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -740,8 +734,6 @@ Inste
 Interlop
 INTRESOURCE
 INVALIDARG
-INVALIDCALL
-INVALIDINDEX
 invalidoperatioexception
 ipcmanager
 IPREVIEW
@@ -803,7 +795,6 @@ LEVELID
 LExit
 lhwnd
 LIBID
-libraryincludes
 LIMITSIZE
 LIMITTEXT
 lindex
@@ -905,7 +896,6 @@ MBM
 MBR
 MDICHILD
 MDL
-mdpvm
 mdtext
 mdtxt
 mdwn
@@ -961,6 +951,7 @@ mpmc
 MRM
 MRT
 mru
+MSAL
 msc
 mscorlib
 msctls
@@ -1024,6 +1015,7 @@ netsh
 newcolor
 NEWDIALOGSTYLE
 NEWFILE
+NEWFILEHEADER
 newitem
 newpath
 newplus
@@ -1053,11 +1045,11 @@ NOCRLF
 nodeca
 NODRAWCAPTION
 NODRAWICON
-NOFIXUPS
 NOINHERITLAYOUT
 NOINTERFACE
 NOINVERT
 NOLINKINFO
+nologo
 NOMCX
 NOMINMAX
 NOMIRRORBITMAP
@@ -1069,13 +1061,11 @@ NONELEVATED
 NONINFRINGEMENT
 nonspace
 nonstd
-NOOPEN
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
 NOREDIRECTIONBITMAP
 NOREDRAW
-NOREMAPCLSID
 NOREMOVE
 norename
 NOREPEAT
@@ -1094,11 +1084,10 @@ NOTIFYICONDATAW
 NOTIMPL
 NOTOPMOST
 NOTRACK
-NOTRUNCATE
 NOTSRCCOPY
 NOTSRCERASE
 NOTXORPEN
-NOUSERSETTINGS
+notwindows
 NOZORDER
 NPH
 npmjs
@@ -1224,6 +1213,7 @@ Podcasts
 POINTERID
 POINTERUPDATE
 Pokedex
+Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
@@ -1292,6 +1282,7 @@ pstm
 PStr
 pstream
 pstrm
+pswd
 PSYSTEM
 psz
 ptb
@@ -1318,11 +1309,11 @@ Quarternary
 QUERYENDSESSION
 QUERYOPEN
 QUEUESYNC
-QUICKTIP
 QUNS
 QXZ
 RAII
 RAlt
+Rappl
 randi
 Rasterization
 Rasterize
@@ -1347,7 +1338,6 @@ REFCLSID
 REFIID
 REGCLS
 regfile
-REGISTERCLASSEX
 REGISTERCLASSFAILED
 REGISTRYHEADER
 registrypath
@@ -1359,7 +1349,6 @@ REINSTALLMODE
 reloadable
 Relogger
 remappings
-REMAPRUNDLL
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
@@ -1421,6 +1410,7 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
+sancov
 SAVEFAILED
 scanled
 schedtasks
@@ -1436,10 +1426,10 @@ SDDL
 SDKDDK
 sdns
 searchterm
-searchtext
 SEARCHUI
 SECONDARYDISPLAY
 secpol
+securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
 SENDCHANGE
@@ -1485,6 +1475,7 @@ shellex
 SHELLEXECUTEINFO
 SHELLEXECUTEINFOW
 SHELLEXTENSION
+SHELLICONSIZE
 SHELLNEWVALUE
 SHFILEINFO
 SHFILEOPSTRUCT
@@ -1493,9 +1484,9 @@ SHGDNF
 SHGFI
 SHGFIICON
 SHGFILARGEICON
+SHIL
 shinfo
 shlwapi
-SHNAMEMAPPING
 shobjidl
 SHORTCUTATLEAST
 SHORTCUTMAXONEACTIONKEY
@@ -1525,6 +1516,7 @@ SIDs
 siex
 sigdn
 SIGNINGSCENARIO
+signtool
 Signtool
 SINGLEKEY
 sipolicy
@@ -1546,7 +1538,6 @@ SNAPPROCESS
 snwprintf
 softline
 SOURCECLIENTAREAONLY
-sourced
 sourcedoc
 SOURCEHEADER
 sourcesdirectory
@@ -1592,6 +1583,7 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
+steamapps
 STGC
 STGM
 STGMEDIUM
@@ -1673,6 +1665,7 @@ telephon
 templatenamespace
 testprocess
 TEXCOORD
+TEXTBOXNEWLINE
 TEXTEXTRACTOR
 TEXTINCLUDE
 tfopen
@@ -1685,7 +1678,6 @@ THotkey
 throughs
 TIcon
 TILEDWINDOW
-TILEINFO
 TILLSON
 timedate
 timediff
@@ -1699,9 +1691,6 @@ TLayout
 tlb
 tlbimp
 tlc
-TPMLEFTALIGN
-TPMRETURNCMD
-TMPVAR
 TNP
 Toolhelp
 toolkitconverters
@@ -1709,6 +1698,8 @@ toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
 TOUCHINPUT
+TPMLEFTALIGN
+TPMRETURNCMD
 TRACEHANDLE
 tracelogging
 tracerpt
@@ -1782,7 +1773,6 @@ USRDLL
 UType
 uuidv
 uwp
-ums
 uxt
 uxtheme
 vabdq
@@ -1809,7 +1799,6 @@ VERTSIZE
 VFT
 vget
 vgetq
-videourl
 viewmodel
 VIRTKEY
 VIRTUALDESK
@@ -1843,7 +1832,7 @@ vstprintf
 VSTT
 vswhere
 Vtbl
-WANTMAPPINGHANDLE
+WANTNUKEWARNING
 WANTPALM
 wasdk
 wbem
@@ -1958,7 +1947,7 @@ WUX
 Wwanpp
 XAxis
 xclip
-xdoc
+xcopy
 XDocument
 XElement
 xfd
@@ -1981,13 +1970,13 @@ Yeet
 YIncrement
 yinle
 yinyue
-youtube
 YPels
 YResolution
 YStr
 YTM
 YVIRTUALSCREEN
 ZEROINIT
+Zhiwei
 zonable
 zoneset
 Zoneszonabletester
@@ -1997,3 +1986,11 @@ ZOOMITX
 ZXk
 ZXNs
 zzz
+ACIE
+AOklab
+BCIE
+BOklab
+culori
+Evercoder
+LCh
+CIELCh

.github/workflows/dependency-review.yml

@@ -0,0 +1,26 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# As recommended by Microsoft's security guidelines (https://docs.opensource.microsoft.com/security/tsg/actions/#requirements-for-security-hardening-your-own-github-actions), 
+# 3rd-party actions should be pinned to a specific commit hash to prevent supply chain attacks. 
+# This update aligns with best practices; 1st/2nd-party actions is not required hash pinning.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v4
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v4

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@v0.0.24
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@v0.0.24
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -175,7 +175,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@v0.0.24
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -202,7 +202,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: apply spelling updates
-        uses: check-spelling/check-spelling@v0.0.24
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

.pipelines/ESRPSigning_core.json

@@ -220,6 +220,7 @@
                 "WinUI3Apps\\PowerToys.Settings.exe",
 
                 "PowerToys.CmdPalModuleInterface.dll",
+                "CmdPalKeyboardService.dll",
                 "*Microsoft.CmdPal.UI_*.msix"
             ],
             "SigningInfo": {
@@ -330,6 +331,8 @@
                 "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,16 +1,24 @@
 Param(
-  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.6",
+  [string]$winAppSdkVersionNumber = "1.7",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False
+  [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"
 )
 
 function Update-NugetConfig {
     param (
-        [string]$filePath = "nuget.config"
+        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
     )
 
     Write-Host "Updating nuget.config file"
@@ -35,7 +43,33 @@ function Update-NugetConfig {
     $xml.Save($filePath)
 }
 
-$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+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()
+}
 
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -79,50 +113,54 @@ if ($latestVersion) {
 }
 
 # Update packages.config files
-Get-ChildItem -Recurse packages.config | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     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
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }
 
 # Update Directory.Packages.props file
-$propsFile = "Directory.Packages.props"
+$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
 if (Test-Path $propsFile) {
-    $content = Get-Content $propsFile -Raw
+    $file = Read-FileWithEncoding -Path $propsFile
+    $content = $file.Content
     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
-        Set-Content -Path $propsFile -Value $content
+        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
         Write-Host "Modified " $propsFile
     }
 }
 
 # Update .vcxproj files
-Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     if ($content -match '\\Microsoft.WindowsAppSDK.') {
         $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
         $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName
     }
 }
 
 # Update .csproj files
-Get-ChildItem -Recurse *.csproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     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
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }

.pipelines/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.2" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0.3" />
 </packages>

.pipelines/tsa.json

@@ -3,5 +3,5 @@
     "notificationAliases": ["powertoys@microsoft.com"],
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\PowerToys"
 }

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

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

.pipelines/v2/release.yml

@@ -112,10 +112,12 @@ extends:
                 # Prepare the localizations and telemetry config before the release build
                 - template: .pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml@self
 
-                - script: |
-                    call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
-                    move /Y "Microsoft.PowerToys.Telemetry.2.0.2\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
-                    move /Y "Microsoft.PowerToys.Telemetry.2.0.2\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
+                - pwsh: |-
+                    $ErrorActionPreference = 'Stop'
+                    $PSNativeCommandUseErrorActionPreference = $true
+                    & nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config
+                    Move-Item -Force -Verbose "Microsoft.PowerToys.Telemetry.*\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h"
+                    Move-Item -Force -Verbose "Microsoft.PowerToys.Telemetry.*\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs"
                   displayName: Emplace telemetry files
 
       - stage: Build_SDK
@@ -148,5 +150,7 @@ 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/job-build-project.yml

@@ -347,6 +347,11 @@ jobs:
       flattenFolders: True
       OverWrite: True
 
+  # Check if all projects (located in src sub-folder) import common props
+  - pwsh: |-
+      & '.pipelines/verifyCommonProps.ps1' -sourceDir '$(build.sourcesdirectory)\src'
+    displayName: Audit shared common props for CSharp projects in src sub-folder
+
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
       & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'

.pipelines/v2/templates/job-test-project.yml

@@ -20,19 +20,27 @@ jobs:
   displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
   timeoutInMinutes: 300
   variables:
-    BuildPlatform: ${{ parameters.platform }}
+    ${{ if or(eq(parameters.platform, 'x64Win10'), eq(parameters.platform, 'x64Win11')) }}:
+      BuildPlatform: x64
+    ${{ else }}:
+      BuildPlatform: ${{ parameters.platform }}
+    TestPlatform: ${{ parameters.platform }}
     BuildConfiguration: ${{ parameters.configuration }}
     SrcPath: $(Build.Repository.LocalPath)
-    TestArtifactsName: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
+    TestArtifactsName: build-${{ variables.BuildPlatform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
   pool:
     ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
       ${{ if ne(parameters.platform, 'ARM64') }}:
         name: SHINE-INT-Testing-x64
+        ${{ if and(eq(parameters.isUIAutomationPipeline, true), eq(parameters.platform, 'x64Win11')) }}:
+          demands: ImageOverride -equals SHINE-W11-Testing
       ${{ else }}:
         name: SHINE-INT-Testing-arm64
     ${{ else }}:
       ${{ if ne(parameters.platform, 'ARM64') }}:
         name: SHINE-OSS-Testing-x64
+        ${{ if and(eq(parameters.isUIAutomationPipeline, true), eq(parameters.platform, 'x64Win11')) }}:
+          demands: ImageOverride -equals SHINE-W11-Testing
       ${{ else }}:
         name: SHINE-OSS-Testing-arm64
   steps:
@@ -117,4 +125,4 @@ jobs:
           !**\obj\**
           !**\ref\**
     env:
-      platform: '$(BuildPlatform)'
+      platform: '$(TestPlatform)'

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

@@ -47,14 +47,41 @@ stages:
             buildTests: true
             useVSPreview: ${{ parameters.useVSPreview }}
 
-    - stage: Test_${{ platform }}
-      displayName: Test ${{ platform }}
-      dependsOn:
-        - Build_${{platform}}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            isUIAutomationPipeline: true
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win10
+        displayName: Test x64Win10
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win10
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                isUIAutomationPipeline: true
+
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win11
+        displayName: Test x64Win11
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win11
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                isUIAutomationPipeline: true
+
+    - ${{ if ne(platform, 'x64') }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release
+              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+              isUIAutomationPipeline: true

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

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

.pipelines/verifyCommonProps.ps1

@@ -0,0 +1,54 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$sourceDir
+)
+
+# scan all csharp project in the source directory
+function Get-CSharpProjects {
+    param (
+        [string]$path
+    )
+
+    # Get all .csproj files under the specified path
+    return Get-ChildItem -Path $path -Recurse -Filter *.csproj | Select-Object -ExpandProperty FullName
+}
+
+# Check if the project file imports 'Common.Dotnet.CsWinRT.props'
+function Test-ImportSharedCsWinRTProps {
+    param (
+        [string]$filePath
+    )
+
+    # Load the XML content of the .csproj file
+    [xml]$csprojContent = Get-Content -Path $filePath
+
+    
+    # Check if the Import element with Project attribute containing 'Common.Dotnet.CsWinRT.props' exists
+    return $csprojContent.Project.Import | Where-Object { $null -ne $_.Project -and $_.Project.EndsWith('Common.Dotnet.CsWinRT.props') }
+}
+
+# Call the function with the provided source directory
+$csprojFilesArray = Get-CSharpProjects -path $sourceDir
+
+$hasInvalidCsProj = $false
+
+# Enumerate the array of file paths and call Validate-ImportSharedCsWinRTProps for each file
+foreach ($csprojFile in $csprojFilesArray) {
+    # Skip if the file ends with 'TemplateCmdPalExtension.csproj'
+    if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
+        continue
+    }
+
+    $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
+    if (!$importExists) {
+        Write-Output "$csprojFile need to import 'Common.Dotnet.CsWinRT.props'."
+        $hasInvalidCsProj = $true
+    }
+}
+
+if ($hasInvalidCsProj) {
+    exit 1
+}
+
+exit 0

COMMUNITY.md

@@ -188,6 +188,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
+- [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
 - [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev lead

Directory.Packages.props

@@ -10,14 +10,14 @@
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -29,24 +29,24 @@
     <PackageVersion Include="Mages" Version="3.0.0" />
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageVersion Include="MessagePack" Version="2.5.187" />
+    <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.5" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <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.120-preview" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
     <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,13 +55,13 @@
 	-->
     <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.6.250205002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
     <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" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.6.3" />
+    <PackageVersion Include="MSTest" Version="3.8.3" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -69,29 +69,32 @@
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom 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.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.4" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.5" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.4" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.4" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.5" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.5" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- Package System.Diagnostics.EventLog 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.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.4" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.5" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
-    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
-    <PackageVersion Include="System.Management" Version="9.0.4" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.5" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.5" />
+    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
+    <PackageVersion Include="System.Management" Version="9.0.5" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.5" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />

NOTICE.md

@@ -75,6 +75,40 @@ 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
@@ -1393,7 +1427,6 @@ SOFTWARE.
 
 ## NuGet Packages used by PowerToys
 
-
 - AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
 - AdaptiveCards.Rendering.WinUI3 2.1.0-beta
 - AdaptiveCards.Templating 2.0.2
@@ -1401,14 +1434,14 @@ SOFTWARE.
 - Azure.AI.OpenAI 1.0.0-beta.17
 - CommunityToolkit.Common 8.4.0
 - CommunityToolkit.Mvvm 8.4.0
-- CommunityToolkit.WinUI.Animations 8.2.250129-preview2
-- CommunityToolkit.WinUI.Collections 8.2.250129-preview2
-- CommunityToolkit.WinUI.Controls.Primitives 8.2.250129-preview2
-- CommunityToolkit.WinUI.Controls.Segmented 8.2.250129-preview2
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250129-preview2
-- CommunityToolkit.WinUI.Controls.Sizers 8.2.250129-preview2
-- CommunityToolkit.WinUI.Converters 8.2.250129-preview2
-- CommunityToolkit.WinUI.Extensions 8.2.250129-preview2
+- CommunityToolkit.WinUI.Animations 8.2.250402
+- CommunityToolkit.WinUI.Collections 8.2.250402
+- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
+- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
+- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
+- CommunityToolkit.WinUI.Converters 8.2.250402
+- CommunityToolkit.WinUI.Extensions 8.2.250402
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1419,61 +1452,65 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
-- MessagePack 2.5.187
-- Microsoft.Bcl.AsyncInterfaces 9.0.4
+- MessagePack 3.1.3
+- Microsoft.Bcl.AsyncInterfaces 9.0.5
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.4
+- Microsoft.Data.Sqlite 9.0.5
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.4
-- Microsoft.Extensions.Hosting 9.0.4
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.4
-- Microsoft.Extensions.Logging 9.0.4
-- Microsoft.Extensions.Logging.Abstractions 9.0.4
+- Microsoft.Extensions.DependencyInjection 9.0.5
+- Microsoft.Extensions.Hosting 9.0.5
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.5
+- Microsoft.Extensions.Logging 9.0.5
+- Microsoft.Extensions.Logging.Abstractions 9.0.5
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.4
-- Microsoft.Windows.Compatibility 9.0.4
+- Microsoft.Win32.SystemEvents 9.0.5
+- Microsoft.Windows.Compatibility 9.0.5
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.6.250205002
-- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
+- Microsoft.WindowsAppSDK 1.7.250401001
+- Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
-- MSTest 3.6.3
+- MSTest 3.8.3
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - OpenAI 2.0.0
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
-- StreamJsonRpc 2.19.27
+- StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.4
+- System.CodeDom 9.0.5
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.4
-- System.Configuration.ConfigurationManager 9.0.4
-- System.Data.OleDb 9.0.4
+- System.ComponentModel.Composition 9.0.5
+- System.Configuration.ConfigurationManager 9.0.5
+- System.Data.OleDb 9.0.5
 - System.Data.SqlClient 4.8.6
-- System.Diagnostics.EventLog 9.0.4
-- System.Diagnostics.PerformanceCounter 9.0.4
-- System.Drawing.Common 9.0.4
-- System.IO.Abstractions 21.0.29
-- System.IO.Abstractions.TestingHelpers 21.0.29
-- System.Management 9.0.4
+- System.Diagnostics.EventLog 9.0.5
+- System.Diagnostics.PerformanceCounter 9.0.5
+- System.Drawing.Common 9.0.5
+- System.IO.Abstractions 22.0.13
+- System.IO.Abstractions.TestingHelpers 22.0.13
+- System.Management 9.0.5
+- System.Net.Http 4.3.4
+- System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.4
-- System.ServiceProcess.ServiceController 9.0.4
-- System.Text.Encoding.CodePages 9.0.4
-- System.Text.Json 9.0.4
+- System.Runtime.Caching 9.0.5
+- System.ServiceProcess.ServiceController 9.0.5
+- System.Text.Encoding.CodePages 9.0.5
+- System.Text.Json 9.0.5
+- System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.5
 - WyHash 1.0.5
+

PowerToys.sln

@@ -624,19 +624,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandPalette", "CommandPa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}"
 EndProject
@@ -650,9 +650,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "sr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Extensions", "Sample Extensions", "{071E18A4-A530-46B8-AB7D-B862EE55E24E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\Exts\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\ext\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\Exts\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\ext\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{7520A2FE-00A2-49B8-83ED-DB216E874C04}"
 EndProject
@@ -660,7 +660,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj", "{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalModuleInterface", "src\modules\cmdpal\CmdPalModuleInterface\CmdPalModuleInterface.vcxproj", "{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}"
 EndProject
@@ -668,15 +668,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
@@ -690,7 +690,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItModuleInterface", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItSettingsInterop", "src\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj", "{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestAutomation", "src\common\UITestAutomation\UITestAutomation.csproj", "{A558C25D-2007-498E-8B6F-43405AFAE9E2}"
 EndProject
@@ -704,10 +704,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\module
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesEditorUITest", "src\modules\Workspaces\WorkspacesEditorUITest\WorkspacesEditorUITest.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2588,6 +2594,28 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.Build.0 = Release|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.ActiveCfg = Release|x64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.Build.0 = Release|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.ActiveCfg = Debug|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.Build.0 = Debug|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.Build.0 = Release|x64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.Build.0 = Debug|x64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2859,6 +2887,9 @@ Global
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/Fuzzing/CppFuzzingGuide.md

@@ -0,0 +1,117 @@
+# 🧪 C++ Project Fuzzing Test Guide
+
+This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
+.
+
+---
+
+## 🏗️ Step-by-Step Setup
+
+### 1. Create a New C++ Project
+
+- Use **Empty Project** template.
+- Name it `<ModuleName>.FuzzingTest`.
+
+---
+
+### 2. Update Build Configuration
+
+- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
+- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
+---
+
+### 3. Enable ASan and libFuzzer in `.vcxproj`
+
+Edit the project file to enable fuzzing:
+
+```xml
+<PropertyGroup>
+  <EnableASAN>true</EnableASAN>
+  <EnableFuzzer>true</EnableFuzzer>
+</PropertyGroup>
+```
+
+---
+
+### 4. Add Fuzzing Compiler Flags
+
+Add this to `AdditionalOptions` under the `Fuzzing` configuration:
+
+```xml
+/fsanitize=address
+/fsanitize-coverage=inline-8bit-counters
+/fsanitize-coverage=edge
+/fsanitize-coverage=trace-cmp
+/fsanitize-coverage=trace-div
+%(AdditionalOptions)
+```
+
+---
+
+### 5. Link the Sanitizer Coverage Runtime
+
+In `Linker → Input → Additional Dependencies`, add:
+
+```text
+$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
+```
+
+---
+
+### 6. Copy Required Runtime DLL
+
+Add a `PostBuildEvent` to copy the ASAN DLL:
+
+```xml
+<Command>
+  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
+</Command>
+```
+
+---
+
+### 7. Add Preprocessor Definitions
+
+To avoid annotation issues, add these to the `Preprocessor Definitions`:
+
+```text
+_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
+```
+
+---
+
+## 🧬 Required Code
+
+### `LLVMFuzzerTestOneInput` Entry Point
+
+Every fuzzing project must expose this function:
+
+```cpp
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    std::string input(reinterpret_cast<const char*>(data), size);
+
+    try
+    {
+        // Call your module with the input here.
+    }
+    catch (...) {}
+
+    return 0;
+}
+```
+
+---
+
+## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
+
+To submit a job to the cloud you can run with this command:
+
+```
+oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
+```
+You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
+
+OneFuzz will send you an email when the job has started.
+
+---

doc/devdocs/UITests.md

@@ -21,67 +21,74 @@
 
 - Create a new project and add the following references to the project file. Change the OutputPath to your own module's path.
   ```
-  	<PropertyGroup>
-  		<OutputType>Library</OutputType>
-  		<!-- This is a UI test, so don't run as part of MSBuild -->
-  		<RunVSTest>false</RunVSTest>
-  	</PropertyGroup>
-  
-  	<PropertyGroup>
-  		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\KeyboardManagerUITests\</OutputPath>
-  	</PropertyGroup>
-  
-  	<ItemGroup>
-  	    <PackageReference Include="MSTest" />
-  	    <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-  	    <Folder Include="Properties\" />
-	</ItemGroup>
+    <Project Sdk="Microsoft.NET.Sdk">
+    <!-- Look at Directory.Build.props in root for common stuff as well -->
+    <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+
+    <PropertyGroup>
+        <ProjectGuid>{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}</ProjectGuid>
+        <RootNamespace>PowerToys.Hosts.UITests</RootNamespace>
+        <AssemblyName>PowerToys.Hosts.UITests</AssemblyName>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+        <Nullable>enable</Nullable>
+        <OutputType>Library</OutputType>
+
+        <!-- This is a UI test, so don't run as part of MSBuild -->
+        <RunVSTest>false</RunVSTest>
+        </PropertyGroup>
+        <PropertyGroup>
+        <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\Hosts.UITests\</OutputPath>
+        </PropertyGroup>
+
+        <ItemGroup>
+        <PackageReference Include="MSTest" />
+        <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+        </ItemGroup>
+    </Project>
+
   ```
 - Inherit your test class from UITestBase.
   >Set Scope: The default scope starts from the PowerToys settings UI. If you want to start from your own module, set the constructor as shown below:
   
   >Specify Scope:
   ```
-  [TestClass]
-  public class RunFancyZonesTest : UITestBase
-  {
-      public RunFancyZonesTest()
-          : base(PowerToysModule.FancyZone)
-      {
-      }
-  }
+    [TestClass]
+    public class HostModuleTests : UITestBase
+    {
+        public HostModuleTests()
+            : base(PowerToysModule.Hosts, WindowSize.Small_Vertical)
+        {
+        }
+    }
   ```
 
-- Then you can start using session to perform the UI operations.
+- Then you can start performing the UI operations.
 
 **Example**
 ```
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UITests_KeyboardManager
+[TestMethod("Hosts.Basic.EmptyViewShouldWork")]
+[TestCategory("Hosts File Editor #4")]
+public void TestEmptyView()
 {
-    [TestClass]
-    public class RunKeyboardManagerUITests : UITestBase
-    {
-        [TestMethod]
-        public void OpenKeyboardManagerEditor()
-        {
-            // Open KeyboardManagerEditor
-            this.Session.Find<Button>(By.Name("Remap a key")).Click();
-            this.Session.Attach("Remap keys");
+    this.CloseWarningDialog();
+    this.RemoveAllEntries();
 
-            // Maximize window
-            var window = Session.Find<Window>(By.Name("Remap keys")).Maximize();
+    // 'Add an entry' button (only show-up when list is empty) should be visible
+    Assert.IsTrue(this.HasOne<HyperlinkButton>("Add an entry"), "'Add an entry' button should be visible in the empty view");
 
-            // Add Key Remapping
-            this.Session.Find<Button>(By.Name("Add key remapping")).Click();
-            window.Close();
+    VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "EmptyView");
 
-            // Back to Settings
-            this.Session.Attach(PowerToysModule.PowerToysSettings);
-        }
-    }
+    // Click 'Add an entry' from empty-view for adding Host override rule
+    this.Find<HyperlinkButton>("Add an entry").Click();
+
+    this.AddEntry("192.168.0.1", "localhost", false, false);
+
+    // Should have one row now and not more empty view
+    Assert.IsTrue(this.Has<Button>("Delete"), "Should have one row now");
+    Assert.IsFalse(this.Has<HyperlinkButton>("Add an entry"), "'Add an entry' button should be invisible if not empty view");
+
+    VisualAssert.AreEqual(this.TestContext, this.Find("Entries"), "NonEmptyView");
 }
 ```
 

doc/thirdPartyRunPlugins.md

@@ -43,6 +43,9 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [TailwindCSS](https://github.com/skttl/ptrun-tailwindcss) | [skttl](https://github.com/skttl) | Search the documentation of TailwindCSS |
 | [HttpStatusCodes](https://github.com/grzhan/HttpStatusCodePowerToys) | [grzhan](https://github.com/grzhan) | Search for http status codes |
 | [SVGL](https://github.com/Sameerjs6/powertoys-svgl) | [SameerJS6](https://github.com/SameerJS6) | Search, Browse and copy SVG logos from SVGL. |
+| [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
+| [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
+| [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |
 
 ## Extending software plugins
 
@@ -65,3 +68,4 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
+[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |

installer/PowerToysSetup/Product.wxs

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

src/Common.Dotnet.CsWinRT.props

@@ -1,6 +1,8 @@
 <?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.FuzzTest.props

@@ -0,0 +1,10 @@
+<?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">
+  <!-- OneFuzz does not currently support testing with .NET 9.
+       As a temporary workaround, create a .NET 8 project and use file links 
+       to include the code that needs testing. -->
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+  </PropertyGroup>
+</Project>

src/Common.Dotnet.PrepareGeneratedFolder.targets

@@ -0,0 +1,16 @@
+<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/codeAnalysis/GlobalSuppressions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -63,8 +63,16 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 
-// AOT
+// AOT MVVMTK0045
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "AdvancedPaste.ViewModels")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "HostsUILib")]
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "EnvironmentVariablesUILib")]
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI.Views")]
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
+
+// AOT MVVMTK0049
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "type", Target = "~T:Peek.UI.Views.TitleBar")]
+[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]

src/common/AllExperiments/Logger.cs

@@ -25,7 +25,7 @@ namespace AllExperiments
             }
 
             // Using InvariantCulture since this is used for a log file name
-            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
+            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

src/common/ManagedCommon/ColorFormatHelper.cs

@@ -141,6 +141,40 @@ 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:
@@ -156,10 +190,7 @@ namespace ManagedCommon
             double g = color.G / 255d;
             double b = color.B / 255d;
 
-            // 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);
+            (double rLinear, double gLinear, double bLinear) = ConvertSRGBToLinearRGB(r, g, b);
 
             return (
                 (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
@@ -210,6 +241,63 @@ 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>
@@ -276,12 +364,17 @@ 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
-            { "Ca", 'p' },   // chromaticityA    percent
-            { "Cb", 'p' },   // chromaticityB    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
             { "Xv", 'i' },   // X value          int
             { "Yv", 'i' },   // Y value          int
             { "Zv", 'i' },   // Z value          int
@@ -424,6 +517,10 @@ 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);
@@ -440,6 +537,22 @@ 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);
@@ -495,8 +608,10 @@ namespace ManagedCommon
                 case "HSI": return "hsi(%Hu, %Si%, %In%)";
                 case "HWB": return "hwb(%Hu, %Wh%, %Bn%)";
                 case "NCol": return "%Hn, %Wh%, %Bn%";
-                case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
                 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 "VEC4": return "(%Reff, %Grff, %Blff, 1f)";
                 case "Decimal": return "%Dv";
                 case "HEX Int": return "0xFF%ReX%GrX%BlX";

src/common/ManagedCommon/IdRecoveryHelper.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;
+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/ManagedCommon/Logger.cs

@@ -54,7 +54,7 @@ namespace ManagedCommon
                 Directory.CreateDirectory(applicationLogPath);
             }
 
-            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
+            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

src/common/UITestAutomation/Doc/ui-automation-cover-list.md

@@ -98,23 +98,79 @@
 
 ## [FancyZones Editor](tests-checklist-template-fancyzones-section.md)
 
-- [ ] 1. Open editor from the settings
+- [x] 1. Open editor from the settings
+      - TestMethod("FancyZones.Setting")
 - [ ] 2. Open editor with a shortcut
-- [ ] 3. Create a new layout (grid and canvas)
-- [ ] 4. Duplicate a template and a custom layout
-- [ ] 5. Delete layout
-- [ ] 6. Edit templates (number of zones, spacing, distance to highlight adjacent zones). Verify after reopening the editor that saved settings are kept the same.
-- [ ] 7. Edit canvas layout: zones size and position, create or delete zones.
-- [ ] 8. Edit grid layout: split, merge, resize zones.
-- [ ] 9. Check `Save and apply` and `Cancel` buttons behavior after editing.
-- [ ] 10. Assign a layout to each monitor.
-- [ ] 11. Assign keys to quickly switch layouts (custom layouts only), `Win + Ctrl + Alt + number`.
-- [ ] 12. Assign horizontal and vertical default layouts
-- [ ] 13. Test duplicate layout focus
+- [x] 3. Create a new layout (grid and canvas)
+      - TestMethod("FancyZonesEditor.Basic.CreateWithCustomName")
+      - TestMethod("FancyZonesEditor.Basic.CreateGrid")
+      - TestMethod("FancyZonesEditor.Basic.CreateCanvas")
+      - TestMethod("FancyZonesEditor.Basic.CancelGridCreation")
+      - TestMethod("FancyZonesEditor.Basic.CancelCanvasCreation")
+- [x] 4. Duplicate a template and a custom layout
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromEditLayoutWindow")
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromEditLayoutWindow")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_Hotkey")
+- [x] 5. Delete layout
+      - TestMethod("FancyZonesEditor.Basic.DeleteNotAppliedLayout")
+      - TestMethod("FancyZonesEditor.Basic.DeleteAppliedLayout")
+      - TestMethod("FancyZonesEditor.Basic.CancelDeletion")
+      - TestMethod("FancyZonesEditor.Basic.DeleteFromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.DeleteDefaultLayout")
+      - TestMethod("FancyZonesEditor.Basic.DeleteLayoutWithHotkey")
+- [x] 6. Edit templates (number of zones, spacing, distance to highlight adjacent zones). Verify after reopening the editor that saved settings are kept the same.
+      - TestMethod("FancyZonesEditor.Basic.ZoneNumber_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Save")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Save")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Save")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Cancel")
+- [x] 7. Edit canvas layout: zones size and position, create or delete zones.
+      - TestMethod("FancyZonesEditor.Basic.OpenEditMode")
+      - TestMethod("FancyZonesEditor.Basic.OpenEditModeFromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Cancel")
+- [x] 8. Edit grid layout: split, merge, resize zones.
+      - TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Cancel")
+- [x] 9. Check `Save and apply` and `Cancel` buttons behavior after editing.
+      - All Save and Cancel button have this test.
+- [x] 10. Assign a layout to each monitor.
+      - TestMethod("FancyZonesEditor.Basic.ApplyLayoutsOnEachMonitor")
+      - TestMethod("FancyZonesEditor.Basic.ApplyTemplateWithDifferentParametersOnEachMonitor")
+- [x] 11. Assign keys to quickly switch layouts (custom layouts only), `Win + Ctrl + Alt + number`.
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Save")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_AllPossibleValues")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Save")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Cancel")
+- [x] 12. Assign horizontal and vertical default layouts
+      - TestMethod("FancyZonesEditor.Basic.Default_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.Default_Assign_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Default_Assign_Save")
+- [x] 13. Test duplicate layout focus
    * Select any layout X in 'Templates' or 'Custom' section by click left mouse button
    * Mouse right button click on any layout Y in 'Templates' or 'Custom' sections
    * Duplicate it by clicking 'Create custom layout' (Templates section) or 'Duplicate' in 'Custom' section
    * Expect the layout Y is duplicated
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_DefaultLayout")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_DefaultLayout")
 
 ## [FancyZones](tests-checklist-template-fancyzones-section.md)
 
@@ -226,15 +282,24 @@ Select Move windows based on `Relative position`.
 
 ### Layout apply
 Enable `Enable quick layout switch`, assign numbers to custom layouts.
-- [ ] 1. Switch with `Win` + `Ctrl` + `Alt` + `key`.
-- [ ] 2. Switch with just a key while dragging a window.
-- [ ] 3. Turn `Flash zones when switching layout` on/off, verify it's flashing/not flashing after pressing the shortcut.
-- [ ] 4. Disable `Enable quick layout switch`, verify shortcuts don't work.
-- [ ] 5. Disable spacing on any grid layout, verify that there is no space between zones while dragging a window.
-- [ ] 6. Create a new virtual desktop, verify that there are the same layouts as applied to the previous virtual desktop.
-- [ ] 7. After creating a virtual desktop apply another layout or edit the applied one. Verify that the other virtual desktop layout wasn't changed.
-- [ ] 8. Delete an applied custom layout in the Editor, verify that there is no layout applied instead of it.
-- [ ] 9. Apply a grid layout, change the screen resolution or scaling, verify that the assigned layout fits the screen. NOTE: canvas layout could not fit the screen if it was created on a monitor with a different resolution.
+- [x] 1. Switch with `Win` + `Ctrl` + `Alt` + `key`.
+      - TestMethod("FancyZones.Settings.TestApplyHotKey")
+- [x] 2. Switch with just a key while dragging a window.
+      - TestMethod("FancyZones.Settings.TestDragShiftHotKey")
+- [x] 3. Turn `Flash zones when switching layout` on/off, verify it's flashing/not flashing after pressing the shortcut.
+      - TestMethod("FancyZones.Settings.HotKeyWindowFlashTest")
+- [x] 4. Disable `Enable quick layout switch`, verify shortcuts don't work.
+      - TestMethod("FancyZones.Settings.TestDisableApplyHotKey")
+- [x] 5. Disable spacing on any grid layout, verify that there is no space between zones while dragging a window.
+      - This feature is not available in the current release version.
+- [x] 6. Create a new virtual desktop, verify that there are the same layouts as applied to the previous virtual desktop.
+      - TestMethod("FancyZones.Settings.TestVirtualDesktopLayout")
+- [x] 7. After creating a virtual desktop apply another layout or edit the applied one. Verify that the other virtual desktop layout wasn't changed.
+      - TestMethod("FancyZones.Settings.TestVirtualDesktopLayoutExt")
+- [x] 8. Delete an applied custom layout in the Editor, verify that there is no layout applied instead of it.
+      - TestMethod("FancyZones.Settings.TestDeleteCustomLayoutBehavior")
+- [x] 9. Apply a grid layout, change the screen resolution or scaling, verify that the assigned layout fits the screen. NOTE: canvas layout could not fit the screen if it was created on a monitor with a different resolution.
+      - TestMethod("FancyZones.Settings.TestCreateGridLayoutChangeMonitorSetting")
 
 ### Layout reset
 * Test layout resetting.
@@ -453,66 +518,98 @@ For all the remapping below, try pressing and releasing the remapped key/shortcu
 
 Find My Mouse:
   * Enable FindMyMouse. Then, without moving your mouse:
-    - [ ] 1. Press Left Ctrl twice and verify the overlay appears.
-    - [ ] 2. Press any other key and verify the overlay disappears.
-    - [ ] 3. Press Left Ctrl twice and verify the overlay appears.
-    - [ ] 4. Press a mouse button and verify the overlay disappears.
-  * Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice.
+    - [x] 1. Press Left Ctrl twice and verify the overlay appears.
+          - TestMethod("MouseUtils.FindMyMouse.EnableFindMyMouse")
+    - [x] 2. Press any other key and verify the overlay disappears.
+          - TestMethod("MouseUtils.FindMyMouse.EnableFindMyMouse")
+    - [x] 3. Press Left Ctrl twice and verify the overlay appears.
+          - TestMethod("MouseUtils.FindMyMouse.EnableFindMyMouse")
+    - [x] 4. Press a mouse button and verify the overlay disappears.
+          - TestMethod("MouseUtils.FindMyMouse.EnableFindMyMouse")
+  * Disable FindMyMouse.
+    - [x] 5. Verify the overlay no longer appears when you press Left Ctrl twice.
+          - TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse")
+          - TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse2")
   * Enable FindMyMouse. Then, without moving your mouse:
-    - [ ] 5. Press Left Ctrl twice and verify the overlay appears.
+    - [x] 6. Press Left Ctrl twice and verify the overlay appears.
+          - TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse3")
   * Enable the "Do not activate on game mode" option. Start playing a game that uses CG native full screen.
-    - [ ] 6. Verify the overlay no longer appears when you press Left Ctrl twice.
+    - [ ] 7. Verify the overlay no longer appears when you press Left Ctrl twice.
   * Disable the "Do not activate on game mode" option. Start playing the same game.
-    - [ ] 7. Verify the overlay appears when you press Left Ctrl twice. (though it'll likely minimize the game)
+    - [ ] 8. Verify the overlay appears when you press Left Ctrl twice. (though it'll likely minimize the game)
   * Test the different settings and verify they apply:
-    - [ ] 8. Overlay opacity
-    - [ ] 9. Background color
-    - [ ] 10. Spotlight color
-    - [ ] 11. Spotlight radius
-    - [ ] 12. Spotlight initial zoom (1x vs 9x will show the difference)
-    - [ ] 13. Animation duration
-    - [ ] 14. Change activation method to shake and activate by shaking your mouse pointer
-    - [ ] 15. Excluded apps
+    - [ ] 9. Overlay opacity
+    - [x] 10. Background color
+          - TestMethod("MouseUtils.FindMyMouse.FindMyMouseDifferentSettings")
+    - [x] 11. Spotlight color
+          - TestMethod("MouseUtils.FindMyMouse.FindMyMouseDifferentSettings")
+    - [x] 12. Spotlight radius
+          - TestMethod("MouseUtils.FindMyMouse.FindMyMouseDifferentSettings")
+    - [ ] 13. Spotlight initial zoom (1x vs 9x will show the difference)
+    - [ ] 14. Animation duration
+    - [ ] 15. Change activation method to shake and activate by shaking your mouse pointer
+    - [ ] 16. Excluded apps
 
 Mouse Highlighter:
   * Enable Mouse Highlighter. Then:
-    - [ ] 16. Press the activation shortcut and press left and right click somewhere, verifying the hightlights are applied.
-    - [ ] 17. With left mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
-    - [ ] 18. With right mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
-    - [ ] 19. Press the activation shortcut again and verify no highlights appear when the mouse buttons are clicked.
-    - [ ] 20. Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
+    - [x] 17. Press the activation shortcut and press left and right click somewhere, verifying the hightlights are applied.
+          - TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")
+    - [x] 18. With left mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
+          - TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")
+    - [x] 19. With right mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
+          - TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")
+    - [x] 20. Press the activation shortcut again and verify no highlights appear when the mouse buttons are clicked.
+          - TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")
+    - [x] 21. Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
+          - TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")
   * Test the different settings and verify they apply:
-    - [ ] 21. Change activation shortcut and test it
-    - [ ] 22. Left button highlight color
-    - [ ] 23. Right button highlight color
-    - [ ] 24. Opacity
-    - [ ] 25. Radius
-    - [ ] 26. Fade delay
-    - [ ] 27. Fade duration
+    - [x] 22. Change activation shortcut and test it
+          - TestMethod("MouseUtils.MouseHighlighter.MouseHighlighterDifferentSettings")
+    - [x] 23. Left button highlight color
+          - TestMethod("MouseUtils.MouseHighlighter.MouseHighlighterDifferentSettings")
+    - [x] 24. Right button highlight color
+          - TestMethod("MouseUtils.MouseHighlighter.MouseHighlighterDifferentSettings")
+    - [ ] 25. Opacity
+    - [ ] 26. Radius
+    - [ ] 27. Fade delay
+    - [ ] 28. Fade duration
 
 Mouse Pointer Crosshairs:
   * Enable Mouse Pointer Crosshairs. Then:
-    - [ ] 28. Press the activation shortcut and verify the crosshairs appear, and that they follow the mouse around.
-    - [ ] 29. Press the activation shortcut again and verify the crosshairs disappear.
-    - [ ] 30. Disable Mouse Pointer Crosshairs and verify that the module is not activated when you press the activation shortcut.
+    - [x] 29. Press the activation shortcut and verify the crosshairs appear, and that they follow the mouse around.
+          - TestMethod("MouseUtils.MousePointerCrosshairs.EnableMousePointerCrosshairs")
+    - [x] 30. Press the activation shortcut again and verify the crosshairs disappear.
+          - TestMethod("MouseUtils.MousePointerCrosshairs.EnableMousePointerCrosshairs")
+    - [x] 31. Disable Mouse Pointer Crosshairs and verify that the module is not activated when you press the activation shortcut.
+          - TestMethod("MouseUtils.MousePointerCrosshairs.EnableMousePointerCrosshairs")
   * Test the different settings and verify they apply:
-    - [ ] 31. Change activation shortcut and test it
-    - [ ] 32. Crosshairs color
-    - [ ] 33. Crosshairs opacity
-    - [ ] 34. Crosshairs center radius
-    - [ ] 35. Crosshairs thickness
-    - [ ] 36. Crosshairs border color
-    - [ ] 37. Crosshairs border size
+    - [x] 32. Change activation shortcut and test it
+          - TestMethod("MouseUtils.MousePointerCrosshairs.MousePointerCrosshairsDifferentSettings")
+    - [x] 33. Crosshairs color
+          - TestMethod("MouseUtils.MousePointerCrosshairs.MousePointerCrosshairsDifferentSettings")
+    - [ ] 34. Crosshairs opacity
+    - [ ] 35. Crosshairs center radius
+    - [ ] 36. Crosshairs thickness
+    - [ ] 37. Crosshairs border color
+    - [ ] 38. Crosshairs border size
 
 Mouse Jump:
   * Enable Mouse Jump. Then:
-    - [ ] 38. Press the activation shortcut and verify the screens preview appears.
-    - [ ] 39. Change activation shortcut and verify that new shorctut triggers Mouse Jump.
-    - [ ] 40. Click around the screen preview and ensure that mouse cursor jumped to clicked location.
-    - [ ] 41. Reorder screens in Display settings and confirm that Mouse Jump reflects the change and still works correctly.
-    - [ ] 42. Change scaling of screens and confirm that Mouse Jump still works correctly.
-    - [ ] 43. Unplug additional monitors and confirm that Mouse Jump still works correctly.
-    - [ ] 44. Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.
+    - [x] 39. Press the activation shortcut and verify the screens preview appears.
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump")
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump2")
+    - [x] 40. Change activation shortcut and verify that new shorctut triggers Mouse Jump.
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump")
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump3")
+    - [x] 41. Click around the screen preview and ensure that mouse cursor jumped to clicked location.
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump")
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump2")
+    - [ ] 42. Reorder screens in Display settings and confirm that Mouse Jump reflects the change and still works correctly.
+    - [ ] 43. Change scaling of screens and confirm that Mouse Jump still works correctly.
+    - [ ] 44. Unplug additional monitors and confirm that Mouse Jump still works correctly.
+    - [x] 45. Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump")
+          - TestMethod("MouseUtils.MouseJump.EnableMouseJump2")
 
 ## Awake
  - [ ] 1. Try out the features and see if they work, no list at this time.

src/common/UITestAutomation/Element/CheckBox.cs

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.PowerToys.UITest
+{
+    public class CheckBox : Element
+    {
+        private static readonly string ExpectedControlType = "ControlType.CheckBox";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CheckBox"/> class.
+        /// </summary>
+        public CheckBox()
+        {
+            this.TargetControlType = CheckBox.ExpectedControlType;
+        }
+
+        /// <summary>
+        /// Select the item of the ComboBox.
+        /// </summary>
+        /// <param name="value">The text to select from the list view.</param>
+        public void Select(string value)
+        {
+            this.Find<NavigationViewItem>(value).Click();
+        }
+    }
+}

src/common/UITestAutomation/Element/Custom.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -21,5 +22,53 @@ namespace Microsoft.PowerToys.UITest
         {
             this.TargetControlType = Custom.ExpectedControlType;
         }
+
+        /// <summary>
+        /// Sends a combination of keys.
+        /// </summary>
+        /// <param name="keys">The keys to send.</param>
+        public void SendKeys(params Key[] keys)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                KeyboardHelper.SendKeys(keys);
+            });
+        }
+
+        /// <summary>
+        /// Drag element move offset.
+        /// </summary>
+        /// <param name="offsetX">The offsetX to move.</param>
+        /// <param name="offsetY">The offsetY to move.</param>
+        public void Drag(int offsetX, int offsetY)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
+                actions.Build().Perform();
+            });
+        }
+
+        /// <summary>
+        /// Drag element move to other element.
+        /// </summary>
+        /// <param name="element">Move to this element.</param>
+        public void Drag(Element element)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                actions.MoveToElement(windowElement).ClickAndHold();
+                Assert.IsNotNull(element.WindowsElement, "element is null");
+                int dx = (element.WindowsElement.Rect.X - windowElement.Rect.X) / 10;
+                int dy = (element.WindowsElement.Rect.Y - windowElement.Rect.Y) / 10;
+                for (int i = 0; i < 10; i++)
+                {
+                    actions.MoveByOffset(dx, dy);
+                }
+
+                actions.Release();
+                actions.Build().Perform();
+            });
+        }
     }
 }

src/common/UITestAutomation/Element/Element.cs

@@ -26,8 +26,20 @@ namespace Microsoft.PowerToys.UITest
     {
         private WindowsElement? windowsElement;
 
+        protected internal WindowsElement? WindowsElement
+        {
+            get => windowsElement;
+            set => windowsElement = value;
+        }
+
         private WindowsDriver<WindowsElement>? driver;
 
+        protected internal WindowsDriver<WindowsElement>? Driver
+        {
+            get => driver;
+            set => driver = value;
+        }
+
         protected string? TargetControlType { get; set; }
 
         internal bool IsMatchingTarget()
@@ -156,87 +168,20 @@ namespace Microsoft.PowerToys.UITest
         }
 
         /// <summary>
-        /// Drag element move offset.
+        /// Release action
         /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
+        public void ReleaseAction()
         {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
+            var releaseAction = new Actions(driver);
+            releaseAction.Release().Perform();
         }
 
         /// <summary>
-        /// Drag element move to other element.
+        /// Release key
         /// </summary>
-        /// <param name="element">Move to this element.</param>
-        public void Drag(Element element)
+        public void ReleaseKey(Key key)
         {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).ClickAndHold();
-                Assert.IsNotNull(element.windowsElement, "element is null");
-                int dx = (element.windowsElement.Rect.X - windowElement.Rect.X) / 10;
-                int dy = (element.windowsElement.Rect.Y - windowElement.Rect.Y) / 10;
-                for (int i = 0; i < 10; i++)
-                {
-                    actions.MoveByOffset(dx, dy);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Send Key of the element.
-        /// </summary>
-        /// <param name="key">The Key to Send.</param>
-        public void SendKeys(string key)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                windowElement.SendKeys(key);
-            });
-        }
-
-        /// <summary>
-        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
-        /// </summary>
-        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
-        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
-        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
-        public void KeyDownAndDrag(Key key, int targetX, int targetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                KeyboardHelper.PressKey(key);
-
-                actions.MoveToElement(windowsElement)
-                .ClickAndHold()
-                .Perform();
-
-                int dx = targetX - windowElement.Rect.X;
-                int dy = targetY - windowElement.Rect.Y;
-
-                int stepCount = 10;
-                int stepX = dx / stepCount;
-                int stepY = dy / stepCount;
-
-                for (int i = 0; i < stepCount; i++)
-                {
-                    var stepAction = new Actions(driver);
-                    stepAction.MoveByOffset(stepX, stepY).Perform();
-                }
-
-                var releaseAction = new Actions(driver);
-                releaseAction.Release().Perform();
-
-                KeyboardHelper.ReleaseKey(key);
-            });
+            KeyboardHelper.ReleaseKey(key);
         }
 
         /// <summary>
@@ -378,6 +323,18 @@ namespace Microsoft.PowerToys.UITest
             return this.FindAll<Element>(By.Name(name), timeoutMS);
         }
 
+        /// <summary>
+        /// Send Key of the element.
+        /// </summary>
+        /// <param name="key">The Key to Send.</param>
+        protected void SendKeys(string key)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                windowElement.SendKeys(key);
+            });
+        }
+
         /// <summary>
         /// Simulates a manual operation on the element.
         /// </summary>

src/common/UITestAutomation/Element/NavigationViewItem.cs

@@ -48,6 +48,33 @@ namespace Microsoft.PowerToys.UITest
                 msPostAction);
         }
 
+        /// <summary>
+        /// Click the ListItem element.
+        /// </summary>
+        /// <param name="rightClick">If true, performs a right-click; otherwise, performs a left-click. Default value is false</param>
+        /// <param name="msPreAction">Pre action delay in milliseconds. Default value is 500</param>
+        /// <param name="msPostAction">Post action delay in milliseconds. Default value is 500</param>
+        public void ClickCenter(bool rightClick = false, int msPreAction = 500, int msPostAction = 500)
+        {
+            PerformAction(
+                (actions, windowElement) =>
+                {
+                    actions.MoveToElement(windowElement);
+                    if (rightClick)
+                    {
+                        actions.ContextClick();
+                    }
+                    else
+                    {
+                        actions.Click();
+                    }
+
+                    actions.Build().Perform();
+                },
+                msPreAction,
+                msPostAction);
+        }
+
         /// <summary>
         /// Double Click the ListItem element.
         /// </summary>

src/common/UITestAutomation/Element/Pane.cs

@@ -0,0 +1,67 @@
+// 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.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
+
+namespace Microsoft.PowerToys.UITest
+{
+    public class Pane : Element
+    {
+        private static readonly string ExpectedControlType = "ControlType.Pane";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pane"/> class.
+        /// </summary>
+        public Pane()
+        {
+            this.TargetControlType = Pane.ExpectedControlType;
+        }
+
+        /// <summary>
+        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
+        /// </summary>
+        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
+        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
+        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
+        public void KeyDownAndDrag(Key key, int targetX, int targetY)
+        {
+            HoldShiftToDrag(key, targetX, targetY);
+            ReleaseAction();
+            ReleaseKey(key);
+        }
+
+        /// <summary>
+        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
+        /// </summary>
+        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
+        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
+        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
+        public void HoldShiftToDrag(Key key, int targetX, int targetY)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                KeyboardHelper.PressKey(key);
+
+                actions.MoveToElement(WindowsElement)
+                .ClickAndHold()
+                .Perform();
+
+                int dx = targetX - windowElement.Rect.X;
+                int dy = targetY - windowElement.Rect.Y;
+
+                int stepCount = 10;
+                int stepX = dx / stepCount;
+                int stepY = dy / stepCount;
+
+                for (int i = 0; i < stepCount; i++)
+                {
+                    var stepAction = new Actions(Driver);
+                    stepAction.MoveByOffset(stepX, stepY).Perform();
+                }
+            });
+        }
+    }
+}

src/common/UITestAutomation/Element/Slider.cs

@@ -28,6 +28,18 @@ namespace Microsoft.PowerToys.UITest
             return this.Text == string.Empty ? 0 : int.Parse(this.Text);
         }
 
+        /// <summary>
+        /// Sends a combination of keys.
+        /// </summary>
+        /// <param name="keys">The keys to send.</param>
+        public void SendKeys(params Key[] keys)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                KeyboardHelper.SendKeys(keys);
+            });
+        }
+
         /// <summary>
         /// Sets the value of a Slider (WindowsElement) to the specified integer value.
         /// Throws an exception if the value is out of the slider's valid range.

src/common/UITestAutomation/Element/Tab.cs

@@ -0,0 +1,67 @@
+// 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.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Interactions;
+
+namespace Microsoft.PowerToys.UITest
+{
+    public class Tab : Element
+    {
+        private static readonly string ExpectedControlType = "ControlType.Tab";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Tab"/> class.
+        /// </summary>
+        public Tab()
+        {
+            this.TargetControlType = Tab.ExpectedControlType;
+        }
+
+        /// <summary>
+        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
+        /// </summary>
+        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
+        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
+        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
+        public void KeyDownAndDrag(Key key, int targetX, int targetY)
+        {
+            HoldShiftToDrag(key, targetX, targetY);
+            ReleaseAction();
+            ReleaseKey(key);
+        }
+
+        /// <summary>
+        /// Simulates holding a key, clicking and dragging a UI element to the specified screen coordinates.
+        /// </summary>
+        /// <param name="key">The keyboard key to press and hold during the drag operation.</param>
+        /// <param name="targetX">The target X-coordinate to drag the element to.</param>
+        /// <param name="targetY">The target Y-coordinate to drag the element to.</param>
+        public void HoldShiftToDrag(Key key, int targetX, int targetY)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                KeyboardHelper.PressKey(key);
+
+                actions.MoveToElement(WindowsElement)
+                .ClickAndHold()
+                .Perform();
+
+                int dx = targetX - windowElement.Rect.X;
+                int dy = targetY - windowElement.Rect.Y;
+
+                int stepCount = 10;
+                int stepX = dx / stepCount;
+                int stepY = dy / stepCount;
+
+                for (int i = 0; i < stepCount; i++)
+                {
+                    var stepAction = new Actions(Driver);
+                    stepAction.MoveByOffset(stepX, stepY).Perform();
+                }
+            });
+        }
+    }
+}

src/common/UITestAutomation/Element/TextBox.cs

@@ -36,6 +36,7 @@ namespace Microsoft.PowerToys.UITest
                     windowElement.SendKeys(OpenQA.Selenium.Keys.Control + "a");
                     windowElement.SendKeys(OpenQA.Selenium.Keys.Delete);
                 });
+                Task.Delay(500).Wait();
             }
 
             PerformAction((actions, windowElement) =>

src/common/UITestAutomation/Element/Thumb.cs

@@ -0,0 +1,36 @@
+// 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.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Appium.Windows;
+
+namespace Microsoft.PowerToys.UITest
+{
+    public class Thumb : Element
+    {
+        private static readonly string ExpectedControlType = "ControlType.Thumb";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Thumb"/> class.
+        /// </summary>
+        public Thumb()
+        {
+            this.TargetControlType = Thumb.ExpectedControlType;
+        }
+
+        /// <summary>
+        /// Drag element move offset.
+        /// </summary>
+        /// <param name="offsetX">The offsetX to move.</param>
+        /// <param name="offsetY">The offsetY to move.</param>
+        public void Drag(int offsetX, int offsetY)
+        {
+            PerformAction((actions, windowElement) =>
+            {
+                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
+                actions.Build().Perform();
+            });
+        }
+    }
+}

src/common/UITestAutomation/KeyboardHelper.cs

@@ -299,10 +299,134 @@ namespace Microsoft.PowerToys.UITest
                     return 0x10;  // Shift Key - 0x10 in hex
                 case Key.LCtrl:
                     return 0xA2;  // Left Ctrl Key - 0xA2 in hex
-                case Key.RCtrl: // Right Ctrl Key - 0xA3 in hex
-                    return 0xA3;
+                case Key.RCtrl:
+                    return 0xA3;  // Right Ctrl Key - 0xA3 in hex
                 case Key.A:
                     return 0x41;  // A Key - 0x41 in hex
+                case Key.B:
+                    return 0x42;  // B Key - 0x42 in hex
+                case Key.C:
+                    return 0x43;  // C Key - 0x43 in hex
+                case Key.D:
+                    return 0x44;  // D Key - 0x44 in hex
+                case Key.E:
+                    return 0x45;  // E Key - 0x45 in hex
+                case Key.F:
+                    return 0x46;  // F Key - 0x46 in hex
+                case Key.G:
+                    return 0x47;  // G Key - 0x47 in hex
+                case Key.H:
+                    return 0x48;  // H Key - 0x48 in hex
+                case Key.I:
+                    return 0x49;  // I Key - 0x49 in hex
+                case Key.J:
+                    return 0x4A;  // J Key - 0x4A in hex
+                case Key.K:
+                    return 0x4B;  // K Key - 0x4B in hex
+                case Key.L:
+                    return 0x4C;  // L Key - 0x4C in hex
+                case Key.M:
+                    return 0x4D;  // M Key - 0x4D in hex
+                case Key.N:
+                    return 0x4E;  // N Key - 0x4E in hex
+                case Key.O:
+                    return 0x4F;  // O Key - 0x4F in hex
+                case Key.P:
+                    return 0x50;  // P Key - 0x50 in hex
+                case Key.Q:
+                    return 0x51;  // Q Key - 0x51 in hex
+                case Key.R:
+                    return 0x52;  // R Key - 0x52 in hex
+                case Key.S:
+                    return 0x53;  // S Key - 0x53 in hex
+                case Key.T:
+                    return 0x54;  // T Key - 0x54 in hex
+                case Key.U:
+                    return 0x55;  // U Key - 0x55 in hex
+                case Key.V:
+                    return 0x56;  // V Key - 0x56 in hex
+                case Key.W:
+                    return 0x57;  // W Key - 0x57 in hex
+                case Key.X:
+                    return 0x58;  // X Key - 0x58 in hex
+                case Key.Y:
+                    return 0x59;  // Y Key - 0x59 in hex
+                case Key.Z:
+                    return 0x5A;  // Z Key - 0x5A in hex
+                case Key.Num0:
+                    return 0x30;  // 0 Key - 0x30 in hex
+                case Key.Num1:
+                    return 0x31;  // 1 Key - 0x31 in hex
+                case Key.Num2:
+                    return 0x32;  // 2 Key - 0x32 in hex
+                case Key.Num3:
+                    return 0x33;  // 3 Key - 0x33 in hex
+                case Key.Num4:
+                    return 0x34;  // 4 Key - 0x34 in hex
+                case Key.Num5:
+                    return 0x35;  // 5 Key - 0x35 in hex
+                case Key.Num6:
+                    return 0x36;  // 6 Key - 0x36 in hex
+                case Key.Num7:
+                    return 0x37;  // 7 Key - 0x37 in hex
+                case Key.Num8:
+                    return 0x38;  // 8 Key - 0x38 in hex
+                case Key.Num9:
+                    return 0x39;  // 9 Key - 0x39 in hex
+                case Key.F1:
+                    return 0x70;  // F1 Key - 0x70 in hex
+                case Key.F2:
+                    return 0x71;  // F2 Key - 0x71 in hex
+                case Key.F3:
+                    return 0x72;  // F3 Key - 0x72 in hex
+                case Key.F4:
+                    return 0x73;  // F4 Key - 0x73 in hex
+                case Key.F5:
+                    return 0x74;  // F5 Key - 0x74 in hex
+                case Key.F6:
+                    return 0x75;  // F6 Key - 0x75 in hex
+                case Key.F7:
+                    return 0x76;  // F7 Key - 0x76 in hex
+                case Key.F8:
+                    return 0x77;  // F8 Key - 0x77 in hex
+                case Key.F9:
+                    return 0x78;  // F9 Key - 0x78 in hex
+                case Key.F10:
+                    return 0x79;  // F10 Key - 0x79 in hex
+                case Key.F11:
+                    return 0x7A;  // F11 Key - 0x7A in hex
+                case Key.F12:
+                    return 0x7B;  // F12 Key - 0x7B in hex
+                case Key.Up:
+                    return 0x26;  // Up Arrow Key - 0x26 in hex
+                case Key.Down:
+                    return 0x28;  // Down Arrow Key - 0x28 in hex
+                case Key.Left:
+                    return 0x25;  // Left Arrow Key - 0x25 in hex
+                case Key.Right:
+                    return 0x27;  // Right Arrow Key - 0x27 in hex
+                case Key.Home:
+                    return 0x24;  // Home Key - 0x24 in hex
+                case Key.End:
+                    return 0x23;  // End Key - 0x23 in hex
+                case Key.PageUp:
+                    return 0x21;  // Page Up Key - 0x21 in hex
+                case Key.PageDown:
+                    return 0x22;  // Page Down Key - 0x22 in hex
+                case Key.Space:
+                    return 0x20;  // Space Key - 0x20 in hex
+                case Key.Enter:
+                    return 0x0D;  // Enter Key - 0x0D in hex
+                case Key.Backspace:
+                    return 0x08;  // Backspace Key - 0x08 in hex
+                case Key.Tab:
+                    return 0x09;  // Tab Key - 0x09 in hex
+                case Key.Esc:
+                    return 0x1B;  // Escape Key - 0x1B in hex
+                case Key.Insert:
+                    return 0x2D;  // Insert Key - 0x2D in hex
+                case Key.Delete:
+                    return 0x2E;  // Delete Key - 0x2E in hex
                 default:
                     throw new ArgumentException($"Key {key} is not supported, Please add your key at TranslateKeyHex for translation to hex.");
             }

src/common/UITestAutomation/ModuleConfigData.cs

@@ -30,6 +30,7 @@ namespace Microsoft.PowerToys.UITest
         FancyZone,
         Hosts,
         Runner,
+        Workspaces,
     }
 
     /// <summary>
@@ -95,6 +96,7 @@ namespace Microsoft.PowerToys.UITest
                 [PowerToysModule.FancyZone] = "FancyZones Layout",
                 [PowerToysModule.Hosts] = "Hosts File Editor",
                 [PowerToysModule.Runner] = "PowerToys",
+                [PowerToysModule.Workspaces] = "Workspaces Editor",
             };
 
             // Exe start path for the module if it exists.
@@ -104,6 +106,7 @@ namespace Microsoft.PowerToys.UITest
                 [PowerToysModule.FancyZone] = @"\..\..\..\PowerToys.FancyZonesEditor.exe",
                 [PowerToysModule.Hosts] = @"\..\..\..\WinUI3Apps\PowerToys.Hosts.exe",
                 [PowerToysModule.Runner] = @"\..\..\..\PowerToys.exe",
+                [PowerToysModule.Workspaces] = @"\..\..\..\PowerToys.WorkspacesEditor.exe",
             };
         }
 

src/common/UITestAutomation/MonitorInfoData.cs

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.PowerToys.UITest
+{
+    public class MonitorInfoData
+    {
+        public MonitorInfoData()
+        {
+        }
+
+        public struct MonitorInfoDataWrapper
+        {
+            public string DeviceName { get; set; }
+
+            public string DeviceString { get; set; }
+
+            public string DeviceID { get; set; }
+
+            public string DeviceKey { get; set; }
+
+            public int PelsWidth { get; set; }
+
+            public int PelsHeight { get; set; }
+
+            public int DisplayFrequency { get; set; }
+        }
+
+        public struct ParamsWrapper
+        {
+            public List<MonitorInfoDataWrapper> Monitors { get; set; }
+        }
+    }
+}

src/common/UITestAutomation/Session.cs

@@ -10,6 +10,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
+using static Microsoft.PowerToys.UITest.WindowHelper;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -22,8 +23,6 @@ namespace Microsoft.PowerToys.UITest
 
         private WindowsDriver<WindowsElement> WindowsDriver { get; set; }
 
-        private const string AdministratorPrefix = "Administrator: ";
-
         private List<IntPtr> windowHandlers = new List<IntPtr>();
 
         private Window? MainWindow { get; set; }
@@ -33,6 +32,11 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public IntPtr MainWindowHandler { get; private set; }
 
+        /// <summary>
+        /// Gets Init Scope
+        /// </summary>
+        public PowerToysModule InitScope { get; private set; }
+
         /// <summary>
         /// Gets the RunAsAdmin flag.
         /// If true, the session is running as admin.
@@ -46,9 +50,13 @@ namespace Microsoft.PowerToys.UITest
             this.MainWindowHandler = IntPtr.Zero;
             this.Root = root;
             this.WindowsDriver = windowsDriver;
+            this.InitScope = scope;
 
-            // Attach to the scope & reset MainWindowHandler
-            this.Attach(scope, size);
+            if (size != WindowSize.UnSpecified)
+            {
+                // Attach to the scope & reset MainWindowHandler
+                this.Attach(scope, size);
+            }
         }
 
         /// <summary>
@@ -56,29 +64,6 @@ namespace Microsoft.PowerToys.UITest
         /// </summary>
         public void Cleanup()
         {
-            /*
-            foreach (var windowHandle in this.windowHandlers)
-            {
-                if (windowHandle == IntPtr.Zero)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    var process = Process.GetProcessById((int)windowHandle);
-                    if (process != null && !process.HasExited)
-                    {
-                        process.Kill();
-                        process.WaitForExit();
-                    }
-                }
-                catch
-                {
-                }
-            }
-            */
-
             windowHandlers.Clear();
         }
 
@@ -89,13 +74,13 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(By by, int timeoutMS = 5000)
+        public T Find<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
             Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method Find<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
 
             // leverage findAll to filter out mismatched elements
-            var collection = this.FindAll<T>(by, timeoutMS);
+            var collection = this.FindAll<T>(by, timeoutMS, global);
 
             Assert.IsTrue(collection.Count > 0, $"UI-Element({typeof(T).Name}) not found using selector: {by}");
 
@@ -109,10 +94,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public T Find<T>(string name, int timeoutMS = 5000)
+        public T Find<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Find<T>(By.Name(name), timeoutMS);
+            return this.Find<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -121,9 +106,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public Element Find(By by, int timeoutMS = 5000)
+        public Element Find(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Find<Element>(by, timeoutMS);
+            return this.Find<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -132,9 +117,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        public Element Find(string name, int timeoutMS = 5000)
+        public Element Find(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Find<Element>(By.Name(name), timeoutMS);
+            return this.Find<Element>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -144,10 +129,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 5000)
+        public bool HasOne<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.FindAll<T>(by, timeoutMS).Count == 1;
+            return this.FindAll<T>(by, timeoutMS, global).Count == 1;
         }
 
         /// <summary>
@@ -156,9 +141,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 5000)
+        public bool HasOne(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.HasOne<Element>(by, timeoutMS);
+            return this.HasOne<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -168,10 +153,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 5000)
+        public bool HasOne<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.HasOne<T>(By.Name(name), timeoutMS);
+            return this.HasOne<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -180,9 +165,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 5000)
+        public bool HasOne(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.HasOne<Element>(By.Name(name), timeoutMS);
+            return this.HasOne<Element>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -192,10 +177,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 5000)
+        public bool Has<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.FindAll<T>(by, timeoutMS).Count >= 1;
+            return this.FindAll<T>(by, timeoutMS, global).Count >= 1;
         }
 
         /// <summary>
@@ -204,9 +189,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 5000)
+        public bool Has(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Has<Element>(by, timeoutMS);
+            return this.Has<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -216,10 +201,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 5000)
+        public bool Has<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Has<T>(By.Name(name), timeoutMS);
+            return this.Has<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -228,9 +213,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 5000)
+        public bool Has(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Has<Element>(name, timeoutMS);
+            return this.Has<Element>(name, timeoutMS, global);
         }
 
         /// <summary>
@@ -240,25 +225,26 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
+        public ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            Assert.IsNotNull(this.WindowsDriver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
+            var driver = global ? this.Root : this.WindowsDriver;
+            Assert.IsNotNull(driver, $"WindowsElement is null in method FindAll<{typeof(T).Name}> with parameters: by = {by}, timeoutMS = {timeoutMS}");
             var foundElements = FindHelper.FindAll<T, WindowsElement>(
                 () =>
                 {
                     if (by.GetIsAccessibilityId())
                     {
-                        var elements = this.WindowsDriver.FindElementsByAccessibilityId(by.GetAccessibilityId());
+                        var elements = driver.FindElementsByAccessibilityId(by.GetAccessibilityId());
                         return elements;
                     }
                     else
                     {
-                        var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
+                        var elements = driver.FindElements(by.ToSeleniumBy());
                         return elements;
                     }
                 },
-                this.WindowsDriver,
+                driver,
                 timeoutMS);
 
             return foundElements ?? new ReadOnlyCollection<T>([]);
@@ -272,10 +258,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
+        public ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.FindAll<T>(By.Name(name), timeoutMS);
+            return this.FindAll<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -285,9 +271,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
+        public ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.FindAll<Element>(by, timeoutMS);
+            return this.FindAll<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -297,102 +283,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
+        public ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.FindAll<Element>(By.Name(name), timeoutMS);
-        }
-
-        /// <summary>
-        /// Sets the main window size.
-        /// </summary>
-        /// <param name="size">WindowSize enum</param>
-        public void SetMainWindowSize(WindowSize size)
-        {
-            if (size == WindowSize.UnSpecified)
-            {
-                return;
-            }
-
-            int width = 0, height = 0;
-
-            switch (size)
-            {
-                case WindowSize.Small:
-                    width = 640;
-                    height = 480;
-                    break;
-                case WindowSize.Small_Vertical:
-                    width = 480;
-                    height = 640;
-                    break;
-                case WindowSize.Medium:
-                    width = 1024;
-                    height = 768;
-                    break;
-                case WindowSize.Medium_Vertical:
-                    width = 768;
-                    height = 1024;
-                    break;
-                case WindowSize.Large:
-                    width = 1920;
-                    height = 1080;
-                    break;
-                case WindowSize.Large_Vertical:
-                    width = 1080;
-                    height = 1920;
-                    break;
-            }
-
-            if (width > 0 && height > 0)
-            {
-                this.SetMainWindowSize(width, height);
-            }
-        }
-
-        /// <summary>
-        /// Gets the main window center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public (int CenterX, int CenterY) GetWindowCenter()
-        {
-            if (this.MainWindowHandler == IntPtr.Zero)
-            {
-                return (0, 0);
-            }
-            else
-            {
-                var rect = ApiHelper.GetWindowCenter(this.MainWindowHandler);
-                return (rect.CenterX, rect.CenterY);
-            }
-        }
-
-        /// <summary>
-        /// Gets the screen center coordinates.
-        /// </summary>
-        /// <returns>(x, y)</returns>
-        public (int CenterX, int CenterY) GetScreenCenter()
-        {
-            return ApiHelper.GetScreenCenter();
-        }
-
-        /// <summary>
-        /// Sets the main window size based on Width and Height.
-        /// </summary>
-        /// <param name="width">the width in pixel</param>
-        /// <param name="height">the height in pixel</param>
-        public void SetMainWindowSize(int width, int height)
-        {
-            if (this.MainWindowHandler == IntPtr.Zero
-                || width <= 0
-                || height <= 0)
-            {
-                return;
-            }
-
-            ApiHelper.SetWindowPos(this.MainWindowHandler, IntPtr.Zero, 0, 0, width, height, ApiHelper.SetWindowPosNoZorder | ApiHelper.SetWindowPosShowWindow);
-
-            // Wait for 1000ms after resize
-            Task.Delay(1000).Wait();
+            return this.FindAll<Element>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -407,53 +300,6 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public Color GetPixelColor(int x, int y)
-        {
-            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
-            uint pixel = ApiHelper.GetPixel(hdc, x, y);
-            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
-
-            int r = (int)(pixel & 0x000000FF);
-            int g = (int)((pixel & 0x0000FF00) >> 8);
-            int b = (int)((pixel & 0x00FF0000) >> 16);
-
-            return Color.FromArgb(r, g, b);
-        }
-
-        /// <summary>
-        /// Retrieves the color of the pixel at the specified screen coordinates as a string.
-        /// </summary>
-        /// <param name="x">The X coordinate on the screen.</param>
-        /// <param name="y">The Y coordinate on the screen.</param>
-        /// <returns>The color of the pixel at the specified coordinates.</returns>
-        public string GetPixelColorString(int x, int y)
-        {
-            Color color = this.GetPixelColor(x, y);
-            return $"#{color.R:X2}{color.G:X2}{color.B:X2}";
-        }
-
-        /// <summary>
-        /// Gets the size of the display.
-        /// </summary>
-        /// <returns>
-        /// A tuple containing the width and height of the display.
-        /// </returns
-        public Tuple<int, int> GetDisplaySize()
-        {
-            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
-            int screenWidth = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPHORZRES);
-            int screenHeight = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPVERTRES);
-            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
-
-            return Tuple.Create(screenWidth, screenHeight);
-        }
-
         /// <summary>
         /// Sends a combination of keys.
         /// </summary>
@@ -633,7 +479,7 @@ namespace Microsoft.PowerToys.UITest
             if (this.Root != null)
             {
                 // search window handler by window title (admin and non-admin titles)
-                var matchingWindows = ApiHelper.FindDesktopWindowHandler([windowName, AdministratorPrefix + windowName]);
+                var matchingWindows = WindowHelper.ApiHelper.FindDesktopWindowHandler([windowName, WindowHelper.AdministratorPrefix + windowName]);
                 if (matchingWindows.Count == 0 || matchingWindows[0].HWnd == IntPtr.Zero)
                 {
                     Assert.Fail($"Failed to attach. Window '{windowName}' not found");
@@ -641,7 +487,7 @@ namespace Microsoft.PowerToys.UITest
 
                 // pick one from matching windows
                 this.MainWindowHandler = matchingWindows[0].HWnd;
-                this.IsElevated = matchingWindows[0].Title.StartsWith(AdministratorPrefix);
+                this.IsElevated = matchingWindows[0].Title.StartsWith(WindowHelper.AdministratorPrefix);
 
                 ApiHelper.SetForegroundWindow(this.MainWindowHandler);
 
@@ -656,7 +502,7 @@ namespace Microsoft.PowerToys.UITest
 
                 if (size != WindowSize.UnSpecified)
                 {
-                    this.SetMainWindowSize(size);
+                    WindowHelper.SetWindowSize(this.MainWindowHandler, size);
                 }
 
                 // Set MainWindow
@@ -670,143 +516,28 @@ namespace Microsoft.PowerToys.UITest
             return this;
         }
 
-        public bool IsWindowOpen(string windowName)
+        /// <summary>
+        /// Sets the main window size.
+        /// </summary>
+        /// <param name="size">WindowSize enum</param>
+        public void SetMainWindowSize(WindowSize size)
         {
-            var matchingWindows = ApiHelper.FindDesktopWindowHandler([windowName, AdministratorPrefix + windowName]);
-            return matchingWindows.Count > 0;
+            if (this.MainWindowHandler == IntPtr.Zero)
+            {
+                // Attach to the scope & reset MainWindowHandler
+                this.Attach(this.InitScope);
+            }
+
+            WindowHelper.SetWindowSize(this.MainWindowHandler, size);
         }
 
-        private static class ApiHelper
+        /// <summary>
+        /// Gets the main window center coordinates.
+        /// </summary>
+        /// <returns>(x, y)</returns>
+        public (int CenterX, int CenterY) GetMainWindowCenter()
         {
-            [DllImport("user32.dll")]
-            public static extern bool SetForegroundWindow(IntPtr hWnd);
-
-            public const uint SetWindowPosNoMove = 0x0002;
-            public const uint SetWindowPosNoZorder = 0x0004;
-            public const uint SetWindowPosShowWindow = 0x0040;
-
-            [DllImport("user32.dll", SetLastError = true)]
-            public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
-
-            // Delegate for the EnumWindows callback function
-            private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
-
-            // P/Invoke declaration for EnumWindows
-            [DllImport("user32.dll")]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
-
-            // P/Invoke declaration for GetWindowTextLength
-            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            private static extern int GetWindowTextLength(IntPtr hWnd);
-
-            // P/Invoke declaration for GetWindowText
-            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-
-            [DllImport("user32.dll")]
-            public static extern IntPtr GetDC(IntPtr hWnd);
-
-            [DllImport("gdi32.dll")]
-            public static extern uint GetPixel(IntPtr hdc, int x, int y);
-
-            [DllImport("gdi32.dll")]
-            public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
-
-            public const int DESKTOPHORZRES = 118;
-            public const int DESKTOPVERTRES = 117;
-
-            [DllImport("user32.dll")]
-            public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-            // Define the Win32 RECT structure
-            [StructLayout(LayoutKind.Sequential)]
-            public struct RECT
-            {
-                public int Left;    // X coordinate of the left edge of the window
-                public int Top;     // Y coordinate of the top edge of the window
-                public int Right;   // X coordinate of the right edge of the window
-                public int Bottom;  // Y coordinate of the bottom edge of the window
-            }
-
-            // Import GetWindowRect API to retrieve window's screen coordinates
-            [DllImport("user32.dll")]
-            public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-            public static List<(IntPtr HWnd, string Title)> FindDesktopWindowHandler(string[] matchingWindowsTitles)
-            {
-                var windows = new List<(IntPtr HWnd, string Title)>();
-
-                _ = EnumWindows(
-                    (hWnd, lParam) =>
-                    {
-                        int length = GetWindowTextLength(hWnd);
-                        if (length > 0)
-                        {
-                            var builder = new StringBuilder(length + 1);
-                            _ = GetWindowText(hWnd, builder, builder.Capacity);
-
-                            var title = builder.ToString();
-                            if (matchingWindowsTitles.Contains(title))
-                            {
-                                windows.Add((hWnd, title));
-                            }
-                        }
-
-                        return true; // Continue enumeration
-                    },
-                    IntPtr.Zero);
-
-                return windows;
-            }
-
-            /// <summary>
-            /// Get the center point coordinates of a specified window (in screen coordinates)
-            /// </summary>
-            /// <param name="hWnd">The window handle</param>
-            /// <returns>The center point (x, y)</returns>
-            public static (int CenterX, int CenterY) GetWindowCenter(IntPtr hWnd)
-            {
-                if (hWnd == IntPtr.Zero)
-                {
-                    throw new ArgumentException("Invalid window handle");
-                }
-
-                if (GetWindowRect(hWnd, out RECT rect))
-                {
-                    int width = rect.Right - rect.Left;
-                    int height = rect.Bottom - rect.Top;
-
-                    int centerX = rect.Left + (width / 2);
-                    int centerY = rect.Top + (height / 2);
-
-                    return (centerX, centerY);
-                }
-                else
-                {
-                    throw new InvalidOperationException("Failed to retrieve window coordinates");
-                }
-            }
-
-            [DllImport("user32.dll")]
-            public static extern int GetSystemMetrics(int nIndex);
-
-            public enum SystemMetric
-            {
-                ScreenWidth = 0,            // Width of the primary screen in pixels (SM_CXSCREEN)
-                ScreenHeight = 1,           // Height of the primary screen in pixels (SM_CYSCREEN)
-                VirtualScreenWidth = 78,    // Width of the virtual screen that includes all monitors (SM_CXVIRTUALSCREEN)
-                VirtualScreenHeight = 79,   // Height of the virtual screen that includes all monitors (SM_CYVIRTUALSCREEN)
-                MonitorCount = 80,          // Number of display monitors (SM_CMONITORS, available on Windows XP+)
-            }
-
-            public static (int CenterX, int CenterY) GetScreenCenter()
-            {
-                int width = GetSystemMetrics((int)SystemMetric.ScreenWidth);
-                int height = GetSystemMetrics((int)SystemMetric.ScreenHeight);
-
-                return (width / 2, height / 2);
-            }
+            return WindowHelper.GetWindowCenter(this.MainWindowHandler);
         }
 
         public void StartExe(string executablePath, string arguments = "", int msPreAction = 0, int msPostAction = 2000)

src/common/UITestAutomation/SessionHelper.cs

@@ -57,6 +57,7 @@ namespace Microsoft.PowerToys.UITest
 
             if (scope == PowerToysModule.PowerToysSettings)
             {
+                this.ExitExe(runnerProcessInfo.FileName);
                 this.runner = Process.Start(runnerProcessInfo);
             }
 
@@ -137,12 +138,30 @@ namespace Microsoft.PowerToys.UITest
         {
             var opts = new AppiumOptions();
             opts.AddAdditionalCapability("app", appPath);
-            opts.AddAdditionalCapability("ms:waitForAppLaunch", "5");
-            this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
 
-            // Set default timeout to 5 seconds
-            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
-        }
+            // Create driver with retry
+            var timeout = TimeSpan.FromMinutes(2);
+            var retryInterval = TimeSpan.FromSeconds(5);
+            DateTime startTime = DateTime.Now;
+
+            while (true)
+            {
+                try
+                {
+                    this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
+                    break;
+                }
+                catch (Exception)
+                {
+                    if (DateTime.Now - startTime > timeout)
+                    {
+                        throw;
+                    }
+
+                    Task.Delay(retryInterval).Wait();
+                }
+            }
+        }
 
         /// <summary>
         /// Exit now exe.

src/common/UITestAutomation/UITestAutomation.csproj

@@ -17,6 +17,9 @@
     <PackageReference Include="Appium.WebDriver" />
     <PackageReference Include="MSTest" />
     <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="System.Net.Http" />
+    <PackageReference Include="System.Private.Uri" />
+    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 
 </Project>

src/common/UITestAutomation/UITestBase.cs

@@ -15,6 +15,7 @@ using OpenQA.Selenium.Appium.Windows;
 using Windows.Devices.Display.Core;
 using Windows.Foundation.Metadata;
 using static Microsoft.PowerToys.UITest.UITestBase.NativeMethods;
+using static Microsoft.PowerToys.UITest.WindowHelper;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -28,6 +29,8 @@ namespace Microsoft.PowerToys.UITest
 
         public required Session Session { get; set; }
 
+        public static MonitorInfoData.ParamsWrapper MonitorInfoData { get; set; } = new MonitorInfoData.ParamsWrapper() { Monitors = new List<MonitorInfoData.MonitorInfoDataWrapper>() };
+
         private readonly bool isInPipeline;
         private readonly PowerToysModule scope;
         private readonly WindowSize size;
@@ -43,7 +46,7 @@ namespace Microsoft.PowerToys.UITest
             Console.WriteLine($"Running tests on platform: {Environment.GetEnvironmentVariable("platform")}");
             if (isInPipeline)
             {
-                NativeMethods.ChangeDispalyResolution();
+                NativeMethods.ChangeDisplayResolution(1920, 1080);
                 NativeMethods.GetMonitorInfo();
 
                 // Escape Popups before starting
@@ -67,6 +70,9 @@ namespace Microsoft.PowerToys.UITest
 
                 // Take screenshot every 1 second
                 screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, screenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
+
+                // Escape Popups before starting
+                System.Windows.Forms.SendKeys.SendWait("{ESC}");
             }
 
             this.sessionHelper = new SessionHelper(scope).Init();
@@ -120,10 +126,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected T Find<T>(By by, int timeoutMS = 5000)
+        protected T Find<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.Find<T>(by, timeoutMS);
+            return this.Session.Find<T>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -133,10 +139,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected T Find<T>(string name, int timeoutMS = 5000)
+        protected T Find<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.Find<T>(By.Name(name), timeoutMS);
+            return this.Session.Find<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -145,9 +151,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected Element Find(By by, int timeoutMS = 5000)
+        protected Element Find(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.Find(by, timeoutMS);
+            return this.Session.Find(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -156,9 +162,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>The found element.</returns>
-        protected Element Find(string name, int timeoutMS = 5000)
+        protected Element Find(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.Find(name, timeoutMS);
+            return this.Session.Find(name, timeoutMS, global);
         }
 
         /// <summary>
@@ -168,10 +174,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(By by, int timeoutMS = 5000)
+        public bool HasOne<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.FindAll<T>(by, timeoutMS).Count == 1;
+            return this.FindAll<T>(by, timeoutMS, global).Count == 1;
         }
 
         /// <summary>
@@ -180,9 +186,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(By by, int timeoutMS = 5000)
+        public bool HasOne(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.HasOne<Element>(by, timeoutMS);
+            return this.Session.HasOne<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -192,10 +198,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne<T>(string name, int timeoutMS = 5000)
+        public bool HasOne<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.HasOne<T>(By.Name(name), timeoutMS);
+            return this.Session.HasOne<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -204,9 +210,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if only has one element, otherwise false.</returns>
-        public bool HasOne(string name, int timeoutMS = 5000)
+        public bool HasOne(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.HasOne<Element>(name, timeoutMS);
+            return this.Session.HasOne<Element>(name, timeoutMS, global);
         }
 
         /// <summary>
@@ -216,10 +222,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(By by, int timeoutMS = 5000)
+        public bool Has<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.FindAll<T>(by, timeoutMS).Count >= 1;
+            return this.Session.FindAll<T>(by, timeoutMS, global).Count >= 1;
         }
 
         /// <summary>
@@ -228,9 +234,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(By by, int timeoutMS = 5000)
+        public bool Has(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.Has<Element>(by, timeoutMS);
+            return this.Session.Has<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -240,10 +246,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has<T>(string name, int timeoutMS = 5000)
+        public bool Has<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.Has<T>(By.Name(name), timeoutMS);
+            return this.Session.Has<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -252,9 +258,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the element.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>True if  has one or more element, otherwise false.</returns>
-        public bool Has(string name, int timeoutMS = 5000)
+        public bool Has(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.Has<Element>(name, timeoutMS);
+            return this.Session.Has<Element>(name, timeoutMS, global);
         }
 
         /// <summary>
@@ -265,10 +271,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000)
+        protected ReadOnlyCollection<T> FindAll<T>(By by, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.FindAll<T>(by, timeoutMS);
+            return this.Session.FindAll<T>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -279,10 +285,10 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000)
+        protected ReadOnlyCollection<T> FindAll<T>(string name, int timeoutMS = 5000, bool global = false)
             where T : Element, new()
         {
-            return this.Session.FindAll<T>(By.Name(name), timeoutMS);
+            return this.Session.FindAll<T>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -292,9 +298,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="by">The selector to find the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000)
+        protected ReadOnlyCollection<Element> FindAll(By by, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.FindAll<Element>(by, timeoutMS);
+            return this.Session.FindAll<Element>(by, timeoutMS, global);
         }
 
         /// <summary>
@@ -304,9 +310,9 @@ namespace Microsoft.PowerToys.UITest
         /// <param name="name">The name of the elements.</param>
         /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
         /// <returns>A read-only collection of the found elements.</returns>
-        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000)
+        protected ReadOnlyCollection<Element> FindAll(string name, int timeoutMS = 5000, bool global = false)
         {
-            return this.Session.FindAll<Element>(By.Name(name), timeoutMS);
+            return this.Session.FindAll<Element>(By.Name(name), timeoutMS, global);
         }
 
         /// <summary>
@@ -332,7 +338,18 @@ namespace Microsoft.PowerToys.UITest
         /// <returns>The color of the pixel at the specified coordinates.</returns>
         public Color GetPixelColor(int x, int y)
         {
-            return this.Session.GetPixelColor(x, y);
+            return WindowHelper.GetPixelColor(x, y);
+        }
+
+        /// <summary>
+        /// Retrieves the color of the pixel at the specified screen coordinates as a string.
+        /// </summary>
+        /// <param name="x">The X coordinate on the screen.</param>
+        /// <param name="y">The Y coordinate on the screen.</param>
+        /// <returns>The color of the pixel at the specified coordinates.</returns>
+        public string GetPixelColorString(int x, int y)
+        {
+            return WindowHelper.GetPixelColorString(x, y);
         }
 
         /// <summary>
@@ -343,7 +360,7 @@ namespace Microsoft.PowerToys.UITest
         /// </returns
         public Tuple<int, int> GetDisplaySize()
         {
-            return this.Session.GetDisplaySize();
+            return WindowHelper.GetDisplaySize();
         }
 
         /// <summary>
@@ -373,6 +390,20 @@ namespace Microsoft.PowerToys.UITest
             return this.Session.GetMousePosition();
         }
 
+        /// <summary>
+        /// Gets the screen center coordinates.
+        /// </summary>
+        /// <returns>(x, y)</returns>
+        public (int CenterX, int CenterY) GetScreenCenter()
+        {
+            return WindowHelper.GetScreenCenter();
+        }
+
+        public bool IsWindowOpen(string windowName)
+        {
+            return WindowHelper.IsWindowOpen(windowName);
+        }
+
         /// <summary>
         /// Moves the mouse cursor to the specified screen coordinates.
         /// </summary>
@@ -513,6 +544,16 @@ namespace Microsoft.PowerToys.UITest
                     int modeNum = 0;
                     while (EnumDisplaySettings(d.DeviceName, modeNum, ref dm) > 0)
                     {
+                        MonitorInfoData.Monitors.Add(new MonitorInfoData.MonitorInfoDataWrapper()
+                        {
+                            DeviceName = d.DeviceName,
+                            DeviceString = d.DeviceString,
+                            DeviceID = d.DeviceID,
+                            DeviceKey = d.DeviceKey,
+                            PelsWidth = dm.DmPelsWidth,
+                            PelsHeight = dm.DmPelsHeight,
+                            DisplayFrequency = dm.DmDisplayFrequency,
+                        });
                         Console.WriteLine($"  mode {modeNum}: {dm.DmPelsWidth}x{dm.DmPelsHeight} @ {dm.DmDisplayFrequency}Hz");
                         modeNum++;
                     }
@@ -522,10 +563,10 @@ namespace Microsoft.PowerToys.UITest
                 }
             }
 
-            public static void ChangeDispalyResolution()
+            public static void ChangeDisplayResolution(int PelsWidth, int PelsHeight)
             {
                 Screen screen = Screen.PrimaryScreen!;
-                if (screen.Bounds.Width == 1920 && screen.Bounds.Height == 1080)
+                if (screen.Bounds.Width == PelsWidth && screen.Bounds.Height == PelsHeight)
                 {
                     return;
                 }
@@ -542,8 +583,8 @@ namespace Microsoft.PowerToys.UITest
                     modeNum++;
                 }
 
-                devMode.DmPelsWidth = 1920;
-                devMode.DmPelsHeight = 1080;
+                devMode.DmPelsWidth = PelsWidth;
+                devMode.DmPelsHeight = PelsHeight;
 
                 int result = NativeMethods.ChangeDisplaySettings(ref devMode, NativeMethods.CDS_TEST);
 

src/common/UITestAutomation/WindowHelper.cs

@@ -0,0 +1,297 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerToys.UITest
+{
+    internal static class WindowHelper
+    {
+        internal const string AdministratorPrefix = "Administrator: ";
+
+        /// <summary>
+        /// Sets the main window size.
+        /// </summary>
+        /// <param name="size">WindowSize enum</param>
+        public static void SetWindowSize(IntPtr windowHandler, WindowSize size)
+        {
+            if (size == WindowSize.UnSpecified)
+            {
+                return;
+            }
+
+            int width = 0, height = 0;
+
+            switch (size)
+            {
+                case WindowSize.Small:
+                    width = 640;
+                    height = 480;
+                    break;
+                case WindowSize.Small_Vertical:
+                    width = 480;
+                    height = 640;
+                    break;
+                case WindowSize.Medium:
+                    width = 1024;
+                    height = 768;
+                    break;
+                case WindowSize.Medium_Vertical:
+                    width = 768;
+                    height = 1024;
+                    break;
+                case WindowSize.Large:
+                    width = 1920;
+                    height = 1080;
+                    break;
+                case WindowSize.Large_Vertical:
+                    width = 1080;
+                    height = 1920;
+                    break;
+            }
+
+            if (width > 0 && height > 0)
+            {
+                WindowHelper.SetMainWindowSize(windowHandler, width, height);
+            }
+        }
+
+        /// <summary>
+        /// Gets the main window center coordinates.
+        /// </summary>
+        /// <returns>(x, y)</returns>
+        public static (int CenterX, int CenterY) GetWindowCenter(IntPtr windowHandler)
+        {
+            if (windowHandler == IntPtr.Zero)
+            {
+                return (0, 0);
+            }
+            else
+            {
+                var rect = ApiHelper.GetWindowCenter(windowHandler);
+                return (rect.CenterX, rect.CenterY);
+            }
+        }
+
+        /// <summary>
+        /// Gets the screen center coordinates.
+        /// </summary>
+        /// <returns>(x, y)</returns>
+        public static (int CenterX, int CenterY) GetScreenCenter()
+        {
+            return ApiHelper.GetScreenCenter();
+        }
+
+        /// <summary>
+        /// Sets the main window size based on Width and Height.
+        /// </summary>
+        /// <param name="width">the width in pixel</param>
+        /// <param name="height">the height in pixel</param>
+        public static void SetMainWindowSize(IntPtr windowHandler, int width, int height)
+        {
+            if (windowHandler == IntPtr.Zero
+                || width <= 0
+                || height <= 0)
+            {
+                return;
+            }
+
+            ApiHelper.SetWindowPos(windowHandler, IntPtr.Zero, 0, 0, width, height, ApiHelper.SetWindowPosNoZorder | ApiHelper.SetWindowPosShowWindow);
+
+            // Wait for 1000ms after resize
+            Task.Delay(1000).Wait();
+        }
+
+        /// <summary>
+        /// Retrieves the color of the pixel at the specified screen coordinates.
+        /// </summary>
+        /// <param name="x">The X coordinate on the screen.</param>
+        /// <param name="y">The Y coordinate on the screen.</param>
+        /// <returns>The color of the pixel at the specified coordinates.</returns>
+        public static Color GetPixelColor(int x, int y)
+        {
+            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
+            uint pixel = ApiHelper.GetPixel(hdc, x, y);
+            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
+
+            int r = (int)(pixel & 0x000000FF);
+            int g = (int)((pixel & 0x0000FF00) >> 8);
+            int b = (int)((pixel & 0x00FF0000) >> 16);
+
+            return Color.FromArgb(r, g, b);
+        }
+
+        /// <summary>
+        /// Retrieves the color of the pixel at the specified screen coordinates as a string.
+        /// </summary>
+        /// <param name="x">The X coordinate on the screen.</param>
+        /// <param name="y">The Y coordinate on the screen.</param>
+        /// <returns>The color of the pixel at the specified coordinates.</returns>
+        public static string GetPixelColorString(int x, int y)
+        {
+            Color color = WindowHelper.GetPixelColor(x, y);
+            return $"#{color.R:X2}{color.G:X2}{color.B:X2}";
+        }
+
+        /// <summary>
+        /// Gets the size of the display.
+        /// </summary>
+        /// <returns>
+        /// A tuple containing the width and height of the display.
+        /// </returns
+        public static Tuple<int, int> GetDisplaySize()
+        {
+            IntPtr hdc = ApiHelper.GetDC(IntPtr.Zero);
+            int screenWidth = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPHORZRES);
+            int screenHeight = ApiHelper.GetDeviceCaps(hdc, ApiHelper.DESKTOPVERTRES);
+            _ = ApiHelper.ReleaseDC(IntPtr.Zero, hdc);
+
+            return Tuple.Create(screenWidth, screenHeight);
+        }
+
+        public static bool IsWindowOpen(string windowName)
+        {
+            var matchingWindows = ApiHelper.FindDesktopWindowHandler([windowName, AdministratorPrefix + windowName]);
+            return matchingWindows.Count > 0;
+        }
+
+        internal static class ApiHelper
+        {
+            [DllImport("user32.dll")]
+            public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+            public const uint SetWindowPosNoMove = 0x0002;
+            public const uint SetWindowPosNoZorder = 0x0004;
+            public const uint SetWindowPosShowWindow = 0x0040;
+
+            [DllImport("user32.dll", SetLastError = true)]
+            public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
+
+            // Delegate for the EnumWindows callback function
+            private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+            // P/Invoke declaration for EnumWindows
+            [DllImport("user32.dll")]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+            // P/Invoke declaration for GetWindowTextLength
+            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+            private static extern int GetWindowTextLength(IntPtr hWnd);
+
+            // P/Invoke declaration for GetWindowText
+            [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+            private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+            [DllImport("user32.dll")]
+            public static extern IntPtr GetDC(IntPtr hWnd);
+
+            [DllImport("gdi32.dll")]
+            public static extern uint GetPixel(IntPtr hdc, int x, int y);
+
+            [DllImport("gdi32.dll")]
+            public static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+            public const int DESKTOPHORZRES = 118;
+            public const int DESKTOPVERTRES = 117;
+
+            [DllImport("user32.dll")]
+            public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+            // Define the Win32 RECT structure
+            [StructLayout(LayoutKind.Sequential)]
+            public struct RECT
+            {
+                public int Left;    // X coordinate of the left edge of the window
+                public int Top;     // Y coordinate of the top edge of the window
+                public int Right;   // X coordinate of the right edge of the window
+                public int Bottom;  // Y coordinate of the bottom edge of the window
+            }
+
+            // Import GetWindowRect API to retrieve window's screen coordinates
+            [DllImport("user32.dll")]
+            public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+            public static List<(IntPtr HWnd, string Title)> FindDesktopWindowHandler(string[] matchingWindowsTitles)
+            {
+                var windows = new List<(IntPtr HWnd, string Title)>();
+
+                _ = EnumWindows(
+                    (hWnd, lParam) =>
+                    {
+                        int length = GetWindowTextLength(hWnd);
+                        if (length > 0)
+                        {
+                            var builder = new StringBuilder(length + 1);
+                            _ = GetWindowText(hWnd, builder, builder.Capacity);
+
+                            var title = builder.ToString();
+                            if (matchingWindowsTitles.Contains(title))
+                            {
+                                windows.Add((hWnd, title));
+                            }
+                        }
+
+                        return true; // Continue enumeration
+                    },
+                    IntPtr.Zero);
+
+                return windows;
+            }
+
+            /// <summary>
+            /// Get the center point coordinates of a specified window (in screen coordinates)
+            /// </summary>
+            /// <param name="hWnd">The window handle</param>
+            /// <returns>The center point (x, y)</returns>
+            public static (int CenterX, int CenterY) GetWindowCenter(IntPtr hWnd)
+            {
+                if (hWnd == IntPtr.Zero)
+                {
+                    throw new ArgumentException("Invalid window handle");
+                }
+
+                if (GetWindowRect(hWnd, out RECT rect))
+                {
+                    int width = rect.Right - rect.Left;
+                    int height = rect.Bottom - rect.Top;
+
+                    int centerX = rect.Left + (width / 2);
+                    int centerY = rect.Top + (height / 2);
+
+                    return (centerX, centerY);
+                }
+                else
+                {
+                    throw new InvalidOperationException("Failed to retrieve window coordinates");
+                }
+            }
+
+            [DllImport("user32.dll")]
+            public static extern int GetSystemMetrics(int nIndex);
+
+            public enum SystemMetric
+            {
+                ScreenWidth = 0,            // Width of the primary screen in pixels (SM_CXSCREEN)
+                ScreenHeight = 1,           // Height of the primary screen in pixels (SM_CYSCREEN)
+                VirtualScreenWidth = 78,    // Width of the virtual screen that includes all monitors (SM_CXVIRTUALSCREEN)
+                VirtualScreenHeight = 79,   // Height of the virtual screen that includes all monitors (SM_CYVIRTUALSCREEN)
+                MonitorCount = 80,          // Number of display monitors (SM_CMONITORS, available on Windows XP+)
+            }
+
+            public static (int CenterX, int CenterY) GetScreenCenter()
+            {
+                int width = GetSystemMetrics((int)SystemMetric.ScreenWidth);
+                int height = GetSystemMetrics((int)SystemMetric.ScreenHeight);
+
+                return (width / 2, height / 2);
+            }
+        }
+    }
+}

src/common/logger/logger_settings.h

@@ -8,49 +8,49 @@ struct LogSettings
     inline const static std::wstring logLevelOption = L"logLevel";
     inline const static std::string runnerLoggerName = "runner";
     inline const static std::wstring logPath = L"Logs\\";
-    inline const static std::wstring runnerLogPath = L"RunnerLogs\\runner-log.txt";
+    inline const static std::wstring runnerLogPath = L"RunnerLogs\\runner-log.log";
     inline const static std::string actionRunnerLoggerName = "action-runner";
-    inline const static std::wstring actionRunnerLogPath = L"RunnerLogs\\action-runner-log.txt";
+    inline const static std::wstring actionRunnerLogPath = L"RunnerLogs\\action-runner-log.log";
     inline const static std::string updateLoggerName = "update";
-    inline const static std::wstring updateLogPath = L"UpdateLogs\\update-log.txt";
+    inline const static std::wstring updateLogPath = L"UpdateLogs\\update-log.log";
     inline const static std::string fileExplorerLoggerName = "FileExplorer";
-    inline const static std::wstring fileExplorerLogPath = L"Logs\\file-explorer-log.txt";
+    inline const static std::wstring fileExplorerLogPath = L"Logs\\file-explorer-log.log";
     inline const static std::string gcodePrevLoggerName = "GcodePrevHandler";
-    inline const static std::wstring gcodePrevLogPath = L"logs\\FileExplorer_localLow\\GcodePreviewHandler\\gcode-prev-handler-log.txt";
+    inline const static std::wstring gcodePrevLogPath = L"logs\\FileExplorer_localLow\\GcodePreviewHandler\\gcode-prev-handler-log.log";
     inline const static std::string gcodeThumbLoggerName = "GcodeThumbnailProvider";
-    inline const static std::wstring gcodeThumbLogPath = L"logs\\FileExplorer_localLow\\GcodeThumbnailProvider\\gcode-thumbnail-provider-log.txt";
+    inline const static std::wstring gcodeThumbLogPath = L"logs\\FileExplorer_localLow\\GcodeThumbnailProvider\\gcode-thumbnail-provider-log.log";
     inline const static std::string mdPrevLoggerName = "MDPrevHandler";
-    inline const static std::wstring mdPrevLogPath = L"logs\\FileExplorer_localLow\\MDPrevHandler\\md-prev-handler-log.txt";
+    inline const static std::wstring mdPrevLogPath = L"logs\\FileExplorer_localLow\\MDPrevHandler\\md-prev-handler-log.log";
     inline const static std::string monacoPrevLoggerName = "MonacoPrevHandler";
-    inline const static std::wstring monacoPrevLogPath = L"logs\\FileExplorer_localLow\\MonacoPrevHandler\\monaco-prev-handler-log.txt";
+    inline const static std::wstring monacoPrevLogPath = L"logs\\FileExplorer_localLow\\MonacoPrevHandler\\monaco-prev-handler-log.log";
     inline const static std::string pdfPrevLoggerName = "PdfPrevHandler";
-    inline const static std::wstring pdfPrevLogPath = L"logs\\FileExplorer_localLow\\PdfPrevHandler\\pdf-prev-handler-log.txt";
+    inline const static std::wstring pdfPrevLogPath = L"logs\\FileExplorer_localLow\\PdfPrevHandler\\pdf-prev-handler-log.log";
     inline const static std::string pdfThumbLoggerName = "PdfThumbnailProvider";
-    inline const static std::wstring pdfThumbLogPath = L"logs\\FileExplorer_localLow\\PdfThumbnailProvider\\pdf-thumbnail-provider-log.txt";
+    inline const static std::wstring pdfThumbLogPath = L"logs\\FileExplorer_localLow\\PdfThumbnailProvider\\pdf-thumbnail-provider-log.log";
     inline const static std::string qoiPrevLoggerName = "QoiPrevHandler";
-    inline const static std::wstring qoiPrevLogPath = L"logs\\FileExplorer_localLow\\QoiPreviewHandler\\qoi-prev-handler-log.txt";
+    inline const static std::wstring qoiPrevLogPath = L"logs\\FileExplorer_localLow\\QoiPreviewHandler\\qoi-prev-handler-log.log";
     inline const static std::string qoiThumbLoggerName = "QoiThumbnailProvider";
-    inline const static std::wstring qoiThumbLogPath = L"logs\\FileExplorer_localLow\\QoiThumbnailProvider\\qoi-thumbnail-provider-log.txt";
+    inline const static std::wstring qoiThumbLogPath = L"logs\\FileExplorer_localLow\\QoiThumbnailProvider\\qoi-thumbnail-provider-log.log";
     inline const static std::string stlThumbLoggerName = "StlThumbnailProvider";
-    inline const static std::wstring stlThumbLogPath = L"logs\\FileExplorer_localLow\\StlThumbnailProvider\\stl-thumbnail-provider-log.txt";
+    inline const static std::wstring stlThumbLogPath = L"logs\\FileExplorer_localLow\\StlThumbnailProvider\\stl-thumbnail-provider-log.log";
     inline const static std::string svgPrevLoggerName = "SvgPrevHandler";
-    inline const static std::wstring svgPrevLogPath = L"logs\\FileExplorer_localLow\\SvgPrevHandler\\svg-prev-handler-log.txt";
+    inline const static std::wstring svgPrevLogPath = L"logs\\FileExplorer_localLow\\SvgPrevHandler\\svg-prev-handler-log.log";
     inline const static std::string svgThumbLoggerName = "SvgThumbnailProvider";
-    inline const static std::wstring svgThumbLogPath = L"logs\\FileExplorer_localLow\\SvgThumbnailProvider\\svg-thumbnail-provider-log.txt";
+    inline const static std::wstring svgThumbLogPath = L"logs\\FileExplorer_localLow\\SvgThumbnailProvider\\svg-thumbnail-provider-log.log";
     inline const static std::string launcherLoggerName = "launcher";
-    inline const static std::wstring launcherLogPath = L"LogsModuleInterface\\launcher-log.txt";
+    inline const static std::wstring launcherLogPath = L"LogsModuleInterface\\launcher-log.log";
     inline const static std::string mouseWithoutBordersLoggerName = "mouseWithoutBorders";
-    inline const static std::wstring mouseWithoutBordersLogPath = L"LogsModuleInterface\\mouseWithoutBorders-log.txt";
-    inline const static std::wstring awakeLogPath = L"Logs\\awake-log.txt";
-    inline const static std::wstring powerAccentLogPath = L"quick-accent-log.txt";
+    inline const static std::wstring mouseWithoutBordersLogPath = L"LogsModuleInterface\\mouseWithoutBorders-log.log";
+    inline const static std::wstring awakeLogPath = L"Logs\\awake-log.log";
+    inline const static std::wstring powerAccentLogPath = L"quick-accent-log.log";
     inline const static std::string fancyZonesLoggerName = "fancyzones";
-    inline const static std::wstring fancyZonesLogPath = L"fancyzones-log.txt";
+    inline const static std::wstring fancyZonesLogPath = L"fancyzones-log.log";
     inline const static std::wstring fancyZonesOldLogPath = L"FancyZonesLogs\\"; // needed to clean up old logs
     inline const static std::string shortcutGuideLoggerName = "shortcut-guide";
-    inline const static std::wstring shortcutGuideLogPath = L"ShortcutGuideLogs\\shortcut-guide-log.txt";
-    inline const static std::wstring powerOcrLogPath = L"Logs\\text-extractor-log.txt";
+    inline const static std::wstring shortcutGuideLogPath = L"ShortcutGuideLogs\\shortcut-guide-log.log";
+    inline const static std::wstring powerOcrLogPath = L"Logs\\text-extractor-log.log";
     inline const static std::string keyboardManagerLoggerName = "keyboard-manager";
-    inline const static std::wstring keyboardManagerLogPath = L"Logs\\keyboard-manager-log.txt";
+    inline const static std::wstring keyboardManagerLogPath = L"Logs\\keyboard-manager-log.log";
     inline const static std::string findMyMouseLoggerName = "find-my-mouse";
     inline const static std::string mouseHighlighterLoggerName = "mouse-highlighter";
     inline const static std::string mouseJumpLoggerName = "mouse-jump";
@@ -60,22 +60,22 @@ struct LogSettings
     inline const static std::string alwaysOnTopLoggerName = "always-on-top";
     inline const static std::string powerOcrLoggerName = "TextExtractor";
     inline const static std::string fileLocksmithLoggerName = "FileLocksmith";
-    inline const static std::wstring alwaysOnTopLogPath = L"always-on-top-log.txt";
+    inline const static std::wstring alwaysOnTopLogPath = L"always-on-top-log.log";
     inline const static std::string hostsLoggerName = "hosts";
-    inline const static std::wstring hostsLogPath = L"Logs\\hosts-log.txt";
+    inline const static std::wstring hostsLogPath = L"Logs\\hosts-log.log";
     inline const static std::string registryPreviewLoggerName = "registrypreview";
     inline const static std::string cropAndLockLoggerName = "crop-and-lock";
-    inline const static std::wstring registryPreviewLogPath = L"Logs\\registryPreview-log.txt";
+    inline const static std::wstring registryPreviewLogPath = L"Logs\\registryPreview-log.log";
     inline const static std::string environmentVariablesLoggerName = "environment-variables";
-    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
+    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.log";
     inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
     inline const static std::string newLoggerName = "NewPlus";
     inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher";
-    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt";
+    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.log";
     inline const static std::string workspacesWindowArrangerLoggerName = "workspaces-window-arranger";
-    inline const static std::wstring workspacesWindowArrangerLogPath = L"workspaces-window-arranger-log.txt";
+    inline const static std::wstring workspacesWindowArrangerLogPath = L"workspaces-window-arranger-log.log";
     inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
-    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.txt";
+    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.log";
     inline const static std::string zoomItLoggerName = "zoom-it";
     inline const static int retention = 30;
     std::wstring logLevel;

src/common/utils/logger_helper.h

@@ -91,7 +91,7 @@ namespace LoggerHelpers
         currentFolder.append(get_product_version());
 
         auto logsPath = currentFolder;
-        logsPath.append(L"log.txt");
+        logsPath.append(L"log.log");
         Logger::init(loggerName, logsPath.wstring(), PTSettingsHelper::get_log_settings_file_location());
 
         delete_other_versions_log_folders(rootFolder.wstring(), currentFolder); 

src/common/utils/package.h

@@ -301,6 +301,7 @@ 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.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/OneFuzzConfig.json

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "leilzh@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "leilzh@microsoft.com",

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

@@ -18,10 +18,19 @@ public static class OcrHelpers
 {
     public static async Task<string> ExtractTextAsync(SoftwareBitmap bitmap, CancellationToken cancellationToken)
     {
-        var ocrLanguage = GetOCRLanguage() ?? throw new InvalidOperationException("Unable to determine OCR language");
+        var ocrLanguage = GetOCRLanguage();
         cancellationToken.ThrowIfCancellationRequested();
 
-        var ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine");
+        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");
+        }
+
         cancellationToken.ThrowIfCancellationRequested();
 
         var ocrResult = await ocrEngine.RecognizeAsync(bitmap);

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -15,8 +15,6 @@
     <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>
@@ -56,7 +54,4 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
-  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-  </Target>
 </Project>

src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj

@@ -1,6 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
+
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json

@@ -17,7 +17,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -58,7 +58,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -99,7 +99,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -140,7 +140,7 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -158,19 +158,19 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
+        "Castle.Core.dll",
+        "CommunityToolkit.Mvvm.dll",
         "Hosts.FuzzTests.dll",
         "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
-        "WinRT.Runtime.dll",
         "Moq.dll",
-        "testhost.dll",
-        "Castle.Core.dll",
         "System.IO.Abstractions.dll",
-        "CommunityToolkit.Mvvm.dll",
         "System.IO.Abstractions.TestingHelpers.dll",
         "TestableIO.System.IO.Abstractions.dll",
         "TestableIO.System.IO.Abstractions.TestingHelpers.dll",
-        "TestableIO.System.IO.Abstractions.Wrappers.dll"
+        "TestableIO.System.IO.Abstractions.Wrappers.dll",
+        "Testably.Abstractions.FileSystem.Interface.dll",
+        "WinRT.Runtime.dll"
       ],
       "SdlWorkItemId": 49911822
     }

src/modules/Hosts/Hosts.UITests/Hosts.UITests.csproj

@@ -21,13 +21,19 @@
       <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_arm64.png" />
       <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_arm64.png" />
       <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_arm64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_x64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_x64.png" />
-      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_x64.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_x64Win10.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_x64Win10.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_x64Win10.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestAddingEntry_x64Win11.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_EmptyView_x64Win11.png" />
+      <EmbeddedResource Include="Baseline\HostModuleTests_TestEmptyView_NonEmptyView_x64Win11.png" />
     </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="MSTest" />
+      <PackageReference Include="System.Net.Http" />
+      <PackageReference Include="System.Private.Uri" />
+      <PackageReference Include="System.Text.RegularExpressions" />
       <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
     </ItemGroup>
 </Project>

src/modules/Hosts/Hosts.UITests/HostsSettingTests.cs

@@ -128,7 +128,7 @@ namespace Hosts.UITests
             // launch Hosts File Editor
             this.Find<Button>("Launch Hosts File Editor").Click();
 
-            Task.Delay(500).Wait();
+            Task.Delay(2000).Wait();
 
             this.Session.Attach(PowerToysModule.Hosts);
         }

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.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
+  <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.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.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.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')" />
   </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.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'))" />
+    <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'))" />
   </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.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs

@@ -32,7 +32,11 @@ namespace MouseUtils.UITests
         /// </item>
         /// </list>
         /// </summary>
-        [TestMethod]
+        [TestMethod("MouseUtils.FindMyMouse.EnableFindMyMouse")]
+        [TestCategory("Mouse Utils #1")]
+        [TestCategory("Mouse Utils #2")]
+        [TestCategory("Mouse Utils #3")]
+        [TestCategory("Mouse Utils #4")]
         public void TestEnableFindMyMouse()
         {
             LaunchFromSetting();
@@ -57,7 +61,6 @@ namespace MouseUtils.UITests
             {
                 foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
 
-                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
@@ -91,13 +94,71 @@ namespace MouseUtils.UITests
             // [Test Case]Enable FindMyMouse. Then, without moving your mouse: Press a mouse button and verify the overlay disappears.
             Task.Delay(1000).Wait();
 
-            // MouseSimulator.LeftClick();
             Session.PerformMouseAction(MouseActionType.LeftClick, 500, 1000);
 
             VerifySpotlightDisappears(ref settings);
         }
 
-        [TestMethod]
+        [TestMethod("MouseUtils.FindMyMouse.FindMyMouseDifferentSettings")]
+        [TestCategory("Mouse Utils #10")]
+        [TestCategory("Mouse Utils #11")]
+        [TestCategory("Mouse Utils #12")]
+        public void TestFindMyMouseDifferentSettings()
+        {
+            LaunchFromSetting();
+
+            var settings = new FindMyMouseSettings();
+            settings.OverlayOpacity = "100";
+            settings.Radius = "80";
+            settings.InitialZoom = "1";
+            settings.AnimationDuration = "0";
+            settings.BackgroundColor = "FF0000";
+            settings.SpotlightColor = "0000FF";
+
+            var foundCustom = this.Find<Custom>("Find My Mouse");
+            Assert.IsNotNull(foundCustom);
+
+            if (CheckAnimationEnable(ref foundCustom))
+            {
+                foundCustom = this.Find<Custom>("Find My Mouse");
+            }
+
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+
+                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
+                Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
+                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
+
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                if (excludedApps != null)
+                {
+                    excludedApps.Click();
+                    excludedApps.Click();
+                }
+                else
+                {
+                    Assert.Fail("Excluded apps group not found.");
+                }
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse group not found.");
+            }
+
+            // [Test Case]Test the different settings and verify they apply, Background color
+            // [Test Case]Test the different settings and verify they apply, Spotlight color
+            // [Test Case]Test the different settings and verify they apply, Spotlight radius
+            VerifySpotlightSettings(ref settings);
+
+            Session.SendKeys(Key.A);
+            VerifySpotlightDisappears(ref settings);
+        }
+
+        [TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse")]
+        [TestCategory("Mouse Utils #5")]
+        [TestCategory("Mouse Utils #6")]
         public void TestDisableFindMyMouse()
         {
             LaunchFromSetting();
@@ -122,7 +183,9 @@ namespace MouseUtils.UITests
             {
                 foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
 
-                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
@@ -157,13 +220,85 @@ namespace MouseUtils.UITests
 
             // [Test Case] Press Left Ctrl twice and verify the overlay appears
             foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+            Task.Delay(2000).Wait();
             ActivateSpotlight(ref settings);
             VerifySpotlightAppears(ref settings);
 
             Session.PerformMouseAction(MouseActionType.LeftClick);
         }
 
-        [TestMethod]
+        [TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse3")]
+        [TestCategory("Mouse Utils #6")]
+        public void TestDisableFindMyMouse3()
+        {
+            LaunchFromSetting();
+
+            var settings = new FindMyMouseSettings();
+            settings.OverlayOpacity = "100";
+            settings.Radius = "50";
+            settings.InitialZoom = "1";
+            settings.AnimationDuration = "0";
+            settings.BackgroundColor = "000000";
+            settings.SpotlightColor = "FFFFFF";
+            var foundCustom = this.Find<Custom>("Find My Mouse");
+
+            Assert.IsNotNull(foundCustom);
+
+            if (CheckAnimationEnable(ref foundCustom))
+            {
+                foundCustom = this.Find<Custom>("Find My Mouse");
+            }
+
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
+                Assert.IsNotNull(foundCustom);
+                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
+
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                if (excludedApps != null)
+                {
+                    excludedApps.Click();
+                    excludedApps.Click();
+                }
+                else
+                {
+                    Assert.Fail("Activation method group not found.");
+                }
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse group not found.");
+            }
+
+            // [Test Case]Enable FindMyMouse. Then, without moving your mouse: Press Left Ctrl twice and verify the overlay appears.
+            // VerifySpotlightSettings(ref settings);
+            ActivateSpotlight(ref settings);
+            VerifySpotlightAppears(ref settings);
+
+            // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            Task.Delay(1000).Wait();
+            ActivateSpotlight(ref settings);
+
+            VerifySpotlightDisappears(ref settings);
+
+            // [Test Case] Press Left Ctrl twice and verify the overlay appears
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+            Task.Delay(2000).Wait();
+            ActivateSpotlight(ref settings);
+            VerifySpotlightAppears(ref settings);
+
+            Session.PerformMouseAction(MouseActionType.LeftClick);
+        }
+
+        [TestMethod("MouseUtils.FindMyMouse.DisableFindMyMouse2")]
+        [TestCategory("Mouse Utils #5")]
         public void TestDisableFindMyMouse2()
         {
             LaunchFromSetting();
@@ -220,35 +355,35 @@ namespace MouseUtils.UITests
 
             var location = Session.GetMousePosition();
             int radius = int.Parse(settings.Radius, CultureInfo.InvariantCulture);
-            var colorSpotlight = Session.GetPixelColorString(location.Item1, location.Item2);
+            var colorSpotlight = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreNotEqual("#" + settings.SpotlightColor, colorSpotlight);
 
-            var colorBackground = Session.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
+            var colorBackground = this.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreNotEqual("#" + settings.BackgroundColor, colorBackground);
 
-            var colorBackground2 = Session.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
+            var colorBackground2 = this.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
             Assert.AreNotEqual("#" + settings.BackgroundColor, colorBackground2);
         }
 
         private void VerifySpotlightAppears(ref FindMyMouseSettings settings)
         {
-            Task.Delay(1000).Wait();
+            Task.Delay(2000).Wait();
 
             var location = Session.GetMousePosition();
             int radius = int.Parse(settings.Radius, CultureInfo.InvariantCulture);
-            var colorSpotlight = Session.GetPixelColorString(location.Item1, location.Item2);
+            var colorSpotlight = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreEqual("#" + settings.SpotlightColor, colorSpotlight);
 
-            var colorSpotlight2 = Session.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
+            var colorSpotlight2 = this.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
 
             // Session.MoveMouseTo(location.Item1 + radius - 10, location.Item2);
             Assert.AreEqual("#" + settings.SpotlightColor, colorSpotlight2);
             Task.Delay(100).Wait();
 
-            var colorBackground = Session.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
+            var colorBackground = this.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreEqual("#" + settings.BackgroundColor, colorBackground);
 
-            var colorBackground2 = Session.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
+            var colorBackground2 = this.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
             Assert.AreEqual("#" + settings.BackgroundColor, colorBackground2);
         }
 
@@ -259,17 +394,17 @@ namespace MouseUtils.UITests
             Task.Delay(1000).Wait();
 
             Session.PerformMouseAction(MouseActionType.LeftClick);
-            Task.Delay(5000).Wait();
+            Task.Delay(1000).Wait();
             if (settings.SelectedActivationMethod == FindMyMouseSettings.ActivationMethod.PressLeftControlTwice)
             {
                 Session.SendKey(Key.LCtrl, 0, 0);
-                Task.Delay(100).Wait();
+                Task.Delay(200).Wait();
                 Session.SendKey(Key.LCtrl, 0, 0);
             }
             else if (settings.SelectedActivationMethod == FindMyMouseSettings.ActivationMethod.PressRightControlTwice)
             {
                 Session.SendKey(Key.RCtrl, 0, 0);
-                Task.Delay(100).Wait();
+                Task.Delay(200).Wait();
                 Session.SendKey(Key.RCtrl, 0, 0);
             }
             else if (settings.SelectedActivationMethod == FindMyMouseSettings.ActivationMethod.ShakeMouse)
@@ -338,7 +473,7 @@ namespace MouseUtils.UITests
                 Assert.IsNotNull(button);
                 button.Click();
 
-                var popupWindow = Session.Find<Window>("Popup");
+                var popupWindow = this.Find<Window>("Popup");
                 Assert.IsNotNull(popupWindow);
                 Task.Delay(1000).Wait();
                 var colorModelComboBox = this.Find<ComboBox>("Color model");
@@ -346,12 +481,27 @@ namespace MouseUtils.UITests
                 colorModelComboBox.Click();
                 var selectedItem = colorModelComboBox.Find<NavigationViewItem>("RGB");
                 selectedItem.Click();
-                Task.Delay(100).Wait();
+                Task.Delay(500).Wait();
                 var rgbHexEdit = this.Find<TextBox>("RGB hex");
                 Assert.IsNotNull(rgbHexEdit);
-                Task.Delay(100).Wait();
-                rgbHexEdit.SetText(settings.BackgroundColor);
-                Task.Delay(100).Wait();
+                Task.Delay(500).Wait();
+                int retry = 5;
+                while (retry > 0)
+                {
+                    Task.Delay(500).Wait();
+                    rgbHexEdit.SetText(settings.BackgroundColor);
+                    Task.Delay(500).Wait();
+                    string rgbHex = rgbHexEdit.Text;
+                    bool isValid = rgbHex.StartsWith('#') && rgbHex.Length == 7 && rgbHex.Substring(1) == settings.BackgroundColor;
+                    Task.Delay(500).Wait();
+                    if (isValid)
+                    {
+                        break;
+                    }
+
+                    retry--;
+                }
+
                 button.Click();
 
                 // Set the Spotlight color
@@ -370,12 +520,28 @@ namespace MouseUtils.UITests
                 var selectedItem2 = spotlightColorModelComboBox.Find<NavigationViewItem>("RGB");
                 Assert.IsNotNull(selectedItem2);
                 selectedItem2.Click();
-                Task.Delay(100).Wait();
+                Task.Delay(500).Wait();
                 var rgbHexEdit2 = this.Find<TextBox>("RGB hex");
                 Assert.IsNotNull(rgbHexEdit2);
-                Task.Delay(100).Wait();
-                rgbHexEdit2.SetText(settings.SpotlightColor);
-                Task.Delay(100).Wait();
+                Task.Delay(500).Wait();
+                retry = 5;
+                while (retry > 0)
+                {
+                    Task.Delay(500).Wait();
+                    rgbHexEdit2.SetText(settings.SpotlightColor);
+                    Task.Delay(500).Wait();
+                    string rgbHex = rgbHexEdit2.Text;
+                    bool isValid = rgbHex.StartsWith('#') && rgbHex.Length == 7 && rgbHex.Substring(1) == settings.SpotlightColor;
+                    Task.Delay(500).Wait();
+                    if (isValid)
+                    {
+                        break;
+                    }
+
+                    retry--;
+                }
+
+                Task.Delay(500).Wait();
                 spotlightColorButton.Click(false, 500, 1500);
 
                 // Set the overlay opacity to overlayOpacity%
@@ -419,34 +585,6 @@ namespace MouseUtils.UITests
             }
         }
 
-        private bool FindGroup(string groupName)
-        {
-            try
-            {
-                var foundElements = this.FindAll<Element>(groupName);
-                foreach (var element in foundElements)
-                {
-                    string className = element.ClassName;
-                    string name = element.Name;
-                    string text = element.Text;
-                    string helptext = element.HelpText;
-                    string controlType = element.ControlType;
-                }
-
-                if (foundElements.Count == 0)
-                {
-                    return false;
-                }
-            }
-            catch (Exception ex)
-            {
-                // Validate if group is not found by checking exception.Message
-                return ex.Message.Contains("No element found");
-            }
-
-            return true;
-        }
-
         private bool CheckAnimationEnable(ref Custom? foundCustom)
         {
             Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
@@ -481,7 +619,7 @@ namespace MouseUtils.UITests
         private void LaunchFromSetting(bool reload = false, bool launchAsAdmin = false)
         {
             // this.Session.Attach(PowerToysModule.PowerToysSettings);
-            Session.SetMainWindowSize(WindowSize.Large);
+            this.Session.SetMainWindowSize(WindowSize.Large);
 
             // Goto Hosts File Editor setting page
             if (this.FindAll<NavigationViewItem>("Mouse utilities", 10000).Count == 0)

src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs

@@ -15,7 +15,12 @@ namespace MouseUtils.UITests
     [TestClass]
     public class MouseHighlighterTests : UITestBase
     {
-        [TestMethod]
+        [TestMethod("MouseUtils.MouseHighlighter.EnableMouseHighlighter")]
+        [TestCategory("Mouse Utils #17")]
+        [TestCategory("Mouse Utils #18")]
+        [TestCategory("Mouse Utils #19")]
+        [TestCategory("Mouse Utils #20")]
+        [TestCategory("Mouse Utils #21")]
         public void TestEnableMouseHighlighter()
         {
             LaunchFromSetting();
@@ -112,6 +117,8 @@ namespace MouseUtils.UITests
                 VerifyMouseHighlighterNotAppears(ref settings, "leftClick");
                 VerifyMouseHighlighterNotAppears(ref settings, "rightClick");
 
+                // [Test Case] With left mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
+                // [Test Case] With right mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
                 foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
                 xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);
@@ -129,20 +136,107 @@ namespace MouseUtils.UITests
             Task.Delay(500).Wait();
         }
 
+        [TestMethod("MouseUtils.MouseHighlighter.MouseHighlighterDifferentSettings")]
+        [TestCategory("Mouse Utils #22")]
+        [TestCategory("Mouse Utils #23")]
+        [TestCategory("Mouse Utils #24")]
+        public void TestMouseHighlighterDifferentSettings()
+        {
+            LaunchFromSetting();
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            if (foundCustom0 != null)
+            {
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse custom not found.");
+            }
+
+            var settings = new MouseHighlighterSettings();
+            settings.PrimaryButtonHighlightColor = "FF000000";
+            settings.SecondaryButtonHighlightColor = "FFFFFFFF";
+            settings.AlwaysHighlightColor = "004cFF71";
+            settings.Radius = "70";
+            settings.FadeDelay = "0";
+            settings.FadeDuration = "90";
+
+            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+
+                var xy = Session.GetMousePosition();
+                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
+
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+
+                // Change the shortcut key for MouseHighlighter
+                // [TestCase] Test the different settings and verify they apply - Change activation shortcut and test it
+                // [Test Case] Test the different settings and verify they apply - Left button highlight color
+                // [Test Case] Test the different settings and verify they apply - Right button highlight color
+                // [Test Case] Test the different settings and verify they apply - Radius
+                var activationShortcutButton = foundCustom.Find<Button>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutButton);
+
+                activationShortcutButton.Click();
+                Task.Delay(500).Wait();
+                var activationShortcutWindow = Session.Find<Window>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutWindow);
+
+                // Invalid shortcut key
+                Session.SendKeySequence(Key.H);
+
+                // IOUtil.SimulateKeyPress(0x41);
+                var invalidShortcutText = activationShortcutWindow.Find<TextBlock>("Invalid shortcut");
+                Assert.IsNotNull(invalidShortcutText);
+
+                // IOUtil.SimulateShortcut(0x5B, 0x10, 0x45);
+                Session.SendKeys(Key.Win, Key.Shift, Key.O);
+
+                // Assert.IsNull(activationShortcutWindow.Find<TextBlock>("Invalid shortcut"));
+                var saveButton = activationShortcutWindow.Find<Button>("Save");
+                Assert.IsNotNull(saveButton);
+                saveButton.Click(false, 500, 1000);
+
+                SetMouseHighlighterAppearanceBehavior(ref foundCustom, ref settings);
+
+                var xy0 = Session.GetMousePosition();
+                Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
+                Session.PerformMouseAction(MouseActionType.LeftClick);
+
+                // Check the mouse highlighter is enabled
+                Session.SendKeys(Key.Win, Key.Shift, Key.O);
+
+                Task.Delay(1000).Wait();
+
+                VerifyMouseHighlighterAppears(ref settings, "leftClick");
+                VerifyMouseHighlighterAppears(ref settings, "rightClick");
+            }
+            else
+            {
+                Assert.Fail("Mouse Highlighter Custom not found.");
+            }
+
+            Task.Delay(500).Wait();
+        }
+
         private void VerifyMouseHighlighterDrag(ref MouseHighlighterSettings settings, string action = "leftClick")
         {
             Task.Delay(500).Wait();
             string expectedColor = string.Empty;
             if (action == "leftClick")
             {
-                // MouseSimulator.LeftDown();
-                Session.PerformMouseAction(MouseActionType.LeftDown);
+                IOUtil.SimulateMouseDown(true);
                 expectedColor = settings.PrimaryButtonHighlightColor.Substring(2);
             }
             else if (action == "rightClick")
             {
-                // MouseSimulator.RightDown();
-                Session.PerformMouseAction(MouseActionType.RightDown);
+                IOUtil.SimulateMouseDown(false);
                 expectedColor = settings.SecondaryButtonHighlightColor.Substring(2);
             }
             else
@@ -154,43 +248,48 @@ namespace MouseUtils.UITests
 
             var location = Session.GetMousePosition();
             int radius = int.Parse(settings.Radius, CultureInfo.InvariantCulture);
-            var colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            var colorLeftClick = GetPixelColorString(location.Item1, location.Item2);
             Assert.AreEqual(expectedColor, colorLeftClick);
 
-            var colorLeftClick2 = Session.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
-
+            var colorLeftClick2 = GetPixelColorString(location.Item1 + radius - 1, location.Item2);
             Assert.AreEqual(expectedColor, colorLeftClick2);
 
-            var colorBackground = Session.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
+            var colorBackground = GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreNotEqual(expectedColor, colorBackground);
 
-            Session.MoveMouseTo(location.Item1 - 300, location.Item2);
+            // Drag the mouse
+            // Session.MoveMouseTo(location.Item1 - 400, location.Item2);
+            for (int i = 0; i < 500; i++)
+            {
+                IOUtil.MoveMouseBy(-1, 0);
+                Task.Delay(10).Wait();
+            }
+
+            Task.Delay(2000).Wait();
 
             location = Session.GetMousePosition();
-            colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            colorLeftClick = GetPixelColorString(location.Item1, location.Item2);
             Assert.AreEqual(expectedColor, colorLeftClick);
 
-            colorLeftClick2 = Session.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
+            colorLeftClick2 = GetPixelColorString(location.Item1 + radius - 1, location.Item2);
 
             Assert.AreEqual(expectedColor, colorLeftClick2);
 
-            colorBackground = Session.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
+            colorBackground = GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreNotEqual(expectedColor, colorBackground);
 
             if (action == "leftClick")
             {
-                // MouseSimulator.LeftUp();
-                Session.PerformMouseAction(MouseActionType.LeftUp);
+                IOUtil.SimulateMouseUp(true);
             }
             else if (action == "rightClick")
             {
-                // MouseSimulator.RightUp();
-                Session.PerformMouseAction(MouseActionType.RightUp);
+                IOUtil.SimulateMouseUp(false);
             }
 
             int duration = int.Parse(settings.FadeDuration, CultureInfo.InvariantCulture);
             Task.Delay(duration + 100).Wait();
-            colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            colorLeftClick = GetPixelColorString(location.Item1, location.Item2);
             Assert.AreNotEqual("#" + settings.PrimaryButtonHighlightColor, colorLeftClick);
         }
 
@@ -218,9 +317,9 @@ namespace MouseUtils.UITests
             expectedColor = "#" + expectedColor;
             var location = Session.GetMousePosition();
             int radius = int.Parse(settings.Radius, CultureInfo.InvariantCulture);
-            var colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            var colorLeftClick = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreNotEqual(expectedColor, colorLeftClick);
-            var colorLeftClick2 = Session.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
+            var colorLeftClick2 = this.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
             Assert.AreNotEqual(expectedColor, colorLeftClick2);
             if (action == "leftClick")
             {
@@ -257,15 +356,15 @@ namespace MouseUtils.UITests
 
             var location = Session.GetMousePosition();
             int radius = int.Parse(settings.Radius, CultureInfo.InvariantCulture);
-            var colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            var colorLeftClick = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreEqual(expectedColor, colorLeftClick);
 
-            var colorLeftClick2 = Session.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
+            var colorLeftClick2 = this.GetPixelColorString(location.Item1 + radius - 1, location.Item2);
 
             Assert.AreEqual(expectedColor, colorLeftClick2);
             Task.Delay(500).Wait();
 
-            var colorBackground = Session.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
+            var colorBackground = this.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreNotEqual(expectedColor, colorBackground);
             if (action == "leftClick")
             {
@@ -280,7 +379,7 @@ namespace MouseUtils.UITests
 
             int duration = int.Parse(settings.FadeDuration, CultureInfo.InvariantCulture);
             Task.Delay(duration + 100).Wait();
-            colorLeftClick = Session.GetPixelColorString(location.Item1, location.Item2);
+            colorLeftClick = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreNotEqual("#" + settings.PrimaryButtonHighlightColor, colorLeftClick);
         }
 
@@ -312,8 +411,26 @@ namespace MouseUtils.UITests
                 selectedItem.Click();
                 var rgbHexEdit = this.Find<TextBox>("RGB hex");
                 Assert.IsNotNull(rgbHexEdit);
+                Task.Delay(500).Wait();
                 rgbHexEdit.SetText(colorValue);
+                int retry = 5;
+                while (retry > 0)
+                {
+                    Task.Delay(500).Wait();
+                    rgbHexEdit.SetText(colorValue);
+                    Task.Delay(500).Wait();
+                    string rgbHex = rgbHexEdit.Text;
+                    bool isValid = rgbHex.StartsWith('#') && rgbHex.Length == 9 && rgbHex.Substring(1) == colorValue;
+                    Task.Delay(500).Wait();
+                    if (isValid)
+                    {
+                        break;
+                    }
 
+                    retry--;
+                }
+
+                Task.Delay(500).Wait();
                 button.Click();
             }
         }
@@ -365,7 +482,7 @@ namespace MouseUtils.UITests
 
         private void LaunchFromSetting(bool showWarning = false, bool launchAsAdmin = false)
         {
-            Session.SetMainWindowSize(WindowSize.Large);
+            this.Session.SetMainWindowSize(WindowSize.Large);
 
             // Goto Hosts File Editor setting page
             if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)

src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs

@@ -12,8 +12,21 @@ namespace MouseUtils.UITests
     [TestClass]
     public class MouseJumpTests : UITestBase
     {
-        [TestMethod]
+        [TestMethod("MouseUtils.MouseJump.EnableMouseJump")]
+        [TestCategory("Mouse Utils #39")]
+        [TestCategory("Mouse Utils #40")]
+        [TestCategory("Mouse Utils #41")]
+        [TestCategory("Mouse Utils #45")]
         public void TestEnableMouseJump()
+        {
+            LaunchFromSetting(true);
+        }
+
+        [TestMethod("MouseUtils.MouseJump.EnableMouseJump2")]
+        [TestCategory("Mouse Utils #39")]
+        [TestCategory("Mouse Utils #41")]
+        [TestCategory("Mouse Utils #45")]
+        public void TestEnableMouseJump2()
         {
             LaunchFromSetting();
             var foundCustom0 = this.Find<Custom>("Find My Mouse");
@@ -64,14 +77,18 @@ namespace MouseUtils.UITests
                 Assert.IsNotNull(saveButton);
                 saveButton.Click(false, 500, 1500);
 
-                var screenCenter = this.Session.GetScreenCenter();
+                var screenCenter = this.GetScreenCenter();
                 Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY, 500, 1000);
                 Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY - 300, 500, 1000);
 
+                // [TestCase] Enable Mouse Jump. Then - Press the activation shortcut and verify the screens preview appears.
+                // [TestCase] Enable Mouse Jump. Then - Click around the screen preview and ensure that mouse cursor jumped to clicked location.
                 Session.SendKeys(Key.Win, Key.Shift, Key.Z);
                 VerifyWindowAppears();
 
                 Task.Delay(1000).Wait();
+
+                // [TestCase] Enable Mouse Jump. Then - Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.
                 foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(false);
                 Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY - 300, 500, 1000);
                 Session.SendKeys(Key.Win, Key.Shift, Key.Z);
@@ -86,14 +103,83 @@ namespace MouseUtils.UITests
             Task.Delay(500).Wait();
         }
 
+        [TestMethod("MouseUtils.MouseJump.EnableMouseJump3")]
+        [TestCategory("Mouse Utils #40")]
+        public void TestEnableMouseJump3()
+        {
+            LaunchFromSetting();
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            if (foundCustom0 != null)
+            {
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            }
+            else
+            {
+                Assert.Fail("Find My Mouse custom not found.");
+            }
+
+            for (int i = 0; i < 10; i++)
+            {
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+            }
+
+            var foundCustom = this.Find<Custom>("Mouse Jump");
+            if (foundCustom != null)
+            {
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);
+
+                var xy = Session.GetMousePosition();
+                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
+
+                // Change the shortcut key for MouseHighlighter
+                // [TestCase]Change activation shortcut and test it
+                var activationShortcutButton = foundCustom.Find<Button>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutButton);
+
+                activationShortcutButton.Click(false, 500, 1000);
+                var activationShortcutWindow = Session.Find<Window>("Activation shortcut");
+                Assert.IsNotNull(activationShortcutWindow);
+
+                // Invalid shortcut key
+                Session.SendKeySequence(Key.H);
+
+                // IOUtil.SimulateKeyPress(0x41);
+                var invalidShortcutText = activationShortcutWindow.Find<TextBlock>("Invalid shortcut");
+                Assert.IsNotNull(invalidShortcutText);
+
+                // IOUtil.SimulateShortcut(0x5B, 0x10, 0x45);
+                Session.SendKeys(Key.Win, Key.Shift, Key.J);
+
+                // Assert.IsNull(activationShortcutWindow.Find<TextBlock>("Invalid shortcut"));
+                var saveButton = activationShortcutWindow.Find<Button>("Save");
+                Assert.IsNotNull(saveButton);
+                saveButton.Click(false, 500, 1500);
+
+                var screenCenter = this.GetScreenCenter();
+                Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY, 500, 1000);
+                Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY - 300, 500, 1000);
+
+                // [TestCase] Enable Mouse Jump. Then - Change activation shortcut and verify that new shortcut triggers Mouse Jump.
+                Session.SendKeys(Key.Win, Key.Shift, Key.J);
+                VerifyWindowAppears();
+            }
+            else
+            {
+                Assert.Fail("Mouse Highlighter Custom not found.");
+            }
+
+            Task.Delay(500).Wait();
+        }
+
         private void VerifyWindowAppears()
         {
             string windowName = "MouseJump";
             Session.Attach(windowName);
-            var center = this.Session.GetWindowCenter();
+            var center = this.Session.GetMainWindowCenter();
             Session.MoveMouseTo(center.CenterX, center.CenterY);
             Session.PerformMouseAction(MouseActionType.LeftClick, 1000, 1000);
-            var screenCenter = this.Session.GetScreenCenter();
+            var screenCenter = this.GetScreenCenter();
 
             // Get Mouse position
             var xy = Session.GetMousePosition();
@@ -105,7 +191,7 @@ namespace MouseUtils.UITests
         private void VerifyWindowNotAppears()
         {
             string windowName = "MouseJump";
-            bool open = Session.IsWindowOpen(windowName);
+            bool open = this.IsWindowOpen(windowName);
             Assert.IsFalse(open, "Mouse Jump window should not be opened.");
         }
 
@@ -124,18 +210,29 @@ namespace MouseUtils.UITests
             return Math.Sqrt((dx * dx) + (dy * dy));
         }
 
-        private void LaunchFromSetting(bool showWarning = false, bool launchAsAdmin = false)
+        private void LaunchFromSetting(bool firstTime = false, bool launchAsAdmin = false)
         {
             Session.SetMainWindowSize(WindowSize.Large);
+            Task.Delay(1000).Wait();
 
             // Goto Hosts File Editor setting page
             if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
             {
                 // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                Task.Delay(2000).Wait();
             }
 
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            // Click on the Mouse utilities
+            // Task.Delay(2000).Wait();
+            if (firstTime)
+            {
+                return;
+            }
+            else
+            {
+                this.Find<NavigationViewItem>("Mouse utilities").Click();
+            }
         }
     }
 }

src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs

@@ -16,7 +16,10 @@ namespace MouseUtils.UITests
     [TestClass]
     public class MousePointerCrosshairsTests : UITestBase
     {
-        [TestMethod]
+        [TestMethod("MouseUtils.MousePointerCrosshairs.EnableMousePointerCrosshairs")]
+        [TestCategory("Mouse Utils #29")]
+        [TestCategory("Mouse Utils #30")]
+        [TestCategory("Mouse Utils #31")]
         public void TestEnableMousePointerCrosshairs()
         {
             LaunchFromSetting();
@@ -45,6 +48,106 @@ namespace MouseUtils.UITests
 
             foundCustom = FindMouseUtilElement(MouseUtilsSettings.MouseUtils.MousePointerCrosshairs);
 
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MousePointerCrosshairs, false);
+            Task.Delay(500).Wait();
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MousePointerCrosshairs, true);
+
+            Assert.IsNotNull(foundCustom);
+
+            // [Test Case] Change activation shortcut and test it.
+            var activationShortcutButton = foundCustom.Find<Button>("Activation shortcut");
+            Assert.IsNotNull(activationShortcutButton);
+
+            activationShortcutButton.Click(false, 500, 1000);
+            var activationShortcutWindow = Session.Find<Window>("Activation shortcut");
+            Assert.IsNotNull(activationShortcutWindow);
+
+            // Invalid shortcut key
+            Session.SendKeySequence(Key.H);
+
+            var invalidShortcutText = activationShortcutWindow.Find<TextBlock>("Invalid shortcut");
+            Assert.IsNotNull(invalidShortcutText);
+
+            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+
+            var saveButton = activationShortcutWindow.Find<Button>("Save");
+            Assert.IsNotNull(saveButton);
+            saveButton.Click(false, 500, 1000);
+
+            SetMousePointerCrosshairsAppearanceBehavior(ref foundCustom, ref settings);
+            Task.Delay(500).Wait();
+
+            // [Test Case]  Press the activation shortcut and verify the crosshairs appear, and that they follow the mouse around.
+            var xy0 = Session.GetMousePosition();
+            Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
+
+            IOUtil.MouseClick();
+            Task.Delay(500).Wait();
+            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+            Task.Delay(1000).Wait();
+
+            xy0 = Session.GetMousePosition();
+
+            VerifyMousePointerCrosshairsAppears(ref settings);
+            Task.Delay(500).Wait();
+
+            for (int i = 0; i < 100; i++)
+            {
+                IOUtil.MoveMouseBy(-1, 0);
+                Task.Delay(10).Wait();
+            }
+
+            VerifyMousePointerCrosshairsAppears(ref settings);
+
+            // [Test Case] Press the activation shortcut again and verify the crosshairs disappear.
+            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+            Task.Delay(1000).Wait();
+
+            VerifyMousePointerCrosshairsNotAppears(ref settings);
+            Task.Delay(500).Wait();
+
+            // [Test Case] Disable Mouse Pointer Crosshairs and verify that the module is not activated when you press the activation shortcut.
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MousePointerCrosshairs, false);
+            xy0 = Session.GetMousePosition();
+            Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
+            Session.PerformMouseAction(MouseActionType.LeftClick);
+            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+            Task.Delay(1000).Wait();
+
+            VerifyMousePointerCrosshairsNotAppears(ref settings);
+        }
+
+        [TestMethod("MouseUtils.MousePointerCrosshairs.MousePointerCrosshairsDifferentSettings")]
+        [TestCategory("Mouse Utils #32")]
+        [TestCategory("Mouse Utils #33")]
+        public void TestMousePointerCrosshairsDifferentSettings()
+        {
+            LaunchFromSetting();
+
+            var settings = new MousePointerCrosshairsSettings();
+            settings.CrosshairsColor = "00FF00";
+            settings.CrosshairsBorderColor = "00FF00";
+            settings.Opacity = "100";
+            settings.CenterRadius = "0";
+            settings.Thickness = "20";
+            settings.BorderSize = "0";
+            settings.IsFixLength = false;
+            settings.FixedLength = "1";
+
+            var foundCustom = FindMouseUtilElement(MouseUtilsSettings.MouseUtils.FindMyMouse);
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.FindMyMouse, false);
+
+            foundCustom = FindMouseUtilElement(MouseUtilsSettings.MouseUtils.MouseHighlighter);
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MouseHighlighter, true);
+            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MouseHighlighter, false);
+
+            for (int i = 0; i < 10; i++)
+            {
+                Session.PerformMouseAction(MouseActionType.ScrollDown);
+            }
+
+            foundCustom = FindMouseUtilElement(MouseUtilsSettings.MouseUtils.MousePointerCrosshairs);
+
             // this.FindGroup("Enable Mouse Pointer Crosshairs");
             MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MousePointerCrosshairs, false);
             Task.Delay(500).Wait();
@@ -66,9 +169,8 @@ namespace MouseUtils.UITests
             var invalidShortcutText = activationShortcutWindow.Find<TextBlock>("Invalid shortcut");
             Assert.IsNotNull(invalidShortcutText);
 
-            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+            Session.SendKeys(Key.Win, Key.Alt, Key.P);
 
-            // Assert.IsNull(activationShortcutWindow.Find<TextBlock>("Invalid shortcut"));
             var saveButton = activationShortcutWindow.Find<Button>("Save");
             Assert.IsNotNull(saveButton);
             saveButton.Click(false, 500, 1000);
@@ -76,39 +178,31 @@ namespace MouseUtils.UITests
             SetMousePointerCrosshairsAppearanceBehavior(ref foundCustom, ref settings);
             Task.Delay(500).Wait();
 
-            // [Test Case]  Press the activation shortcut and verify the crosshairs appear, and that they follow the mouse around.
+            // [Test Case]  Test the different settings and verify they apply - Change activation shortcut and test it.
+            // [Test Case]  Test the different settings and verify they apply - Crosshairs color.
             var xy0 = Session.GetMousePosition();
             Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
-            Session.PerformMouseAction(MouseActionType.LeftClick);
-            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+
+            IOUtil.MouseClick();
+            Task.Delay(500).Wait();
+            Session.SendKeys(Key.Win, Key.Alt, Key.P);
             Task.Delay(1000).Wait();
 
             xy0 = Session.GetMousePosition();
-            Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2 - 100);
-            Session.PerformMouseAction(MouseActionType.LeftClick);
+
             VerifyMousePointerCrosshairsAppears(ref settings);
             Task.Delay(500).Wait();
 
-            xy0 = Session.GetMousePosition();
-            Session.MoveMouseTo(xy0.Item1 - 50, xy0.Item2 - 50);
+            for (int i = 0; i < 100; i++)
+            {
+                IOUtil.MoveMouseBy(-1, 0);
+                Task.Delay(10).Wait();
+            }
+
             VerifyMousePointerCrosshairsAppears(ref settings);
 
-            // [Test Case] Press the activation shortcut again and verify the crosshairs disappear.
-            Session.SendKeys(Key.Win, Key.Alt, Key.A);
-            Task.Delay(1000).Wait();
-
-            xy0 = Session.GetMousePosition();
-            Session.MoveMouseTo(xy0.Item1 - 10, xy0.Item2);
-            Session.PerformMouseAction(MouseActionType.LeftClick);
-            VerifyMousePointerCrosshairsNotAppears(ref settings);
-            Task.Delay(500).Wait();
-
-            // [Test Case] Disable Mouse Pointer Crosshairs and verify that the module is not activated when you press the activation shortcut.
-            MouseUtilsSettings.SetMouseUtilEnabled(foundCustom, MouseUtilsSettings.MouseUtils.MousePointerCrosshairs, false);
-            xy0 = Session.GetMousePosition();
-            Session.MoveMouseTo(xy0.Item1 - 100, xy0.Item2);
-            Session.PerformMouseAction(MouseActionType.LeftClick);
-            Session.SendKeys(Key.Win, Key.Alt, Key.A);
+            // Press the activation shortcut again and verify the crosshairs disappear.
+            Session.SendKeys(Key.Win, Key.Alt, Key.P);
             Task.Delay(1000).Wait();
 
             VerifyMousePointerCrosshairsNotAppears(ref settings);
@@ -123,33 +217,33 @@ namespace MouseUtils.UITests
 
             int radius = int.Parse(settings.CenterRadius, CultureInfo.InvariantCulture);
 
-            var color = Session.GetPixelColorString(location.Item1, location.Item2);
+            var color = this.GetPixelColorString(location.Item1, location.Item2);
             Assert.AreNotEqual(expectedColor, color);
         }
 
         private void VerifyMousePointerCrosshairsAppears(ref MousePointerCrosshairsSettings settings)
         {
-            Task.Delay(500).Wait();
+            Task.Delay(1000).Wait();
             string expectedColor = string.Empty;
             expectedColor = "#" + settings.CrosshairsColor;
             var location = Session.GetMousePosition();
 
             int radius = int.Parse(settings.CenterRadius, CultureInfo.InvariantCulture);
 
-            var color = Session.GetPixelColorString(location.Item1, location.Item2);
-            Assert.AreEqual(expectedColor, color);
+            var color = this.GetPixelColorString(location.Item1, location.Item2);
+            Assert.AreEqual(expectedColor, color, "Center color check failed");
 
-            var colorX = Session.GetPixelColorString(location.Item1 + 50, location.Item2);
-            Assert.AreEqual(expectedColor, colorX);
+            var colorX = this.GetPixelColorString(location.Item1 + 50, location.Item2);
+            Assert.AreEqual(expectedColor, colorX, "Center x + 50 color check failed");
 
-            colorX = Session.GetPixelColorString(location.Item1 - 50, location.Item2);
-            Assert.AreEqual(expectedColor, colorX);
+            colorX = this.GetPixelColorString(location.Item1 - 50, location.Item2);
+            Assert.AreEqual(expectedColor, colorX, "Center x - 50 color check failed");
 
-            var colorY = Session.GetPixelColorString(location.Item1, location.Item2 + 50);
-            Assert.AreEqual(expectedColor, colorY);
+            var colorY = this.GetPixelColorString(location.Item1, location.Item2 + 50);
+            Assert.AreEqual(expectedColor, colorY, "Center y + 50 color check failed");
 
-            colorY = Session.GetPixelColorString(location.Item1, location.Item2 - 50);
-            Assert.AreEqual(expectedColor, colorY);
+            colorY = this.GetPixelColorString(location.Item1, location.Item2 - 50);
+            Assert.AreEqual(expectedColor, colorY, "Center y + 50 color check failed");
         }
 
         private void SetColor(ref Custom foundCustom, string colorName, string colorValue = "000000")

src/modules/MouseUtils/MouseUtils.UITests/Release-Test-Checklist-Migration-Progress.md

@@ -1,26 +1,64 @@
-## This is for tracking UI-Tests migration progress for Hosts File Editor Module
-Refer to [release check list] (https://github.com/microsoft/PowerToys/blob/releaseChecklist/doc/releases/tests-checklist-template.md#hosts-file-editor) for all manual tests.
+## [Mouse Utils](tests-checklist-template-mouse-utils-section.md)
 
-### Existing Manual Test-cases run by previous PowerToys owner
-For existing manual test-cases, we will convert them to UI-Tests and run them in CI and Release pipeline
+Find My Mouse:
+  * Enable FindMyMouse. Then, without moving your mouse:
+    - [x] Press Left Ctrl twice and verify the overlay appears.
+    - [x] Press any other key and verify the overlay disappears.
+    - [x] Press Left Ctrl twice and verify the overlay appears.
+    - [x] Press a mouse button and verify the overlay disappears.
+  * Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice.
+  * Enable FindMyMouse. Then, without moving your mouse:
+    - [x] Press Left Ctrl twice and verify the overlay appears.
+  * Enable the "Do not activate on game mode" option. Start playing a game that uses CG native full screen.
+    - [ ] Verify the overlay no longer appears when you press Left Ctrl twice.
+  * Disable the "Do not activate on game mode" option. Start playing the same game.
+    - [ ] Verify the overlay appears when you press Left Ctrl twice. (though it'll likely minimize the game)
+  * Test the different settings and verify they apply:
+    - [ ] Overlay opacity
+    - [x] Background color
+    - [x] Spotlight color
+    - [x] Spotlight radius
+    - [ ] Spotlight initial zoom (1x vs 9x will show the difference)
+    - [ ] Animation duration
+    - [ ] Change activation method to shake and activate by shaking your mouse pointer
+    - [ ] Excluded apps
 
- * Launch Host File Editor:
-   - [x] Verify the application exits if "Quit" is clicked on the initial warning. (**HostsSettingTests.TestWarningDialog**)
-   - [x] Launch Host File Editor again and click "Accept". The module should not close. (**HostModuleTests.TestEmptyView**)
-   - [ ] Launch Host File Editor again and click "Accept". The module should not close. Open the hosts file (`%WinDir%\System32\Drivers\Etc`) in a text editor that auto-refreshes so you can see the changes applied by the editor in real time. (VSCode is an editor like this, for example)
-   - [ ] Enable and disable lines and verify they are applied to the file.
-   - [ ] Add a new entry and verify it's applied.
-   - [ ] Add manually an entry with more than 9 hosts in hosts file (Windows limitation) and verify it is split correctly on loading and the info bar is shown.
-   - [x] Try to filter for lines and verify you can find them. (**HostModuleTests.TestFilterControl**)
-   - [ ] Click the "Open hosts file" button and verify it opens in your default editor. (likely Notepad)
- * Test the different settings and verify they are applied:
-   - [ ] Launch as Administrator.
-   - [x] Show a warning at startup. (**HostsSettingTests.TestWarningDialog**)
-   - [ ] Additional lines position.
+Mouse Highlighter:
+  * Enable Mouse Highlighter. Then:
+    - [x] Press the activation shortcut and press left and right click somewhere, verifying the hightlights are applied.
+    - [x] With left mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
+    - [x] With right mouse button pressed, drag the mouse and verify the hightlight is dragged with the pointer.
+    - [x] Press the activation shortcut again and verify no highlights appear when the mouse buttons are clicked.
+    - [x] Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
+  * Test the different settings and verify they apply:
+    - [x] Change activation shortcut and test it
+    - [x] Left button highlight color
+    - [x] Right button highlight color
+    - [ ] Opacity
+    - [ ] Radius
+    - [ ] Fade delay
+    - [ ] Fade duration
 
-### Additional UI-Tests cases
-  - [x] Add manually an entry with more than 9 hosts and Add button should be disabled. (**HostModuleTests.TestTooManyHosts**)
-  - [x] Add manually an entry with less or equal 9 hosts and Add button should be enabled. (**HostModuleTests.TestTooManyHosts**)
-  - [x] Should show empty view if no entries. (**HostModuleTests.TestEmptyView**)
-  - [x] Add a new entry with valid or invalid input (**HostModuleTests.TestAddHost**)
-  - [x] Show save host file error if not run as Administrator. (**HostModuleTests.TestErrorMessageWithNonAdminPermission**)
+Mouse Pointer Crosshairs:
+  * Enable Mouse Pointer Crosshairs. Then:
+    - [x] Press the activation shortcut and verify the crosshairs appear, and that they follow the mouse around.
+    - [x] Press the activation shortcut again and verify the crosshairs disappear.
+    - [x] Disable Mouse Pointer Crosshairs and verify that the module is not activated when you press the activation shortcut.
+  * Test the different settings and verify they apply:
+    - [x] Change activation shortcut and test it
+    - [x] Crosshairs color
+    - [ ] Crosshairs opacity
+    - [ ] Crosshairs center radius
+    - [ ] Crosshairs thickness
+    - [ ] Crosshairs border color
+    - [ ] Crosshairs border size
+
+Mouse Jump:
+  * Enable Mouse Jump. Then:
+    - [x] Press the activation shortcut and verify the screens preview appears.
+    - [x] Change activation shortcut and verify that new shorctut triggers Mouse Jump.
+    - [x] Click around the screen preview and ensure that mouse cursor jumped to clicked location.
+    - [ ] Reorder screens in Display settings and confirm that Mouse Jump reflects the change and still works correctly.
+    - [ ] Change scaling of screens and confirm that Mouse Jump still works correctly.
+    - [ ] Unplug additional monitors and confirm that Mouse Jump still works correctly.
+    - [x] Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.

src/modules/MouseUtils/MouseUtils.UITests/util/IOUtil.cs

@@ -0,0 +1,285 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MouseUtils.UITests
+{
+    public class IOUtil
+    {
+        private readonly UIntPtr ignoreKeyEventFlag = 0x5555;
+
+        [DllImport("user32.dll")]
+
+        private static extern uint SendInput(uint nInputs, INPUT[] pInputs, int cbSize);
+
+        [StructLayout(LayoutKind.Sequential)]
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+
+        internal struct INPUT
+        {
+            internal INPUTTYPE type;
+            internal InputUnion data;
+
+            internal static int Size
+            {
+                get { return Marshal.SizeOf<INPUT>(); }
+            }
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct InputUnion
+        {
+            [FieldOffset(0)]
+            internal MOUSEINPUT mi;
+
+            [FieldOffset(0)]
+            internal KEYBDINPUT ki;
+
+            [FieldOffset(0)]
+            internal HARDWAREINPUT hi;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+
+        internal struct MOUSEINPUT
+        {
+            internal int dx;
+            internal int dy;
+            internal int mouseData;
+            internal uint dwFlags;
+            internal uint time;
+            internal UIntPtr dwExtraInfo;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+
+        internal struct KEYBDINPUT
+        {
+            internal short wVk;
+            internal short wScan;
+            internal uint dwFlags;
+            internal int time;
+            internal UIntPtr dwExtraInfo;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+        internal struct HARDWAREINPUT
+        {
+            internal int uMsg;
+            internal short wParamL;
+            internal short wParamH;
+        }
+
+        internal enum INPUTTYPE : uint
+        {
+            INPUT_MOUSE = 0,
+            INPUT_KEYBOARD = 1,
+            INPUT_HARDWARE = 2,
+        }
+
+        [Flags]
+        internal enum KeyEventF
+        {
+            KeyDown = 0x0000,
+            ExtendedKey = 0x0001,
+            KeyUp = 0x0002,
+            Unicode = 0x0004,
+            Scancode = 0x0008,
+        }
+
+        [Flags]
+        internal enum MouseEventF : uint
+        {
+            MOVE = 0x0001,
+            LEFTDOWN = 0x0002,
+            LEFTUP = 0x0004,
+            RIGHTDOWN = 0x0008,
+            RIGHTUP = 0x0010,
+            ABSOLUTE = 0x8000,
+            MIDDLEDOWN = 0x0020,
+            MIDDLEUP = 0x0040,
+        }
+
+        public static void SimulateMouseDown(bool leftButton = true)
+        {
+            SendMouseInput(leftButton ? MouseEventF.LEFTDOWN : MouseEventF.RIGHTDOWN);
+        }
+
+        public static void SimulateMouseUp(bool leftButton = true)
+        {
+            SendMouseInput(leftButton ? MouseEventF.LEFTUP : MouseEventF.RIGHTUP);
+        }
+
+        public static void MouseClick(bool leftButton = true)
+        {
+            SendMouseInput(leftButton ? MouseEventF.LEFTDOWN : MouseEventF.RIGHTDOWN);
+            SendMouseInput(leftButton ? MouseEventF.LEFTUP : MouseEventF.RIGHTUP);
+        }
+
+        private static void SendMouseInput(MouseEventF mouseFlags)
+        {
+            var input = new INPUT
+            {
+                type = INPUTTYPE.INPUT_MOUSE,
+                data = new InputUnion
+                {
+                    mi = new MOUSEINPUT
+                    {
+                        dx = 0,
+                        dy = 0,
+                        mouseData = 0,
+                        dwFlags = (uint)mouseFlags,
+                        time = 0,
+                        dwExtraInfo = UIntPtr.Zero,
+                    },
+                },
+            };
+
+            INPUT[] inputs = [input];
+            _ = SendInput(1, inputs, INPUT.Size);
+        }
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetMessageExtraInfo();
+
+        public static void MoveMouseBy(int dx, int dy)
+        {
+            var input = new INPUT
+            {
+                type = INPUTTYPE.INPUT_MOUSE,
+                data = new InputUnion
+                {
+                    mi = new MOUSEINPUT
+                    {
+                        dx = dx,
+                        dy = dy,
+                        mouseData = 0,
+                        dwFlags = (uint)MouseEventF.MOVE,
+                        time = 0,
+                        dwExtraInfo = (nuint)GetMessageExtraInfo(),
+                    },
+                },
+            };
+
+            INPUT[] inputs = [input];
+            _ = SendInput(1, inputs, INPUT.Size);
+        }
+
+        [DllImport("user32.dll")]
+        private static extern int GetSystemMetrics(int nIndex);
+
+        public static void MoveMouseTo(int x, int y)
+        {
+            int screenWidth = GetSystemMetrics(0);
+            int screenHeight = GetSystemMetrics(1);
+
+            int normalizedX = (int)(x * 65535 / screenWidth);
+            int normalizedY = (int)(y * 65535 / screenHeight);
+
+            var input = new INPUT
+            {
+                type = INPUTTYPE.INPUT_MOUSE,
+                data = new InputUnion
+                {
+                    mi = new MOUSEINPUT
+                    {
+                        dx = normalizedX,
+                        dy = normalizedY,
+                        mouseData = 0,
+                        dwFlags = (uint)(MouseEventF.MOVE | MouseEventF.ABSOLUTE),
+                        time = 0,
+                        dwExtraInfo = UIntPtr.Zero,
+                    },
+                },
+            };
+
+            INPUT[] inputs = [input];
+            _ = SendInput(1, inputs, INPUT.Size);
+        }
+
+        private void SendSingleKeyboardInput(short keyCode, uint keyStatus)
+        {
+            var inputShift = new INPUT
+            {
+                type = INPUTTYPE.INPUT_KEYBOARD,
+                data = new InputUnion
+                {
+                    ki = new KEYBDINPUT
+                    {
+                        wVk = keyCode,
+                        dwFlags = keyStatus,
+
+                        // Any keyevent with the extraInfo set to this value will be ignored by the keyboard hook and sent to the system instead.
+                        dwExtraInfo = ignoreKeyEventFlag,
+                    },
+                },
+            };
+
+            INPUT[] inputs = [inputShift];
+            _ = SendInput(1, inputs, INPUT.Size);
+        }
+
+        public static void SimulateKeyDown(ushort keyCode)
+        {
+            SendKey(keyCode, false);
+        }
+
+        public static void SimulateKeyUp(ushort keyCode)
+        {
+            SendKey(keyCode, true);
+        }
+
+        public static void SimulateKeyPress(ushort keyCode)
+        {
+            SendKey(keyCode, false);
+            SendKey(keyCode, true);
+        }
+
+        public static void SimulateShortcut(params ushort[] keyCodes)
+        {
+            foreach (var key in keyCodes)
+            {
+                SimulateKeyDown(key);
+            }
+
+            for (int i = keyCodes.Length - 1; i >= 0; i--)
+            {
+                SimulateKeyUp(keyCodes[i]);
+            }
+        }
+
+        public static void SendKey(ushort keyCode, bool keyUp)
+        {
+            var inputShift = new INPUT
+            {
+                type = INPUTTYPE.INPUT_KEYBOARD,
+                data = new InputUnion
+                {
+                    ki = new KEYBDINPUT
+                    {
+                        wVk = (short)keyCode,
+                        dwFlags = (uint)(keyUp ? KeyEventF.KeyUp : 0),
+                        dwExtraInfo = (uint)IntPtr.Zero,
+                    },
+                },
+            };
+            INPUT[] inputs = [inputShift];
+
+            _ = SendInput(1, inputs, INPUT.Size);
+        }
+    }
+}

src/modules/Workspaces/WorkspacesEditorUITest/WorkspacesEditorTests.cs

@@ -0,0 +1,24 @@
+// 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.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace WorkspacesEditorUITest;
+
+[TestClass]
+public class WorkspacesEditorTests : UITestBase
+{
+    public WorkspacesEditorTests()
+        : base(PowerToysModule.Workspaces, WindowSize.Medium)
+    {
+    }
+
+    [TestMethod("WorkspacesEditor.Items.Present")]
+    [TestCategory("Workspaces UI")]
+    public void TestItemsPresents()
+    {
+        Assert.IsTrue(this.Has<Button>("Create Workspace"), "Should have create workspace button");
+    }
+}

src/modules/Workspaces/WorkspacesEditorUITest/WorkspacesEditorUITest.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <OutputType>Library</OutputType>
+    <RunVSTest>false</RunVSTest>
+    <IsTestProject>true</IsTestProject>
+    <IsPackable>false</IsPackable>
+    <AssemblyName>PowerToys.Workspaces.UITests</AssemblyName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\Workspaces.UITests\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Appium.WebDriver" />
+    <PackageReference Include="MSTest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+  </ItemGroup>
+
+</Project>

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -121,6 +121,22 @@ 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,5 +1,6 @@
 #include "pch.h"
 #include "AppUtils.h"
+#include "SteamHelper.h"
 
 #include <atlbase.h>
 #include <propvarutil.h>
@@ -34,6 +35,8 @@ 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()
@@ -138,6 +141,34 @@ 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());
+                                            }
+                                        }
+                                    }
                                 }
                             }
 
@@ -397,5 +428,10 @@ 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,10 +13,12 @@ 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

@@ -0,0 +1,171 @@
+#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

@@ -0,0 +1,24 @@
+#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,6 +41,7 @@
     <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" />
@@ -57,6 +58,7 @@
       <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,6 +53,9 @@
     <ClInclude Include="StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SteamHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -88,6 +91,9 @@
     <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,6 +71,8 @@ namespace SnapshotUtils
                 continue;
             }
 
+            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
+
             DWORD pid{};
             GetWindowThreadProcessId(window, &pid);
 
@@ -118,10 +120,19 @@ namespace SnapshotUtils
             auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
             if (!data.has_value() || data->name.empty())
             {
-                Logger::info(L"Installed app not found: {}", processPath);
+                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), 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,6 +200,14 @@ 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,10 +9,12 @@ 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);
-        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
+
+        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
+
+        if (isPopup && !(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,4 +121,11 @@ 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/CmdPalKeyboardService/CmdPalKeyboardService.def

@@ -0,0 +1,3 @@
+EXPORTS
+DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
+DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.rc

@@ -0,0 +1,40 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0"
+  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')" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
+    <ProjectGuid>{5f63c743-f6ce-4dba-a200-2b3f8a14e8c2}</ProjectGuid>
+    <ProjectName>CmdPalKeyboardService</ProjectName>
+    <RootNamespace>CmdPalKeyboardService</RootNamespace>
+    <AppxPackage>false</AppxPackage>
+  </PropertyGroup>
+
+  <!-- BEGIN common.build.pre.props -->
+  <PropertyGroup Label="Configuration">
+    <EnableHybridCRT>true</EnableHybridCRT>
+    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
+  </PropertyGroup>
+  <!-- END common.build.pre.props -->
+  <!-- BEGIN cppwinrt.build.pre.props -->
+  <PropertyGroup Label="Globals">
+    <CppWinRTEnabled>true</CppWinRTEnabled>
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <AppContainerApplication>true</AppContainerApplication>
+    <WindowsStoreApp>true</WindowsStoreApp>
+    <ApplicationType>Windows Store</ApplicationType>
+    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference> <!-- The SDK reference breaks the Hybrid CRT -->
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
+    <_VC_Target_Library_Platform>Desktop</_VC_Target_Library_Platform>
+    <_NoWinAPIFamilyApp>true</_NoWinAPIFamilyApp>
+  </PropertyGroup>
+  <!-- END cppwinrt.build.pre.props -->
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PropertySheet.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <TargetName>CmdPalKeyboardService</TargetName>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
+      <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <ModuleDefinitionFile>CmdPalKeyboardService.def</ModuleDefinitionFile>
+      <AdditionalDependencies>Shell32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="KeyboardListener.h">
+      <DependentUpon>KeyboardListener.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="KeyboardListener.cpp">
+      <DependentUpon>KeyboardListener.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="KeyboardListener.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="CmdPalKeyboardService.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PropertySheet.props" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalKeyboardService.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+
+  <!-- BEGIN common.build.post.props -->
+  <!--
+    The Hybrid CRT model statically links the runtime and STL and dynamically
+    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
+    WinAppSDK asserts that this is "supported according to the CRT maintainer."
+
+    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
+  -->
+  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <!-- END common.build.post.props -->
+
+</Project>

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj.filters

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resources">
+      <UniqueIdentifier>accd3aa8-1ba0-4223-9bbe-0c431709210b</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Generated Files">
+      <UniqueIdentifier>{926ab91d-31b4-48c3-b9a4-e681349f27f0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="KeyboardListener.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CmdPalKeyboardService.def" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PropertySheet.props" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalKeyboardService.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.cpp

@@ -0,0 +1,165 @@
+#include "pch.h"
+#include "KeyboardListener.h"
+#include "KeyboardListener.g.cpp"
+
+// #include <common/logger/logger.h>
+// #include <common/utils/logger_helper.h>
+#include <common/utils/winapi_error.h>
+
+namespace
+{
+}
+
+namespace winrt::CmdPalKeyboardService::implementation
+{
+    KeyboardListener::KeyboardListener()
+    {
+        s_instance = this;
+    }
+
+    void KeyboardListener::Start()
+    {
+#if defined(DISABLE_LOWLEVEL_HOOKS_WHEN_DEBUGGED)
+        const bool hook_disabled = IsDebuggerPresent();
+#else
+        const bool hook_disabled = false;
+#endif
+        if (!hook_disabled)
+        {
+            if (!s_llKeyboardHook)
+            {
+                s_llKeyboardHook = SetWindowsHookExW(WH_KEYBOARD_LL, LowLevelKeyboardProc, NULL, NULL);
+                if (!s_llKeyboardHook)
+                {
+                    DWORD errorCode = GetLastError();
+                    show_last_error_message(L"SetWindowsHookEx", errorCode, L"CmdPalKeyboardService");
+                }
+            }
+        }
+    }
+
+    void KeyboardListener::Stop()
+    {
+        if (s_llKeyboardHook && UnhookWindowsHookEx(s_llKeyboardHook))
+        {
+            s_llKeyboardHook = NULL;
+        }
+    }
+
+    void KeyboardListener::SetHotkeyAction(bool win, bool ctrl, bool shift, bool alt, uint8_t key, hstring const& id)
+    {
+        Hotkey hotkey = { .win = win, .ctrl = ctrl, .shift = shift, .alt = alt, .key = key };
+        std::unique_lock lock{ mutex };
+
+        HotkeyDescriptor desc = { .hotkey = hotkey, .id = std::wstring(id) };
+        hotkeyDescriptors.insert(desc);
+    }
+
+    void KeyboardListener::ClearHotkey(hstring const& id)
+    {
+        {
+            std::unique_lock lock{ mutex };
+            auto it = hotkeyDescriptors.begin();
+            while (it != hotkeyDescriptors.end())
+            {
+                if (it->id == id)
+                {
+                    it = hotkeyDescriptors.erase(it);
+                }
+                else
+                {
+                    ++it;
+                }
+            }
+        }
+    }
+
+    void KeyboardListener::ClearHotkeys()
+    {
+        {
+            std::unique_lock lock{ mutex };
+            auto it = hotkeyDescriptors.begin();
+            while (it != hotkeyDescriptors.end())
+            {
+                it = hotkeyDescriptors.erase(it);
+            }
+        }
+    }
+
+    void KeyboardListener::SetProcessCommand(ProcessCommand processCommand)
+    {
+        m_processCommandCb = [trigger = std::move(processCommand)](hstring const& id) {
+            trigger(id);
+        };
+    }
+
+    LRESULT KeyboardListener::DoLowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
+    {
+        const auto& keyPressInfo = *reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
+
+        if ((wParam != WM_KEYDOWN) && (wParam != WM_SYSKEYDOWN))
+        {
+            return CallNextHookEx(NULL, nCode, wParam, lParam);
+        }
+
+        Hotkey hotkey{
+            .win = (GetAsyncKeyState(VK_LWIN) & 0x8000) || (GetAsyncKeyState(VK_RWIN) & 0x8000),
+            .ctrl = static_cast<bool>(GetAsyncKeyState(VK_CONTROL) & 0x8000),
+            .shift = static_cast<bool>(GetAsyncKeyState(VK_SHIFT) & 0x8000),
+            .alt = static_cast<bool>(GetAsyncKeyState(VK_MENU) & 0x8000),
+            .key = static_cast<unsigned char>(keyPressInfo.vkCode)
+        };
+
+        if (hotkey == Hotkey{})
+        {
+            return CallNextHookEx(NULL, nCode, wParam, lParam);
+        }
+
+        bool do_action = false;
+        std::wstring actionId{};
+
+        {
+            // Hold the lock for the shortest possible duration
+            std::unique_lock lock{ mutex };
+            HotkeyDescriptor dummy{ .hotkey = hotkey };
+            auto it = hotkeyDescriptors.find(dummy);
+            if (it != hotkeyDescriptors.end())
+            {
+                do_action = true;
+                actionId = it->id;
+            }
+        }
+
+        if (do_action)
+        {
+            m_processCommandCb(hstring{ actionId });
+
+            // After invoking the hotkey send a dummy key to prevent Start Menu from activating
+            INPUT dummyEvent[1] = {};
+            dummyEvent[0].type = INPUT_KEYBOARD;
+            dummyEvent[0].ki.wVk = 0xFF;
+            dummyEvent[0].ki.dwFlags = KEYEVENTF_KEYUP;
+            SendInput(1, dummyEvent, sizeof(INPUT));
+
+            // Swallow the key press
+            return 1;
+        }
+
+        return CallNextHookEx(NULL, nCode, wParam, lParam);
+    }
+
+    LRESULT KeyboardListener::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
+    {
+        if (s_instance == nullptr)
+        {
+            return CallNextHookEx(NULL, nCode, wParam, lParam);
+        }
+
+        if (nCode < 0)
+        {
+            return CallNextHookEx(NULL, nCode, wParam, lParam);
+        }
+
+        return s_instance->DoLowLevelKeyboardProc(nCode, wParam, lParam);
+    }
+}

src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#include "KeyboardListener.g.h"
+#include <mutex>
+#include <spdlog/stopwatch.h>
+#include <set>
+
+namespace winrt::CmdPalKeyboardService::implementation
+{
+    struct KeyboardListener : KeyboardListenerT<KeyboardListener>
+    {
+        struct Hotkey
+        {
+            bool win = false;
+            bool ctrl = false;
+            bool shift = false;
+            bool alt = false;
+            unsigned char key = 0;
+
+            std::strong_ordering operator<=>(const Hotkey&) const = default;
+        };
+
+        struct HotkeyDescriptor
+        {
+            Hotkey hotkey;
+            std::wstring id;
+
+            bool operator<(const HotkeyDescriptor& other) const
+            {
+                return hotkey < other.hotkey;
+            };
+        };
+
+        KeyboardListener();
+
+        void Start();
+        void Stop();
+        void SetHotkeyAction(bool win, bool ctrl, bool shift, bool alt, uint8_t key, hstring const& id);
+        void ClearHotkey(hstring const& id);
+        void ClearHotkeys();
+        void SetProcessCommand(ProcessCommand processCommand);
+
+        static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
+
+    private:
+        LRESULT CALLBACK DoLowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
+
+        static inline KeyboardListener* s_instance;
+        HHOOK s_llKeyboardHook = nullptr;
+
+        // Max DWORD for key code to disable keys.
+        const DWORD VK_DISABLED = 0x100;
+        DWORD vkCodePressed = VK_DISABLED;
+
+        std::multiset<HotkeyDescriptor> hotkeyDescriptors;
+        std::mutex mutex;
+
+        std::function<void(hstring const&)> m_processCommandCb;
+    };
+}
+
+namespace winrt::CmdPalKeyboardService::factory_implementation
+{
+    struct KeyboardListener : KeyboardListenerT<KeyboardListener, implementation::KeyboardListener>
+    {
+    };
+}

src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.idl

@@ -0,0 +1,16 @@
+
+namespace CmdPalKeyboardService
+{
+    [version(1.0), uuid(78ab07cd-e128-4e73-86aa-e48e6b6d01ff)] delegate void ProcessCommand(String id);
+
+    [default_interface] runtimeclass KeyboardListener {
+        KeyboardListener();
+        void Start();
+        void Stop();
+
+        void SetHotkeyAction(Boolean win, Boolean ctrl, Boolean shift, Boolean alt, UInt8 key, String id);
+        void ClearHotkey(String id);
+        void ClearHotkeys();
+        void SetProcessCommand(ProcessCommand processCommand);
+    }
+}

src/modules/cmdpal/CmdPalKeyboardService/PropertySheet.props

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <!--
+    To customize common C++/WinRT project properties: 
+    * right-click the project node
+    * expand the Common Properties item
+    * select the C++/WinRT property page
+
+    For more advanced scenarios, and complete documentation, please see:
+    https://github.com/Microsoft/cppwinrt/tree/master/nuget 
+    -->
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+</Project>