Put reg preview item back and updated highlights

Some PRs are still not included.

.config/configuration.vsEnterprise.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.vsProfessional.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: X.XX.X
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 
@@ -20,7 +20,7 @@ body:
   type: dropdown
   attributes:
     label: Installation method
-    description: How / where was PowerToys installed from?
+    description: How / Where was PowerToys installed from?
     multiple: true
     options:
       - GitHub

.github/ISSUE_TEMPLATE/documentation-issue.yml

@@ -6,7 +6,7 @@ labels:
 body:
 - type: textarea
   attributes: 
-    label: Describe the requested doc changes
+    label: Provide a description of requested docs changes
     placeholder: Briefly describe which document needs to be corrected and why.
   validations:
     required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -13,7 +13,7 @@ body:
 - type: textarea
   attributes:
     label: Scenario when this would be used?
-    placeholder: What is the scenario this would be used in? Why is this important to your workflow as a power user?
+    placeholder: What is the scenario this would be used? Why is this important to your workflow as a power user?
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -14,7 +14,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: 0.70.0
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 - type: dropdown
@@ -65,7 +65,7 @@ body:
 - type: textarea
   attributes: 
     label: ❌ Actual phrase(s)
-    placeholder: What is there? Please include a screenshot, as that is extremely helpful.
+    placeholder: What is there? Please include a screenshot as that is extremely helpful.
   validations:
     required: true
 - type: textarea

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

@@ -271,11 +271,6 @@ mengyuanchen
 
 # DllName
 testhost
-Testably
 
 #Tools
-OIP
-xef
-xes
-PACKAGEVERSIONNUMBER
-APPXMANIFESTVERSION
+OIP

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

@@ -46,8 +46,8 @@ betsegaw
 bricelam
 bsky
 CCcat
-chemwolf
 chenmy
+chemwolf
 Chinh
 chrdavis
 Chrzan
@@ -65,8 +65,8 @@ Deondre
 DHowett
 ductdo
 Essey
-ethanfangg
 Feng
+ethanfangg
 ferraridavide
 foxmsft
 frankychen
@@ -77,7 +77,6 @@ Galaxi
 Garside
 Gershaft
 Giordani
-Gleb
 Gokce
 gordon
 Griese
@@ -96,7 +95,6 @@ Huynh
 Ionut
 jamrobot
 Jaswal
-Jaylyn
 jefflord
 Jordi
 jyuwono
@@ -107,7 +105,6 @@ Kantarci
 Karthick
 kaylacinnamon
 kevinguo
-Khmyznikov
 Krigun
 Lambson
 Laute
@@ -130,8 +127,6 @@ Naro
 nathancartlidge
 Nemeth
 nielslaute
-Noraa
-noraajunker
 oldnewthing
 onegreatworld
 palenshus
@@ -151,13 +146,11 @@ ricardosantos
 riri
 ritchielawrence
 robmikh
-ruslanlap
 Russinovich
 Rutkas
 ryanbodrug
 saahmedm
 sachaple
-Sameerjs
 Santossio
 Schoen
 Sekan
@@ -173,11 +166,9 @@ Tadele
 talynone
 Taras
 TBM
-Teutsch
 tilovell
 Triet
 urnotdfs
-vednig
 waaverecords
 wang
 Whuihuan
@@ -196,6 +187,9 @@ zhaopy
 zhaoqpcn
 Zoltan
 Zykova
+Sameerjs
+ruslanlap
+vednig
 
 # OTHERS
 

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

@@ -92,7 +92,6 @@
 ^\.github/actions/spell-check/
 ^\.gitmodules$
 ^\Q.github/workflows/spelling2.yml\E$
-^\Q.pipelines/272MSSharedLibSN2048.snk\E$
 ^\Q.pipelines/ESRPSigning_core.json\E$
 ^\Qdoc/devdocs/localization.md\E$
 ^\Qsrc/common/ManagedCommon/ColorFormatHelper.cs\E$
@@ -121,7 +120,6 @@
 ^src/modules/MouseWithoutBorders/App/Form/.*\.resx$
 ^src/modules/MouseWithoutBorders/App/Helper/.*\.resx$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag\.txt$
-^src/modules/ZoomIt/ZoomIt/ZoomIt\.idc$
 ^src/Monaco/
 ^src/common/sysinternals/Eula/
 ^tools/Verification scripts/Check preview handler registration\.ps1$

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

@@ -14,7 +14,6 @@ AColumn
 acrt
 ACTIVATEAPP
 activationaction
-ACTIVATEOPTIONS
 ACVS
 adaptivecards
 ADate
@@ -69,7 +68,6 @@ appwiz
 APSTUDIO
 AQS
 ARandom
-Arash
 ARCHITEW
 ARemapped
 ARPINSTALLLOCATION
@@ -317,7 +315,6 @@ debugbreak
 declatory
 decryptor
 Dedup
-Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
@@ -349,7 +346,6 @@ devmgmt
 DEVMODE
 DEVMODEW
 devpal
-DFX
 DIALOGEX
 digicert
 dimm
@@ -470,7 +466,6 @@ EXPCMDFLAGS
 EXPCMDSTATE
 explr
 exppowertoys
-exprtk
 exptas
 exsb
 exstyle
@@ -671,6 +666,7 @@ IBeam
 icf
 ICONERROR
 ICONLOCATION
+idc
 IDCANCEL
 IDD
 idk
@@ -681,6 +677,7 @@ IDR
 IDXGI
 ietf
 IEXPLORE
+iextn
 IFACEMETHOD
 IFACEMETHODIMP
 IFile
@@ -719,6 +716,7 @@ INPUTMOUSE
 INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
+INSTALLDIR
 installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
@@ -754,7 +752,6 @@ iwr
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
 jjw
-JLO
 jobject
 jpe
 jpnime
@@ -788,7 +785,6 @@ LCIDTo
 Lclean
 Ldone
 Ldr
-LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
 LError
@@ -811,6 +807,7 @@ LMENU
 lnks
 LOADFROMFILE
 LOBYTE
+localappdata
 LOCALDISPLAY
 localpackage
 LOCALSYSTEM
@@ -975,6 +972,7 @@ msrc
 msstore
 mst
 msvcp
+msvsmon
 MTND
 MULTIPLEUSE
 multizone
@@ -1152,7 +1150,6 @@ PARTIALCONFIRMATIONDIALOGTITLE
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
-partow
 PATPAINT
 pbc
 pbi
@@ -1282,6 +1279,7 @@ pstm
 PStr
 pstream
 pstrm
+pswd
 PSYSTEM
 psz
 ptb
@@ -1473,12 +1471,16 @@ SHELLDLL
 shellex
 SHELLEXECUTEINFO
 SHELLEXECUTEINFOW
+SHELLEXTENSION
 SHELLICONSIZE
+SHELLNEWVALUE
 SHFILEINFO
 SHFILEOPSTRUCT
 SHGDN
 SHGDNF
 SHGFI
+SHGFIICON
+SHGFILARGEICON
 SHIL
 shinfo
 shlwapi
@@ -1512,6 +1514,7 @@ siex
 sigdn
 SIGNINGSCENARIO
 signtool
+Signtool
 SINGLEKEY
 sipolicy
 SIZEBOX
@@ -1529,7 +1532,6 @@ SMALLICON
 smartphone
 SMTO
 SNAPPROCESS
-snk
 snwprintf
 softline
 SOURCECLIENTAREAONLY
@@ -1582,7 +1584,6 @@ steamapps
 STGC
 STGM
 STGMEDIUM
-STGMREAD
 STICKYKEYS
 sticpl
 storelogo
@@ -1774,6 +1775,7 @@ uxtheme
 vabdq
 validmodulename
 valuegenerator
+VARENUM
 variantassignment
 vcamp
 VCENTER
@@ -1989,10 +1991,3 @@ culori
 Evercoder
 LCh
 CIELCh
-CLSCTXINPROCALL
-IIDI
-irow
-lcid
-ppwsz
-rguid
-VARTYPE

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

@@ -243,4 +243,4 @@ Process Process
 
 # ZoomIt menu items with accelerator keys
 E&xit
-St&yle
+St&yle

.github/pull_request_template.md

@@ -5,9 +5,9 @@
 ## PR Checklist
 
 - [ ] **Closes:** #xxx
-- [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
+- [ ] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
-- [ ] **Localization:** All end-user-facing strings can be localized
+- [ ] **Localization:** All end user facing strings can be localized
 - [ ] **Dev docs:** Added/updated
 - [ ] **New binaries:** Added on the required places
    - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries
@@ -16,7 +16,7 @@
    - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
 - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx
 
-<!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here -->
+<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
 ## Detailed Description of the Pull Request / Additional comments
 
 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->

.github/workflows/package-submissions.yml

@@ -1,4 +1,5 @@
 name: WinGet submission on release
+# based off of https://github.com/nushell/nushell/blob/main/.github/workflows/winget-submission.yml
 
 on:
   workflow_dispatch:
@@ -8,31 +9,23 @@ on:
 jobs:
   winget:
     name: Publish winget package
-
-    # winget-create is only supported on Windows
     runs-on: windows-latest
-
-    # winget-create will read the following environment variable to access the GitHub token needed for submitting a PR
-    # See https://aka.ms/winget-create-token
-    env:
-      WINGET_CREATE_GITHUB_TOKEN: ${{ secrets.PT_WINGET }}
-
-    # Only submit stable releases
-    if: ${{ !github.event.release.prerelease }}
     steps:
       - name: Submit Microsoft.PowerToys package to Windows Package Manager Community Repository
         run: |
-          # Get installer info from GitHub release event
-          $assets = '${{ toJSON(github.event.release.assets) }}' | ConvertFrom-Json
-          $x64UserInstallerUrl = $assets | Where-Object -Property name -match 'PowerToysUserSetup.*x64' | Select -ExpandProperty browser_download_url
-          $x64MachineInstallerUrl = $assets | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url
-          $arm64UserInstallerUrl = $assets | Where-Object -Property name -match 'PowerToysUserSetup.*arm64' | Select -ExpandProperty browser_download_url
-          $arm64MachineInstallerUrl = $assets | Where-Object -Property name -match 'PowerToysSetup.*arm64' | Select -ExpandProperty browser_download_url
-          $packageVersion = (${{ toJSON(github.event.release.tag_name) }}).Trim('v')
 
-          # Update package using wingetcreate
-          curl.exe -JLO https://aka.ms/wingetcreate/latest
-          .\wingetcreate.exe update Microsoft.PowerToys `
-            --version $packageVersion `
-            --urls "$x64UserInstallerUrl|user" "$x64MachineInstallerUrl|machine" "$arm64UserInstallerUrl|user" "$arm64MachineInstallerUrl|machine" `
-            --submit
+          $wingetPackage = "Microsoft.PowerToys"
+          $gitToken = "${{ secrets.PT_WINGET }}"
+
+          $github = Invoke-RestMethod -uri "https://api.github.com/repos/Microsoft/PowerToys/releases" 
+
+          $targetRelease = $github | Where-Object -Property name -match 'Release'| Select -First 1
+          $installerUserX64Url = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysUserSetup.*x64' | Select -ExpandProperty browser_download_url
+          $installerMachineX64Url = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url
+          $installerUserArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysUserSetup.*arm64' | Select -ExpandProperty browser_download_url
+          $installerMachineArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*arm64' | Select -ExpandProperty browser_download_url
+          $ver = $targetRelease.tag_name -ireplace '^v'
+
+          # getting latest wingetcreate file
+          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$installerUserX64Url|user" "$installerMachineX64Url|machine" "$installerUserArmUrl|user" "$installerMachineArmUrl|machine" -t $gitToken

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        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@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        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@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        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@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        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

@@ -3,227 +3,226 @@
     "UseMinimatch": false,
     "SignBatches": [
         {
-          "MatchedPath": [
-            "*.resources.dll",
+            "MatchedPath": [
+                "*.resources.dll",
+                
+                "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",
 
-            "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",
+                "PowerToys.ActionRunner.exe",
+                "PowerToys.Update.exe",
+                "PowerToys.BackgroundActivatorDLL.dll",
+                "Notifications.dll",
+                "os-detection.dll",
+                "PowerToys.exe",
+                "PowerToys.FilePreviewCommon.dll",
+                "PowerToys.Interop.dll",
+                "Tools\\PowerToys.BugReportTool.exe",
+                "StylesReportTool\\PowerToys.StylesReportTool.exe",
+                "Telemetry.dll",
+                "PowerToys.ManagedTelemetry.dll",
+                "PowerToys.ManagedCommon.dll",
+                "PowerToys.Common.UI.dll",
+                "PowerToys.Settings.UI.Lib.dll",
+                "PowerToys.GPOWrapper.dll",
+                "PowerToys.GPOWrapperProjection.dll",
+                "PowerToys.AllExperiments.dll",
 
-            "PowerToys.ActionRunner.exe",
-            "PowerToys.Update.exe",
-            "PowerToys.BackgroundActivatorDLL.dll",
-            "Notifications.dll",
-            "os-detection.dll",
-            "PowerToys.exe",
-            "PowerToys.FilePreviewCommon.dll",
-            "PowerToys.Interop.dll",
-            "Tools\\PowerToys.BugReportTool.exe",
-            "StylesReportTool\\PowerToys.StylesReportTool.exe",
-            "Telemetry.dll",
-            "CalculatorEngineCommon.dll",
-            "PowerToys.ManagedTelemetry.dll",
-            "PowerToys.ManagedCommon.dll",
-            "PowerToys.Common.UI.dll",
-            "PowerToys.Settings.UI.Lib.dll",
-            "PowerToys.GPOWrapper.dll",
-            "PowerToys.GPOWrapperProjection.dll",
-            "PowerToys.AllExperiments.dll",
+                "PowerToys.AlwaysOnTop.exe",
+                "PowerToys.AlwaysOnTopModuleInterface.dll",
 
-            "PowerToys.AlwaysOnTop.exe",
-            "PowerToys.AlwaysOnTopModuleInterface.dll",
+                "PowerToys.CmdNotFoundModuleInterface.dll",
+                "PowerToys.CmdNotFound.dll",
 
-            "PowerToys.CmdNotFoundModuleInterface.dll",
-            "PowerToys.CmdNotFound.dll",
+                "PowerToys.ColorPicker.dll",
+                "PowerToys.ColorPickerUI.dll",
+                "PowerToys.ColorPickerUI.exe",
 
-            "PowerToys.ColorPicker.dll",
-            "PowerToys.ColorPickerUI.dll",
-            "PowerToys.ColorPickerUI.exe",
+                "PowerToys.CropAndLockModuleInterface.dll",
+                "PowerToys.CropAndLock.exe",
 
-            "PowerToys.CropAndLockModuleInterface.dll",
-            "PowerToys.CropAndLock.exe",
+                "PowerToys.PowerOCRModuleInterface.dll",
+                "PowerToys.PowerOCR.dll",
+                "PowerToys.PowerOCR.exe",
 
-            "PowerToys.PowerOCRModuleInterface.dll",
-            "PowerToys.PowerOCR.dll",
-            "PowerToys.PowerOCR.exe",
+                "PowerToys.AdvancedPasteModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.AdvancedPaste.exe",
+                "WinUI3Apps\\PowerToys.AdvancedPaste.dll",
 
-            "PowerToys.AdvancedPasteModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.AdvancedPaste.exe",
-            "WinUI3Apps\\PowerToys.AdvancedPaste.dll",
+                "PowerToys.AwakeModuleInterface.dll",
+                "PowerToys.Awake.exe",
+                "PowerToys.Awake.dll",
 
-            "PowerToys.AwakeModuleInterface.dll",
-            "PowerToys.Awake.exe",
-            "PowerToys.Awake.dll",
+                "fancyzones.dll",
+                "PowerToys.FancyZonesEditor.exe",
+                "PowerToys.FancyZonesEditor.dll",
+                "PowerToys.FancyZonesEditorCommon.dll",
+                "PowerToys.FancyZonesModuleInterface.dll",
+                "PowerToys.FancyZones.exe",
 
-            "fancyzones.dll",
-            "PowerToys.FancyZonesEditor.exe",
-            "PowerToys.FancyZonesEditor.dll",
-            "PowerToys.FancyZonesEditorCommon.dll",
-            "PowerToys.FancyZonesModuleInterface.dll",
-            "PowerToys.FancyZones.exe",
+                "PowerToys.GcodePreviewHandler.dll",
+                "PowerToys.GcodePreviewHandler.exe",
+                "PowerToys.GcodePreviewHandlerCpp.dll",
+                "PowerToys.GcodeThumbnailProvider.dll",
+                "PowerToys.GcodeThumbnailProvider.exe",
+                "PowerToys.GcodeThumbnailProviderCpp.dll",
+                "PowerToys.ManagedTelemetry.dll",
+                "PowerToys.MarkdownPreviewHandler.dll",
+                "PowerToys.MarkdownPreviewHandler.exe",
+                "PowerToys.MarkdownPreviewHandlerCpp.dll",
+                "PowerToys.MonacoPreviewHandler.dll",
+                "PowerToys.MonacoPreviewHandler.exe",
+                "PowerToys.MonacoPreviewHandlerCpp.dll",
+                "PowerToys.PdfPreviewHandler.dll",
+                "PowerToys.PdfPreviewHandler.exe",
+                "PowerToys.PdfPreviewHandlerCpp.dll",
+                "PowerToys.PdfThumbnailProvider.dll",
+                "PowerToys.PdfThumbnailProvider.exe",
+                "PowerToys.PdfThumbnailProviderCpp.dll",
+                "PowerToys.powerpreview.dll",
+                "PowerToys.PreviewHandlerCommon.dll",
+                "PowerToys.QoiPreviewHandler.dll",
+                "PowerToys.QoiPreviewHandler.exe",
+                "PowerToys.QoiPreviewHandlerCpp.dll",
+                "PowerToys.QoiThumbnailProvider.dll",
+                "PowerToys.QoiThumbnailProvider.exe",
+                "PowerToys.QoiThumbnailProviderCpp.dll",
+                "PowerToys.StlThumbnailProvider.dll",
+                "PowerToys.StlThumbnailProvider.exe",
+                "PowerToys.StlThumbnailProviderCpp.dll",
+                "PowerToys.SvgPreviewHandler.dll",
+                "PowerToys.SvgPreviewHandler.exe",
+                "PowerToys.SvgPreviewHandlerCpp.dll",
+                "PowerToys.SvgThumbnailProvider.dll",
+                "PowerToys.SvgThumbnailProvider.exe",
+                "PowerToys.SvgThumbnailProviderCpp.dll",
 
-            "PowerToys.GcodePreviewHandler.dll",
-            "PowerToys.GcodePreviewHandler.exe",
-            "PowerToys.GcodePreviewHandlerCpp.dll",
-            "PowerToys.GcodeThumbnailProvider.dll",
-            "PowerToys.GcodeThumbnailProvider.exe",
-            "PowerToys.GcodeThumbnailProviderCpp.dll",
-            "PowerToys.ManagedTelemetry.dll",
-            "PowerToys.MarkdownPreviewHandler.dll",
-            "PowerToys.MarkdownPreviewHandler.exe",
-            "PowerToys.MarkdownPreviewHandlerCpp.dll",
-            "PowerToys.MonacoPreviewHandler.dll",
-            "PowerToys.MonacoPreviewHandler.exe",
-            "PowerToys.MonacoPreviewHandlerCpp.dll",
-            "PowerToys.PdfPreviewHandler.dll",
-            "PowerToys.PdfPreviewHandler.exe",
-            "PowerToys.PdfPreviewHandlerCpp.dll",
-            "PowerToys.PdfThumbnailProvider.dll",
-            "PowerToys.PdfThumbnailProvider.exe",
-            "PowerToys.PdfThumbnailProviderCpp.dll",
-            "PowerToys.powerpreview.dll",
-            "PowerToys.PreviewHandlerCommon.dll",
-            "PowerToys.QoiPreviewHandler.dll",
-            "PowerToys.QoiPreviewHandler.exe",
-            "PowerToys.QoiPreviewHandlerCpp.dll",
-            "PowerToys.QoiThumbnailProvider.dll",
-            "PowerToys.QoiThumbnailProvider.exe",
-            "PowerToys.QoiThumbnailProviderCpp.dll",
-            "PowerToys.StlThumbnailProvider.dll",
-            "PowerToys.StlThumbnailProvider.exe",
-            "PowerToys.StlThumbnailProviderCpp.dll",
-            "PowerToys.SvgPreviewHandler.dll",
-            "PowerToys.SvgPreviewHandler.exe",
-            "PowerToys.SvgPreviewHandlerCpp.dll",
-            "PowerToys.SvgThumbnailProvider.dll",
-            "PowerToys.SvgThumbnailProvider.exe",
-            "PowerToys.SvgThumbnailProviderCpp.dll",
+                "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.HostsUILib.dll",
+                "WinUI3Apps\\PowerToys.Hosts.dll",
+                "WinUI3Apps\\PowerToys.Hosts.exe",
 
-            "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.HostsUILib.dll",
-            "WinUI3Apps\\PowerToys.Hosts.dll",
-            "WinUI3Apps\\PowerToys.Hosts.exe",
+                "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithExt.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.exe",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
+                "FileLocksmithContextMenuPackage.msix",
 
-            "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithExt.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithUI.exe",
-            "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
-            "FileLocksmithContextMenuPackage.msix",
+                "WinUI3Apps\\Peek.Common.dll",
+                "WinUI3Apps\\Peek.FilePreviewer.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.exe",
+                "WinUI3Apps\\Powertoys.Peek.dll",
 
-            "WinUI3Apps\\Peek.Common.dll",
-            "WinUI3Apps\\Peek.FilePreviewer.dll",
-            "WinUI3Apps\\Powertoys.Peek.UI.dll",
-            "WinUI3Apps\\Powertoys.Peek.UI.exe",
-            "WinUI3Apps\\Powertoys.Peek.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariables.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariables.exe",
 
-            "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariables.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariables.exe",
+                "PowerToys.ImageResizer.exe",
+                "PowerToys.ImageResizer.dll",
+                "PowerToys.ImageResizerExt.dll",
+                "PowerToys.ImageResizerContextMenu.dll",
+                "ImageResizerContextMenuPackage.msix",
 
-            "PowerToys.ImageResizer.exe",
-            "PowerToys.ImageResizer.dll",
-            "PowerToys.ImageResizerExt.dll",
-            "PowerToys.ImageResizerContextMenu.dll",
-            "ImageResizerContextMenuPackage.msix",
+                "PowerToys.KeyboardManager.dll",
+                "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
+                "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+                "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
 
-            "PowerToys.KeyboardManager.dll",
-            "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
-            "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
-            "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
+                "PowerToys.Launcher.dll",
+                "PowerToys.PowerLauncher.dll",
+                "PowerToys.PowerLauncher.exe",
+                "PowerToys.PowerLauncher.Telemetry.dll",
+                "Wox.dll",
+                "Wox.Infrastructure.dll",
+                "Wox.Plugin.dll",
+                "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
+                "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll",
+                "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
+                "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
+                "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
+                "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
+                "RunPlugins\\Program\\Microsoft.Plugin.Program.dll",
+                "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
+                "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
+                "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll",
+                "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll",
+                "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
+                "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
+                "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
+                "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
+                "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
+                "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
+                "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll",
+                "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
+                "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
+                
+                "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.exe",
 
-            "PowerToys.Launcher.dll",
-            "PowerToys.PowerLauncher.dll",
-            "PowerToys.PowerLauncher.exe",
-            "PowerToys.PowerLauncher.Telemetry.dll",
-            "Wox.dll",
-            "Wox.Infrastructure.dll",
-            "Wox.Plugin.dll",
-            "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
-            "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll",
-            "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
-            "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
-            "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
-            "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
-            "RunPlugins\\Program\\Microsoft.Plugin.Program.dll",
-            "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
-            "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
-            "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll",
-            "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll",
-            "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
-            "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
-            "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
-            "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
-            "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
-            "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
-            "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll",
-            "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
-            "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
+                "PowerToys.FindMyMouse.dll",
+                "PowerToys.MouseHighlighter.dll",
+                "PowerToys.MouseJump.dll",
+                "PowerToys.MouseJump.Common.dll",
+                "PowerToys.MousePointerCrosshairs.dll",
+                "PowerToys.MouseJumpUI.dll",
+                "PowerToys.MouseJumpUI.exe",
 
-            "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolUI.exe",
+                "PowerToys.MouseWithoutBorders.dll",
+                "PowerToys.MouseWithoutBorders.exe",
+                "PowerToys.MouseWithoutBordersModuleInterface.dll",
+                "PowerToys.MouseWithoutBordersService.dll",
+                "PowerToys.MouseWithoutBordersService.exe",
+                "PowerToys.MouseWithoutBordersHelper.dll",
+                "PowerToys.MouseWithoutBordersHelper.exe",
 
-            "PowerToys.FindMyMouse.dll",
-            "PowerToys.MouseHighlighter.dll",
-            "PowerToys.MouseJump.dll",
-            "PowerToys.MouseJump.Common.dll",
-            "PowerToys.MousePointerCrosshairs.dll",
-            "PowerToys.MouseJumpUI.dll",
-            "PowerToys.MouseJumpUI.exe",
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
+                "WinUI3Apps\\NewPlusPackage.msix",
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
 
-            "PowerToys.MouseWithoutBorders.dll",
-            "PowerToys.MouseWithoutBorders.exe",
-            "PowerToys.MouseWithoutBordersModuleInterface.dll",
-            "PowerToys.MouseWithoutBordersService.dll",
-            "PowerToys.MouseWithoutBordersService.exe",
-            "PowerToys.MouseWithoutBordersHelper.dll",
-            "PowerToys.MouseWithoutBordersHelper.exe",
+                "PowerAccent.Core.dll",
+                "PowerToys.PowerAccent.dll",
+                "PowerToys.PowerAccent.exe",
+                "PowerToys.PowerAccentModuleInterface.dll",
+                "PowerToys.PowerAccentKeyboardService.dll",
 
-            "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
-            "WinUI3Apps\\NewPlusPackage.msix",
-            "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
+                "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
+                "WinUI3Apps\\PowerToys.PowerRename.exe",
+                "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
+                "WinUI3Apps\\PowerRenameContextMenuPackage.msix",
 
-            "PowerAccent.Core.dll",
-            "PowerToys.PowerAccent.dll",
-            "PowerToys.PowerAccent.exe",
-            "PowerToys.PowerAccentModuleInterface.dll",
-            "PowerToys.PowerAccentKeyboardService.dll",
+                "PowerToys.WorkspacesSnapshotTool.exe",
+                "PowerToys.WorkspacesLauncher.exe",
+                "PowerToys.WorkspacesWindowArranger.exe",
+                "PowerToys.WorkspacesEditor.exe",
+                "PowerToys.WorkspacesEditor.dll",
+                "PowerToys.WorkspacesLauncherUI.exe",
+                "PowerToys.WorkspacesLauncherUI.dll",
+                "PowerToys.WorkspacesModuleInterface.dll",
+                "PowerToys.WorkspacesCsharpLibrary.dll",
 
-            "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
-            "WinUI3Apps\\PowerToys.PowerRename.exe",
-            "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
-            "WinUI3Apps\\PowerRenameContextMenuPackage.msix",
+                "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.exe",
 
-            "PowerToys.WorkspacesSnapshotTool.exe",
-            "PowerToys.WorkspacesLauncher.exe",
-            "PowerToys.WorkspacesWindowArranger.exe",
-            "PowerToys.WorkspacesEditor.exe",
-            "PowerToys.WorkspacesEditor.dll",
-            "PowerToys.WorkspacesLauncherUI.exe",
-            "PowerToys.WorkspacesLauncherUI.dll",
-            "PowerToys.WorkspacesModuleInterface.dll",
-            "PowerToys.WorkspacesCsharpLibrary.dll",
+                "PowerToys.ShortcutGuide.exe",
+                "PowerToys.ShortcutGuideModuleInterface.dll",
 
-            "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreview.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreview.exe",
+                "PowerToys.ZoomIt.exe",
+                "PowerToys.ZoomItModuleInterface.dll",
+                "PowerToys.ZoomItSettingsInterop.dll",
 
-            "PowerToys.ShortcutGuide.exe",
-            "PowerToys.ShortcutGuideModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.Settings.dll",
+                "WinUI3Apps\\PowerToys.Settings.exe",
 
-            "PowerToys.ZoomIt.exe",
-            "PowerToys.ZoomItModuleInterface.dll",
-            "PowerToys.ZoomItSettingsInterop.dll",
-
-            "WinUI3Apps\\PowerToys.Settings.dll",
-            "WinUI3Apps\\PowerToys.Settings.exe",
-
-            "PowerToys.CmdPalModuleInterface.dll",
-            "CmdPalKeyboardService.dll",
-            "*Microsoft.CmdPal.UI_*.msix"
-          ],
+                "PowerToys.CmdPalModuleInterface.dll",
+                "CmdPalKeyboardService.dll",
+                "*Microsoft.CmdPal.UI_*.msix"
+            ],
             "SigningInfo": {
                 "Operations": [
                     {

.pipelines/ESRPSigning_sdk.json

@@ -4,66 +4,9 @@
     "SignBatches": [
         {
             "MatchedPath": [
+                "Microsoft.CommandPalette.Extensions.dll",
                 "Microsoft.CommandPalette.Extensions.Toolkit.dll"
             ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameSign",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-233904-SN",
-                        "OperationSetCode": "StrongNameVerify",
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0",
-                        "Parameters": []
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        },
-        {
-            "MatchedPath": [
-                "Microsoft.CommandPalette.Extensions.dll"
-            ],
             "SigningInfo": {
                 "Operations": [
                     {

.pipelines/UpdateVersions.ps1

@@ -126,15 +126,16 @@ Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
 }
 
 # Update Directory.Packages.props file
-Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
+$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
+if (Test-Path $propsFile) {
+    $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
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $_.FullName
+        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $propsFile
     }
 }
 
@@ -143,8 +144,8 @@ 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]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
         Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName

.pipelines/loc/loc.yml

@@ -25,7 +25,7 @@ steps:
   fetchDepth: 1 # Don't need a deep checkout for loc files!
   persistCredentials: true
 
-- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@5
+- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
   displayName: 'Touchdown Build - 37400, PRODEXT'
   inputs:
     teamId: 37400

.pipelines/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.3" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0.2" />
 </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\\DFX-Developer Fundamentals and Experiences\\DEFT\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\PowerToys"
 }

.pipelines/v2/release.yml

@@ -20,6 +20,16 @@ parameters:
     type: string
     default: '0.0.1'
 
+  - name: cmdPalVersionNumber
+    displayName: "Command Palette Version Number"
+    type: string
+    default: '0.0.1'
+
+  - name: cmdPalSdkVersionNumber
+    displayName: "Command Palette SDK Version Number"
+    type: string
+    default: '0.0.1'
+
   - name: buildConfigurations
     displayName: "Build Configurations"
     type: object
@@ -40,9 +50,6 @@ parameters:
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
-variables:
-  - template: templates/variables-nuget-package-version.yml
-
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
@@ -81,8 +88,8 @@ extends:
               buildPlatforms: ${{ parameters.buildPlatforms }}
               buildConfigurations: ${{ parameters.buildConfigurations }}
               versionNumber: ${{ parameters.versionNumber }}
+              cmdPalVersionNumber: ${{ parameters.cmdPalVersionNumber }}
               publishArtifacts: false # 1ES PT handles publication for us.
-              official: true
               codeSign: true
               runTests: false
               signingIdentity:
@@ -99,18 +106,16 @@ extends:
               beforeBuildSteps:
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-
-                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
+                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment '' -cmdPalVersionNumber '${{ parameters.cmdPalVersionNumber }}'
                   displayName: Prepare versioning
 
                 # Prepare the localizations and telemetry config before the release build
                 - template: .pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml@self
 
-                - 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"
+                - 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
                   displayName: Emplace telemetry files
 
       - stage: Build_SDK
@@ -123,8 +128,8 @@ extends:
                 name: SHINE-INT-L
                 image: SHINE-VS17-Latest
                 os: windows
-              official: true
               codeSign: true
+              sdkVersionNumber: ${{ parameters.cmdPalSdkVersionNumber }}
               signingIdentity:
                 serviceName: $(SigningServiceName)
                 appId: $(SigningAppId)

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

@@ -11,9 +11,6 @@ parameters:
     default:
       - x64
       - arm64
-  - name: official
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -59,6 +56,9 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
+  - name: cmdPalVersionNumber
+    type: string
+    default: '0.0.1'
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -215,11 +215,6 @@ jobs:
       env:
         VCWhereExtraVersionTarget: '-prerelease'
 
-  - ${{ if eq(parameters.official, true) }}:
-    - template: .\steps-setup-versioning.yml
-      parameters:
-        directory: $(build.sourcesdirectory)\src\modules\cmdpal
-
   - pwsh: |-
       & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
     displayName: Download and install WiX 3.14 development build
@@ -349,11 +344,6 @@ 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)'
@@ -397,16 +387,15 @@ jobs:
           **\UnitTests-CommonLib.dll
           **\PowerRenameUnitTests.dll
           **\UnitTests-FancyZones.dll
-          **\\WorkspacesLibUnitTests.dll
           !**\obj\**
 
-  - pwsh: |-
-      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
-      $PackageFilename = $Package.FullName
-      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-    displayName: Locate the CmdPal MSIX
-
   - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
+        $PackageFilename = $Package.FullName
+        Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
+      displayName: Locate the MSIX
+
     - pwsh: |-
         & "$(MakeAppxPath)" unpack /p "$(CmdPalPackagePath)" /d "$(JobOutputDirectory)/CmdPalPackageContents"
       displayName: Unpack the MSIX for signing
@@ -426,8 +415,6 @@ jobs:
         $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(CmdPalPackagePath)")
         & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(JobOutputDirectory)/CmdPalPackageContents"
         Copy-Item -Force $PackageFilename "$(CmdPalPackagePath)"
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/CmdPalPackageContents" -ErrorAction:Ignore
-        Remove-Item -Force -Recurse "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
       displayName: Re-pack the new CmdPal package after signing
 
     - template: steps-esrp-signing.yml
@@ -450,10 +437,6 @@ jobs:
           batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
-  - pwsh: |-
-      Copy-Item -Verbose -Force "$(CmdPalPackagePath)" "$(JobOutputDirectory)"
-    displayName: Stage the final CmdPal package
-
   - template: steps-build-installer.yml
     parameters:
       codeSign: ${{ parameters.codeSign }}

.pipelines/v2/templates/job-build-sdk.yml

@@ -3,9 +3,6 @@ parameters:
     type: object
     default:
       - Release
-  - name: official
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -15,6 +12,9 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
+  - name: sdkVersionNumber
+    type: string
+    default: '0.0.1'
 
 jobs:
 - job: "BuildSDK"
@@ -36,17 +36,8 @@ jobs:
     fetchTags: false
     fetchDepth: 1
 
-  - template: .\steps-ensure-nuget-version.yml
-
-  - task: NuGetAuthenticate@1
-
-  - ${{ if eq(parameters.official, true) }}:
-    - template: .\steps-setup-versioning.yml
-      parameters:
-        directory: $(build.sourcesdirectory)\src\modules\cmdpal
-
   - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "build" -IsAzurePipelineBuild
+      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "build" -IsAzurePipelineBuild
     displayName: Build SDK
 
   - ${{ if eq(parameters.codeSign, true) }}:
@@ -61,7 +52,7 @@ jobs:
           ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
 
   - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -BuildStep "pack" -IsAzurePipelineBuild
+      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "pack" -IsAzurePipelineBuild
     displayName: Pack SDK
 
   - task: CopyFiles@2

.pipelines/v2/templates/job-publish-symbols-using-symbolrequestprod-api.yml

@@ -68,7 +68,7 @@ jobs:
       pwsh: true
       ScriptType: InlineScript
       Inline: |-
-        $AzToken = (Get-AzAccessToken -AsSecureString -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token | ConvertFrom-SecureString -AsPlainText
+        $AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
         Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"
 
 

.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml

@@ -4,7 +4,7 @@ parameters:
     default: false
 
 steps:
-  - task: TouchdownBuildTask@5
+  - task: TouchdownBuildTask@3
     displayName: 'Download Localization Files -- PowerToys 37400'
     inputs:
       teamId: 37400

.pipelines/v2/templates/steps-setup-versioning.yml

@@ -1,11 +0,0 @@
-parameters:
-  - name: directory
-    type: string
-    default: $(Build.SourcesDirectory)
-
-steps:
-  - pwsh: |-
-      nuget install Microsoft.Windows.Terminal.Versioning -ConfigFile "$(Build.SourcesDirectory)\.pipelines\release-nuget.config" -OutputDirectory _versioning
-      $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
-      & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "${{ parameters.directory }}" -Verbose
-    displayName: Set up versioning for ${{ parameters.directory }} via M.W.T.V

.pipelines/v2/templates/variables-nuget-package-version.yml

@@ -1,17 +0,0 @@
-variables:
-  # If we are building a branch called "stable*", hide the NuGet suffix.
-  # If we don't do that, XES will set the suffix to "stable".
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Version                    |
-  # ------------------|----------------------------|
-  # stable            | 0.2.250512001              |
-  # main              | 0.2.250512001-experimental |
-  # all others        | 0.2.250512001-branch       |
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'stable') }}:
-    NoNuGetPackBetaVersion: true
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental
-

.pipelines/verifyAndSetLatestVCToolsVersion.ps1

@@ -1,28 +1,7 @@
 $VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
-$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
 $LatestVCToolsVersion = $LatestVCPackage.version;
-
-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
-$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
-
-# We have observed a few instances where the VC tools package version actually
-# differs from the version on the files themselves. We might as well check
-# whether the version we just found _actually exists_ before we use it.
-# We'll use whichever highest version exists.
-$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
-        [Version]$_.Name
-    } | Sort -Descending
-    $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
-
-    If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
-        Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
-        $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
-    }
-}
-
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
 Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

.pipelines/verifyCommonProps.ps1

@@ -1,54 +0,0 @@
-[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

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -72,57 +72,9 @@ $returnList = [System.Collections.Generic.HashSet[string]]($totalList) -join "`r
 
 Write-Host $returnList
 
-# Extract the current package list from NOTICE.md
-$noticePattern = "## NuGet Packages used by PowerToys\s*((?:\r?\n- .+)+)"
-$noticeMatch = [regex]::Match($noticeFile, $noticePattern)
-
-if ($noticeMatch.Success) {
-    $currentNoticePackageList = $noticeMatch.Groups[1].Value.Trim()
-} else {
-    Write-Warning "Warning: Could not find 'NuGet Packages used by PowerToys' section in NOTICE.md"
-    $currentNoticePackageList = ""
-}
-
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))
 {
 	Write-Host -ForegroundColor Red "Notice.md does not match NuGet list."
-
-	# Show detailed differences
-	$generatedPackages = $returnList -split "`r`n|`n" | Where-Object { $_.Trim() -ne "" } | Sort-Object
-	$noticePackages = $currentNoticePackageList -split "`r`n|`n" | Where-Object { $_.Trim() -ne "" } | ForEach-Object { $_.Trim() } | Sort-Object
-
-	Write-Host ""
-	Write-Host -ForegroundColor Cyan "=== DETAILED DIFFERENCE ANALYSIS ==="
-	Write-Host ""
-
-	# Find packages in proj file list but not in NOTICE.md
-	$missingFromNotice = $generatedPackages | Where-Object { $noticePackages -notcontains $_ }
-	if ($missingFromNotice.Count -gt 0) {
-		Write-Host -ForegroundColor Red "MissingFromNotice:"
-		foreach ($pkg in $missingFromNotice) {
-			Write-Host -ForegroundColor Red "  $pkg"
-		}
-		Write-Host ""
-	}
-
-	# Find packages in NOTICE.md but not in proj file list
-	$extraInNotice = $noticePackages | Where-Object { $generatedPackages -notcontains $_ }
-	if ($extraInNotice.Count -gt 0) {
-		Write-Host -ForegroundColor Yellow "ExtraInNotice:"
-		foreach ($pkg in $extraInNotice) {
-			Write-Host -ForegroundColor Yellow "  $pkg"
-		}
-		Write-Host ""
-	}
-
-	# Show counts for summary
-	Write-Host -ForegroundColor Cyan "Summary:"
-	Write-Host "  Proj file list has $($generatedPackages.Count) packages"
-	Write-Host "  NOTICE.md has $($noticePackages.Count) packages"
-	Write-Host "  MissingFromNotice: $($missingFromNotice.Count) packages"
-	Write-Host "  ExtraInNotice: $($extraInNotice.Count) packages"
-	Write-Host ""
-
 	exit 1
 }
 

.pipelines/versionSetting.ps1

@@ -5,7 +5,10 @@ Param(
 
   [Parameter(Mandatory=$True,Position=2)]
   [AllowEmptyString()]
-  [string]$DevEnvironment = "Local"
+  [string]$DevEnvironment = "Local",
+
+  [Parameter(Mandatory=$True,Position=3)]
+  [string]$cmdPalVersionNumber = "0.0.1"
 )
 
 Write-Host $PSScriptRoot
@@ -46,6 +49,7 @@ $verProps.Save($verPropWriteFileLocation);
 $verPropWriteFileLocation = $PSScriptRoot + '/../src/CmdPalVersion.props';
 $verPropReadFileLocation = $verPropWriteFileLocation;
 [XML]$verProps = Get-Content $verPropReadFileLocation
+$verProps.Project.PropertyGroup.CmdPalVersion = $cmdPalVersionNumber;
 $verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;
 Write-Host "xml" $verProps.Project.PropertyGroup.Version
 $verProps.Save($verPropWriteFileLocation);
@@ -86,3 +90,12 @@ $newPlusContextMenuAppManifestReadFileLocation = $newPlusContextMenuAppManifestW
 $newPlusContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
 Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.Identity.Version
 $newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);
+
+# Set package version in Package.appxmanifest
+$cmdPalAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/cmdpal/Microsoft.CmdPal.UI/Package.appxmanifest';
+$cmdPalAppManifestReadFileLocation = $cmdPalAppManifestWriteFileLocation;
+
+[XML]$cmdPalAppManifest = Get-Content $cmdPalAppManifestReadFileLocation
+$cmdPalAppManifest.Package.Identity.Version = $cmdPalVersionNumber + '.0'
+Write-Host "CmdPal Package version: " $cmdPalAppManifest.Package.Identity.Version
+$cmdPalAppManifest.Save($cmdPalAppManifestWriteFileLocation);

COMMUNITY.md

@@ -6,8 +6,8 @@ Names are in alphabetical order based on first name.
 
 ## High impact community members
 
-### [@Noraa-Junker](https://github.com/Noraa-Junker) - [Noraa Junker](https://noraajunker.ch)
-Noraa has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Noraa was the primary person for helping build the File Explorer preview pane handler for developer files.
+### [@Aaron-Junker](https://github.com/Aaron-Junker) - [Aaron Junker](https://aaron-junker.github.io)
+Aaron has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Aaron was the primary person for helping build the File Explorer preview pane handler for developer files.
 
 ### [@cgaarden](https://github.com/cgaarden) - [Christian Gaarden Gaardmark](https://www.onegreatworld.com) 
 Christian contributed New+ utility
@@ -21,7 +21,7 @@ Connor was the creator of Workspaces and helped create Command Palette (PowerToy
 ### [@damienleroy](https://github.com/damienleroy) - [Damien Leroy](https://www.linkedin.com/in/Damien-Leroy-b2734416a/)
 Damien has helped out by developing and contributing the Quick Accent utility.
 
-### [@daverayment](https://github.com/daverayment) - [David Rayment](https://www.linkedin.com/in/david-rayment-168b5251/)
+### [@daverayment ](https://github.com/daverayment) - [David Rayment](https://www.linkedin.com/in/david-rayment-168b5251/)
 Dave has helped improve the experience inside of Peek by adding in new features and fixing bugs.
 
 ### [@davidegiacometti](https://github.com/davidegiacometti) - [Davide Giacometti](https://www.linkedin.com/in/davidegiacometti/)
@@ -117,6 +117,10 @@ PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Expl
 
 PowerToys Awake is a tool to keep your computer awake.
 
+### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/)
+
+Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118).
+
 ### [@randyrants](https://github.com/randyrants) - [Randy Santossio](https://www.randyrants.com)
 
 Randy contributed Registry Preview and some very early conversations about keyboard remapping.
@@ -180,10 +184,11 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 
 ## PowerToys core team
 
+- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Lead
 - [@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
-- [@niels9001](https://github.com/niels9001/) - Niels Laute - 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
@@ -199,13 +204,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
 - [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
-- [@zadjii-msft](https://github.com/zadjii-msft) - Mike Griese - Dev
-- [@khmyznikov](https://github.com/khmyznikov) - Gleb Khmyznikov - Dev
-- [@chatasweetie](https://github.com/chatasweetie) - Jessica Earley-Cha - Dev
-- [@MichaelJolley](https://github.com/MichaelJolley) - Michael Jolley - Dev
-- [@Jaylyn-Barbee](https://github.com/Jaylyn-Barbee) - Jaylyn Barbee - Dev
-- [@zateutsch](https://github.com/zateutsch) - Zach Teutsch - Dev
-- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Overhead
 
 ## Former PowerToys core team members
 

Directory.Packages.props

@@ -31,22 +31,22 @@
     <!-- 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="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.6" />
+    <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.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.6" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <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" />
@@ -72,28 +72,28 @@
     <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.6" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.4" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.6" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.6" />
+    <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" />
     <!-- 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.9.0" />
+    <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.6" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.4" />
     <!-- 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.6" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
     <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.6" />
+    <PackageVersion Include="System.Management" Version="9.0.4" />
     <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.6" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <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.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />

NOTICE.md

@@ -79,43 +79,6 @@ For more information, please refer to <http://unlicense.org/>
 
 ### Calculator
 
-#### exprtk
-
-We use the exprtk library (exprtk.hpp) to evaluate mathematical expressions.
-
-**Source**: [https://github.com/ArashPartow/exprtk](https://github.com/ArashPartow/exprtk)
-
-```
-MIT License
-
-Copyright (c) 1999-2024 Arash Partow
-
-https://www.partow.net/programming/exprtk/index.html
-
-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: PowerToys Run Built-in Extensions
-
-### Calculator
-
 #### Mages
 
 We use the Mages NuGet package for calculating the result of expression.
@@ -844,25 +807,30 @@ DEALINGS IN THE SOFTWARE.
 
 **Source**: https://github.com/kuba--/zip
 
-All Rights Reserved.
+This is free and unencumbered software released into the public domain.
 
-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:
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
 
-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.
+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 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.
+
+For more information, please refer to <http://unlicense.org/>
 
 ## Utility: Measure tool
 
@@ -1485,26 +1453,26 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.6
+- Microsoft.Bcl.AsyncInterfaces 9.0.4
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.6
+- Microsoft.Data.Sqlite 9.0.4
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.6
-- Microsoft.Extensions.Hosting 9.0.6
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.6
-- Microsoft.Extensions.Logging 9.0.6
-- Microsoft.Extensions.Logging.Abstractions 9.0.6
+- 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.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.6
-- Microsoft.Windows.Compatibility 9.0.6
+- Microsoft.Win32.SystemEvents 9.0.4
+- Microsoft.Windows.Compatibility 9.0.4
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.7.250513003
+- 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
@@ -1519,25 +1487,25 @@ SOFTWARE.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.6
+- System.CodeDom 9.0.4
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.6
-- System.Configuration.ConfigurationManager 9.0.6
-- System.Data.OleDb 9.0.6
-- System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.6
-- System.Diagnostics.PerformanceCounter 9.0.6
-- System.Drawing.Common 9.0.6
+- System.ComponentModel.Composition 9.0.4
+- System.Configuration.ConfigurationManager 9.0.4
+- System.Data.OleDb 9.0.4
+- 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 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.6
+- System.Management 9.0.4
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.6
-- System.ServiceProcess.ServiceController 9.0.6
-- System.Text.Encoding.CodePages 9.0.6
-- System.Text.Json 9.0.6
+- 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.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

PowerToys.sln

@@ -604,11 +604,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLibUnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesModuleInterface", "src\modules\Workspaces\WorkspacesModuleInterface\WorkspacesModuleInterface.vcxproj", "{45285DF2-9742-4ECA-9AC9-58951FC26489}"
@@ -711,14 +706,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests",
 EndProject
 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{0217E86E-3476-9946-DE8E-9D200CEBD47A}"
-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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorEngineCommon", "src\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2207,14 +2198,6 @@ Global
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.Build.0 = Release|ARM64
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.ActiveCfg = Release|x64
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.Build.0 = Release|x64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|x64.ActiveCfg = Debug|x64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|x64.Build.0 = Debug|x64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|ARM64.Build.0 = Release|ARM64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|x64.ActiveCfg = Release|x64
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|x64.Build.0 = Release|x64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.Build.0 = Debug|ARM64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.ActiveCfg = Debug|x64
@@ -2599,14 +2582,6 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.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
@@ -2621,14 +2596,6 @@ Global
 		{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
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.Build.0 = Debug|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|ARM64.Build.0 = Release|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.ActiveCfg = Release|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2848,7 +2815,6 @@ Global
 		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
@@ -2900,10 +2866,8 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -37,26 +37,26 @@ Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and cl
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.91%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysUserSetup-0.91.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.91.1/PowerToysSetup-0.91.1-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.91.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.91.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.91.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.91.0-arm64.exe
  
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.91.1-x64.exe][ptUserX64] | 42EA4A3E8C79A5456476D19E72B3E2AB9393A89C4DC7442EB7EE5A1E3490D38A |
-| Per user - ARM64     | [PowerToysUserSetup-0.91.1-arm64.exe][ptUserArm64] | F3F433FE04049F9197411D792AADEBF34E3BE7FE16327BD8B73D2A046ED8BAF6 |
-| Machine wide - x64   | [PowerToysSetup-0.91.1-x64.exe][ptMachineX64] | EC4BC3A8625775866B0ED4577CCF83E6EC7B1A0AD267379DDBAF4FE49C7B5BDD |
-| Machine wide - ARM64 | [PowerToysSetup-0.91.1-arm64.exe][ptMachineArm64] | 9CB8911008420D0E446AE3D5CE365E447FA4DF9DCF9337F3A80F933C00FC3689 |
+| Per user - x64       | [PowerToysUserSetup-0.91.0-x64.exe][ptUserX64] | 190DD702EDE2D3AC27A253DF8BC2416B1AF05E6594FF25CABEE844E6D3C8CCB0 |
+| Per user - ARM64     | [PowerToysUserSetup-0.91.0-arm64.exe][ptUserArm64] | BE6C964C40147B5F7838E51A13837347756CC45E6AC5BC0DD11AF9AF605ABDCD |
+| Machine wide - x64   | [PowerToysSetup-0.91.0-x64.exe][ptMachineX64] | 2308D896D9A66C56B98AC8B3CE9B7C945C7A2315551E36C118C7ECAC4A6D05C2 |
+| Machine wide - ARM64 | [PowerToysSetup-0.91.0-arm64.exe][ptMachineArm64] | 28BD1FEFA22C52279C6B600E677B425B014D1F9190EA449D6C63FC2702092DA3 |
 
 This is our preferred method.
 
 ### Via Microsoft Store
 
-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which is available for both Windows 11 and Windows 10.
 
 ### Via WinGet
-Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
+Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 #### User scope installer [default]
 ```powershell
@@ -79,7 +79,7 @@ There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) cr
 
 ## Contributing
 
-This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
+This project welcomes contributions of all types.  Besides  coding features / bug fixes,  other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
 
 We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort.
 
@@ -99,7 +99,7 @@ In this release, we focused on new features, stability, and automation.
 
 **✨Highlights**
 
- - We focused on greatly improving the Command Palette's performance and fixing a large number of bugs. Some new features we've added are:
+ - We focused on greatly improving Command Palette's performance and fixing a large amount of bugs. Some new features we've added are:
  - Added the ability for Command Palette to search any file using a fallback command.
  - Added the ability to make the Command Palette global hotkey a low-level keyboard hook.
  - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette.
@@ -117,17 +117,17 @@ In this release, we focused on new features, stability, and automation.
 
 ### Command Not Found
 
- - Updated the WinGet Command Not Found script to only enable the experimental features if they exist.
+ - Updated the WinGet Command Not Found script to only enable the experimental features if they actually exist.
 
 ### Command Palette
 
  - Updated bug template to include Command Palette module.
  - Fixed an issue where the toast window was not scaled for DPI, causing layout issues under display scaling.
- - Fixed an issue where Up/Down keyboard navigation didn't move selection when the caret was at position 0, and added continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue where Up/Down keyboard navigation didn't move selection when caret was at position 0, and add continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
  - Updated the Time and Date extension code to simplify it and improve clarity.
  - Fixed an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
- - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from the Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added setting to enable/disable system tray icon in CmdPal and aligned terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added setting to enable/disable system tray icon in CmdPal and align terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
  - Fixed an alias update issue by removing the old alias when a new one is set.
  - Resolved GitHub casing conflict by migrating Exts and exts into a new ext directory, ensuring consistent structure across platforms and preventing path fragmentation.
  - Fix an issue where the 'Create New Extension' command generated empty file names.
@@ -155,9 +155,9 @@ In this release, we focused on new features, stability, and automation.
  - Refactored CmdPal classes to improve JSON serialization and introduced new serialization contexts for better performance and maintainability.
  - Added support for ahead-of-time (AoT) compilation.
  - Added retry mechanism for CmdPal launch.
- - Removed some unused files from CmdPal.Common to simplify the codebase and facilitate marking it as AoT-compatible.
+ - Removed some unused files from CmdPal.Common to simplify codebase and facilitate marking it as AoT-compatible.
  - Fixed a bug where a race condition in the update of SearchText caused the cursor in the input box to automatically jump to the end of the line, ensuring SearchText is only updated after it has actually been changed.
- - Added support for searching any file in the fallback command.
+ - Added support for searching any file in fallback command.
  - Cleaned up AoT-related code to prevent duplicate operations during testing.
  - Reduced CmdPal load time by parallelizing extension startup and adding timeouts to prevent misbehaving extensions from blocking others.
  - Enhanced UI behavior by dismissing the details pane when the list gets emptied, avoiding inconsistent visual states.
@@ -179,7 +179,7 @@ In this release, we focused on new features, stability, and automation.
 
 ### Keyboard Manager
 
- - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
+ - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling, by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
 
 ### PowerRename
 
@@ -187,7 +187,7 @@ In this release, we focused on new features, stability, and automation.
 
 ### PowerToys Run
 
- - Added support for custom formats in the "Time and Date" plugin and improved error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added support for custom formats in the "Time and Date" plugin and improves error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
  - Fix two crashes: one for WFT on very early dates and another for calculating the week of the month on very late dates (e.g., 31.12.9999), and reorder UI settings. Thanks [@htcfreek](https://github.com/htcfreek)!
  - Fix an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
  - Added version details to plugin error messages for 'Loading error' and 'Init error'. Thanks [@htcfreek](https://github.com/htcfreek)!
@@ -254,7 +254,7 @@ For [v0.92][github-next-release-work], we'll work on the items below:
  - New UI Automation tests
  - Working on installer upgrades
  - Upgrading Keyboard Manager's editor UI
- - Stability, bug fixes
+ - Stability / bug fixes
 
 ## PowerToys Community
 
@@ -266,7 +266,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct
 
 ## Privacy Statement
 
-The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
+The application logs basic diagnostic data (telemetry). For more information on privacy and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
 
 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md

doc/thirdPartyRunPlugins.md

@@ -46,7 +46,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [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. |
-| [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |
 
 ## Extending software plugins
 
@@ -69,5 +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 |
-| [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
+[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |

installer/PowerToysSetup/CmdPal.wxs

@@ -19,36 +19,36 @@
       </Directory>
     </DirectoryRef>
 
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
+    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test">
       <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
         </RegistryKey>
         <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_x64.msix" />
         <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_arm64.msix" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_arm64.msix" />
         <?endif ?>
 
       </Component>
     </DirectoryRef>
 
     <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
       </Component>
     </DirectoryRef>
     <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64">
       <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
       </Component>
     </DirectoryRef>
     <?endif ?>

src/CmdPalVersion.props

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CmdPalVersion Condition="'$(CmdPalVersion)'=='' and '$(XES_APPXMANIFESTVERSION)'!=''">$(XES_APPXMANIFESTVERSION)</CmdPalVersion>
-    <CmdPalVersion Condition="'$(CmdPalVersion)'==''">0.0.1.0</CmdPalVersion>
+    <CmdPalVersion>0.0.1</CmdPalVersion>
     <DevEnvironment>Local</DevEnvironment>
 
     <!-- Forcing for every DLL on by default -->

src/Common.Dotnet.AotCompatibility.props

@@ -7,6 +7,6 @@
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
 
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;CsWinRT1028;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
   </PropertyGroup>
 </Project>

src/Common.Dotnet.CsWinRT.props

@@ -16,13 +16,13 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn></NoWarn>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CA1824;CA1416;CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
   </PropertyGroup>
 
@@ -43,4 +43,4 @@
       <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
     </ItemGroup>
   </Target>
-</Project>
+</Project>

src/Common.Dotnet.FuzzTest.props

@@ -1,10 +0,0 @@
-<?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/CalculatorEngineCommon/Calculator.cpp

@@ -1,24 +0,0 @@
-#include "pch.h"
-#include "Calculator.h"
-#include "Calculator.g.cpp"
-#include "ExprtkEvaluator.h"
-
-namespace winrt::CalculatorEngineCommon::implementation
-{
-    Calculator::Calculator(winrt::Windows::Foundation::Collections::IPropertySet const& constants)
-    {
-        for (auto const& pair : constants)
-        {
-            auto key = pair.Key();
-            auto value = winrt::unbox_value<double>(pair.Value());
-            m_constants.emplace(winrt::to_string(key), value);
-        }
-    }
-
-    hstring Calculator::EvaluateExpression(hstring const& expression)
-    {
-        auto result = ExprtkCalculator::internal::EvaluateExpression(winrt::to_string(expression), m_constants);
-
-        return hstring(result);
-    }
-}

src/common/CalculatorEngineCommon/Calculator.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Calculator.g.h"
-
-namespace winrt::CalculatorEngineCommon::implementation
-{
-    struct Calculator : CalculatorT<Calculator>
-    {
-        Calculator() = default;
-
-        Calculator(winrt::Windows::Foundation::Collections::IPropertySet const& constants);
-
-        winrt::hstring EvaluateExpression(winrt::hstring const& expression);
-
-    private:
-        std::unordered_map<std::string, double> m_constants;
-    };
-}
-
-namespace winrt::CalculatorEngineCommon::factory_implementation
-{
-    struct Calculator : CalculatorT<Calculator, implementation::Calculator>
-    {
-    };
-}

src/common/CalculatorEngineCommon/Calculator.idl

@@ -1,10 +0,0 @@
-namespace CalculatorEngineCommon
-{
-    [default_interface]
-    runtimeclass Calculator
-    {
-        Calculator();
-        Calculator(Windows.Foundation.Collections.IPropertySet constants);
-        String EvaluateExpression(String expression);
-    }
-}

src/common/CalculatorEngineCommon/CalculatorEngineCommon.def

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

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -1,181 +0,0 @@
-<?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>{2cf78cf7-8feb-4be1-9591-55fa25b48fc6}</ProjectGuid>
-    <ProjectName>CalculatorEngineCommon</ProjectName>
-    <RootNamespace>CalculatorEngineCommon</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>
-    <TargetName>CalculatorEngineCommon</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>CalculatorEngineCommon.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="ExprtkEvaluator.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="exprtk.hpp" />
-    <ClInclude Include="Calculator.h">
-      <DependentUpon>Calculator.idl</DependentUpon>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ExprtkEvaluator.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Calculator.cpp">
-      <DependentUpon>Calculator.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="Calculator.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="CalculatorEngineCommon.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </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>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </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/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj.filters

@@ -1,29 +0,0 @@
-<?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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="Calculator.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CalculatorEngineCommon.def" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </ItemGroup>
-</Project>

src/common/CalculatorEngineCommon/ExprtkEvaluator.cpp

@@ -1,50 +0,0 @@
-#include "ExprtkEvaluator.h"
-#include "exprtk.hpp"
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-namespace ExprtkCalculator::internal
-{
-
-    std::wstring ToWStringFullPrecision(double value)
-    {
-        std::wostringstream oss;
-        oss << std::fixed << std::setprecision(15) << value;
-        return oss.str();
-    }
-
-    std::wstring EvaluateExpression(
-        const std::string& expressionText,
-        const std::unordered_map<std::string, double>& constants)
-    {
-        exprtk::symbol_table<double> symbol_table;
-
-        for (auto const& [name, value] : constants)
-        {
-            symbol_table.add_constant(name, value);
-        }
-
-        exprtk::expression<double> expression;
-        expression.register_symbol_table(symbol_table);
-
-        exprtk::parser<double> parser;
-
-        // Enable all base functions and arithmetic operators
-        parser.settings().enable_all_base_functions(); // Enable all base functions like sin, cos, log, etc.
-        parser.settings().enable_all_arithmetic_ops(); // Enable all arithmetic operators like +, -, *, /, etc.
-
-        // Disable all control structures and assignment operators to ensure only expressions are evaluated
-        parser.settings().disable_all_control_structures(); // Disable control structures like if, for, while, etc.
-        parser.settings().disable_all_assignment_ops(); // Disable assignment operators like =, +=, -=, etc.
-
-        // Disabled for now, but can be enabled later for enhanced functionality
-        parser.settings().disable_all_logic_ops(); // Disable logical operators like &&, ||, !, etc.
-        parser.settings().disable_all_inequality_ops(); // Disable inequality operators like <, >, <=, >=, !=, etc.
-
-        if (!parser.compile(expressionText, expression))
-            return L"NaN";
-
-        return ToWStringFullPrecision(expression.value());
-    }
-}

src/common/CalculatorEngineCommon/ExprtkEvaluator.h

@@ -1,10 +0,0 @@
-#pragma once
-#include <string>
-#include <unordered_map>
-
-namespace ExprtkCalculator::internal
-{
-    std::wstring EvaluateExpression(
-        const std::string& expression,
-        const std::unordered_map<std::string, double>& constants);
-}

src/common/CalculatorEngineCommon/PropertySheet.props

@@ -1,16 +0,0 @@
-<?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>

src/common/CalculatorEngineCommon/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-	<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>

src/common/CalculatorEngineCommon/pch.cpp

@@ -1 +0,0 @@
-#include "pch.h"

src/common/CalculatorEngineCommon/pch.h

@@ -1,4 +0,0 @@
-#pragma once
-#include <unknwn.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>

src/common/CalculatorEngineCommon/readme.md

@@ -1,29 +0,0 @@
-# C++/WinRT CalculatorEngine Project Overview
-
-This project wraps the exprtk expression parsing library with a C++/WinRT component,  
-making advanced mathematical evaluation capabilities available to Windows applications.  
-It is designed specifically to provide calculation support for the CmdPal calculator extension.
-
-## Using exprtk
-
-This project uses [exprtk](https://github.com/ArashPartow/exprtk) as the 
-expression parsing and evaluation engine.
-
-How to use exprtk in this project:
-- The exprtk header file (`exprtk.hpp`) is included in the project source.
-- You can use exprtk to parse and evaluate mathematical expressions in your 
-  C++ code. For example:
-
-    ```cpp
-    #include "exprtk.hpp"
-    exprtk::expression<double> expression;
-    exprtk::parser<double> parser;
-    std::string formula = "3 + 4 * 2";
-    parser.compile(formula, expression);
-    double result = expression.value();
-    ```
-
-How to update exprtk:
-1. Download the latest `exprtk.hpp` from the [official repository](https://github.com/ArashPartow/exprtk).
-2. Replace the existing `exprtk.hpp` file in the project with the new version.
-3. Rebuild the project to ensure compatibility and take advantage of any updates.

src/common/FilePreviewCommon/QoiImage.cs

@@ -92,9 +92,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                 var run = 0;
                 var chunksLen = fileSize - QOI_PADDING_LENGTH;
 
-                var x = 0;
-                var rowAdd = bitmapData.Stride - (channels * bitmapData.Width);
-
                 for (var dataIndex = 0; dataIndex < dataLength; dataIndex += channels)
                 {
                     if (run > 0)
@@ -156,14 +153,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                             bitmapPixel[3] = pixel.A;
                         }
                     }
-
-                    x++;
-                    if (x == bitmapData.Width)
-                    {
-                        // We align dataIndex with the stride
-                        dataIndex += rowAdd;
-                        x = 0;
-                    }
                 }
 
                 bitmap.UnlockBits(bitmapData);

src/common/ManagedCommon/Logger.cs

@@ -6,10 +6,9 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
+
 using PowerToys.Interop;
 
 namespace ManagedCommon
@@ -41,72 +40,25 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
-            string basePath;
             if (isLocalLow)
             {
-                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
+                applicationLogPath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath + "\\" + Version;
             }
             else
             {
-                basePath = Constants.AppDataPath() + applicationLogPath;
+                applicationLogPath = Constants.AppDataPath() + applicationLogPath + "\\" + Version;
             }
 
-            string versionedPath = Path.Combine(basePath, Version);
-
-            if (!Directory.Exists(versionedPath))
+            if (!Directory.Exists(applicationLogPath))
             {
-                Directory.CreateDirectory(versionedPath);
+                Directory.CreateDirectory(applicationLogPath);
             }
 
-            var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 
             Trace.AutoFlush = true;
-
-            // Clean up old version log folders
-            Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
-        }
-
-        /// <summary>
-        /// Deletes old version log folders, keeping only the current version's folder.
-        /// </summary>
-        /// <param name="basePath">The base path to the log files folder.</param>
-        /// <param name="currentVersionPath">The path to the current version's log folder.</param>
-        private static void DeleteOldVersionLogFolders(string basePath, string currentVersionPath)
-        {
-            try
-            {
-                if (!Directory.Exists(basePath))
-                {
-                    return;
-                }
-
-                var dirs = Directory.GetDirectories(basePath)
-                    .Select(d => new DirectoryInfo(d))
-                    .OrderBy(d => d.CreationTime)
-                    .Where(d => !string.Equals(d.FullName, currentVersionPath, StringComparison.OrdinalIgnoreCase))
-                    .Take(3)
-                    .ToList();
-
-                foreach (var directory in dirs)
-                {
-                    try
-                    {
-                        Directory.Delete(directory.FullName, true);
-                        LogInfo($"Deleted old log directory: {directory.FullName}");
-                        Task.Delay(500).Wait();
-                    }
-                    catch (Exception ex)
-                    {
-                        LogError($"Failed to delete old log directory: {directory.FullName}", ex);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogError("Error cleaning up old log folders", ex);
-            }
         }
 
         public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)

src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj

@@ -1,8 +1,6 @@
 <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,10 +17,10 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "leilzh@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
-      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "jobNotificationEmail": "leilzh@microsoft.com",
       "skip": false,
       "rebootAfterSetup": false,
       "oneFuzzJobs": [

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -152,7 +152,6 @@
   </data>
   <data name="ClipboardHistoryImage" xml:space="preserve">
     <value>Image data</value>
-    <comment>Label used to represent an image in the clipboard history</comment>
   </data>
   <data name="ClipboardHistoryItemMoreOptionsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More options</value>
@@ -195,19 +194,15 @@
   </data>
   <data name="TranscodeToMp3" xml:space="preserve">
     <value>Transcode to .mp3</value>
-    <comment>Option to transcode audio files to MP3 format</comment>
   </data>  
   <data name="TranscodeToMp4" xml:space="preserve">
     <value>Transcode to .mp4 (H.264/AAC)</value>
-    <comment>Option to transcode video files to MP4 format with H.264 video codec and AAC audio codec</comment>
   </data>
   <data name="TranscodeErrorGeneral" xml:space="preserve">
     <value>An error occurred while transcoding media file</value>
-    <comment>Error message displayed when media conversion fails for an unknown or general reason</comment>
   </data>
   <data name="TranscodeErrorUnsupportedCodec" xml:space="preserve">
     <value>The media file contains an unsupported codec</value>
-    <comment>Error message displayed when media conversion fails due to an unsupported codec in the source file</comment>
   </data>
   <data name="PasteButtonAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paste</value>

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

@@ -1,9 +1,6 @@
 <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\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "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\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "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\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
       "jobNotificationEmail": "mengyuanchen@microsoft.com",
@@ -140,10 +140,10 @@
         "org": "microsoft",
         "project": "OS",
         "AssignedTo": "mengyuanchen@microsoft.com",
-        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SALT",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
         "IterationPath": "OS\\Future"
       },
-      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "jobNotificationEmail": "mengyuanchen@microsoft.com",
       "skip": false,
       "rebootAfterSetup": false,
       "oneFuzzJobs": [
@@ -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",
-        "Testably.Abstractions.FileSystem.Interface.dll",
-        "WinRT.Runtime.dll"
+        "TestableIO.System.IO.Abstractions.Wrappers.dll"
       ],
       "SdlWorkItemId": 49911822
     }

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\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.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\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.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\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.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp

@@ -13,7 +13,6 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/processApi.h>
 #include <common/utils/elevation.h>
-#include <common/utils/logger_helper.h>
 
 HINSTANCE g_hInst_MouseWithoutBorders = 0;
 
@@ -410,12 +409,9 @@ public:
     {
         app_name = L"MouseWithoutBorders";
         app_key = app_name;
-
-        LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::mouseWithoutBordersLoggerName);
-
-        std::filesystem::path oldLogPath(PTSettingsHelper::get_module_save_folder_location(app_key));
-        oldLogPath.append("LogsModuleInterface");
-        LoggerHelpers::delete_old_log_folder(oldLogPath);
+        std::filesystem::path logFilePath(PTSettingsHelper::get_module_save_folder_location(app_key));
+        logFilePath.append(LogSettings::mouseWithoutBordersLogPath);
+        Logger::init(LogSettings::mouseWithoutBordersLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
 
         try
         {
@@ -571,7 +567,7 @@ public:
         executable_args.append(L"\" & echo \"Adding an inbound firewall rule for PowerToys.MouseWithoutBorders.exe\"");
         executable_args.append(L" & netsh advfirewall firewall add rule name=\"PowerToys.MouseWithoutBorders\" dir=in action=allow program=\"");
         executable_args.append(executable_path);
-        executable_args.append(L"\" enable=yes remoteip=any profile=any protocol=tcp & pause\"");
+        executable_args.append(L"\" enable=yes remoteip=LocalSubnet profile=any protocol=tcp & pause\"");
 
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };

src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs

@@ -193,29 +193,27 @@ namespace WorkspacesEditor.ViewModels
             ApplyShortcut(editedProject);
         }
 
-        private string GetDesktopShortcutAddress(Project project) => Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
-
-        private string GetShortcutStoreAddress(Project project)
-        {
-            var dataFolder = FolderUtils.DataFolder();
-            Directory.CreateDirectory(dataFolder);
-            var shortcutStoreFolder = Path.Combine(dataFolder, "WorkspacesIcons");
-            Directory.CreateDirectory(shortcutStoreFolder);
-            return Path.Combine(shortcutStoreFolder, project.Id + ".ico");
-        }
-
         private void ApplyShortcut(Project project)
         {
+            string basePath = AppDomain.CurrentDomain.BaseDirectory;
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), project.Id + ".ico");
+
             if (!project.IsShortcutNeeded)
             {
-                RemoveShortcut(project);
+                if (File.Exists(shortcutIconFilename))
+                {
+                    File.Delete(shortcutIconFilename);
+                }
+
+                if (File.Exists(shortcutAddress))
+                {
+                    File.Delete(shortcutAddress);
+                }
+
                 return;
             }
 
-            var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var shortcutAddress = GetDesktopShortcutAddress(project);
-            var shortcutIconFilename = GetShortcutStoreAddress(project);
-
             Bitmap icon = WorkspacesIcon.DrawIcon(WorkspacesIcon.IconTextFromProjectName(project.Name), App.ThemeManager.GetCurrentTheme());
             WorkspacesIcon.SaveIcon(icon, shortcutIconFilename);
 
@@ -362,8 +360,8 @@ namespace WorkspacesEditor.ViewModels
 
         private void RemoveShortcut(Project selectedProject)
         {
-            string shortcutAddress = GetDesktopShortcutAddress(selectedProject);
-            string shortcutIconFilename = GetShortcutStoreAddress(selectedProject);
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), selectedProject.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), selectedProject.Id + ".ico");
 
             if (File.Exists(shortcutIconFilename))
             {

src/modules/Workspaces/WorkspacesEditor/app.manifest

@@ -51,7 +51,7 @@
        also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">System</dpiAwareness>
     </windowsSettings>
   </application>
   

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -25,7 +25,6 @@ namespace AppLauncher
         const std::wstring ChromeFilename = L"chrome.exe";
         const std::wstring ChromePwaFilename = L"chrome_proxy.exe";
         const std::wstring PwaCommandLineAddition = L"--profile-directory=Default --app-id=";
-        const std::wstring SteamProtocolPrefix = L"steam:";
     }
 
     Result<SHELLEXECUTEINFO, std::wstring> LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated)
@@ -135,11 +134,12 @@ namespace AppLauncher
             }
         }
 
-        // protocol launch for steam
-        if (!launched && !app.appUserModelId.empty() && app.appUserModelId.contains(NonLocalizable::SteamProtocolPrefix))
+        // 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(app.appUserModelId, app.commandLineArgs, app.isElevated);
+            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
             if (res.isOk())
             {
                 launched = true;

src/modules/Workspaces/WorkspacesLib.UnitTests/AppUtilsTests.cpp

@@ -1,239 +0,0 @@
-#include "pch.h"
-#include <filesystem> // Add this line
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace WorkspacesLibUnitTests
-{
-    TEST_CLASS(AppUtilsTests)
-    {
-    public:
-        TEST_METHOD(GetCurrentFolder_ReturnsNonEmptyPath)
-        {
-            // Act
-            const std::wstring& result = Utils::Apps::GetCurrentFolder();
-
-            // Assert
-            Assert::IsFalse(result.empty());
-            Assert::IsTrue(std::filesystem::exists(result));
-        }
-
-        TEST_METHOD(GetCurrentFolderUpper_ReturnsUppercasePath)
-        {
-            // Act
-            const std::wstring& currentFolder = Utils::Apps::GetCurrentFolder();
-            const std::wstring& currentFolderUpper = Utils::Apps::GetCurrentFolderUpper();
-
-            // Assert
-            Assert::IsFalse(currentFolderUpper.empty());
-            Assert::AreEqual(currentFolder.length(), currentFolderUpper.length());
-            
-            // Verify it's actually uppercase
-            std::wstring expectedUpper = currentFolder;
-            std::transform(expectedUpper.begin(), expectedUpper.end(), expectedUpper.begin(), towupper);
-            Assert::AreEqual(expectedUpper, currentFolderUpper);
-        }
-
-        TEST_METHOD(GetCurrentFolder_ConsistentResults)
-        {
-            // Act
-            const std::wstring& result1 = Utils::Apps::GetCurrentFolder();
-            const std::wstring& result2 = Utils::Apps::GetCurrentFolder();
-
-            // Assert
-            Assert::AreEqual(result1, result2);
-        }
-
-        TEST_METHOD(GetCurrentFolderUpper_ConsistentResults)
-        {
-            // Act
-            const std::wstring& result1 = Utils::Apps::GetCurrentFolderUpper();
-            const std::wstring& result2 = Utils::Apps::GetCurrentFolderUpper();
-
-            // Assert
-            Assert::AreEqual(result1, result2);
-        }
-
-        TEST_METHOD(AppData_IsEdge_EdgePath_ReturnsTrue)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
-
-            // Act
-            bool result = appData.IsEdge();
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(AppData_IsEdge_NonEdgePath_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
-
-            // Act
-            bool result = appData.IsEdge();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsEdge_EmptyPath_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"";
-
-            // Act
-            bool result = appData.IsEdge();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsChrome_ChromePath_ReturnsTrue)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
-
-            // Act
-            bool result = appData.IsChrome();
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(AppData_IsChrome_NonChromePath_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
-
-            // Act
-            bool result = appData.IsChrome();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsChrome_EmptyPath_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.installPath = L"";
-
-            // Act
-            bool result = appData.IsChrome();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsSteamGame_SteamProtocol_ReturnsTrue)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.protocolPath = L"steam://run/123456";
-
-            // Act
-            bool result = appData.IsSteamGame();
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(AppData_IsSteamGame_NonSteamProtocol_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.protocolPath = L"https://example.com";
-
-            // Act
-            bool result = appData.IsSteamGame();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsSteamGame_EmptyProtocol_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.protocolPath = L"";
-
-            // Act
-            bool result = appData.IsSteamGame();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_IsSteamGame_PartialSteamString_ReturnsFalse)
-        {
-            // Arrange
-            Utils::Apps::AppData appData;
-            appData.protocolPath = L"http://run/123456";
-
-            // Act
-            bool result = appData.IsSteamGame();
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(AppData_DefaultValues)
-        {
-            // Arrange & Act
-            Utils::Apps::AppData appData;
-
-            // Assert
-            Assert::IsTrue(appData.name.empty());
-            Assert::IsTrue(appData.installPath.empty());
-            Assert::IsTrue(appData.packageFullName.empty());
-            Assert::IsTrue(appData.appUserModelId.empty());
-            Assert::IsTrue(appData.pwaAppId.empty());
-            Assert::IsTrue(appData.protocolPath.empty());
-            Assert::IsFalse(appData.canLaunchElevated);
-        }
-
-        TEST_METHOD(AppData_MultipleBrowserDetection)
-        {
-            // Arrange
-            Utils::Apps::AppData edgeApp;
-            edgeApp.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
-
-            Utils::Apps::AppData chromeApp;
-            chromeApp.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
-
-            Utils::Apps::AppData otherApp;
-            otherApp.installPath = L"C:\\Program Files\\Firefox\\firefox.exe";
-
-            // Act & Assert
-            Assert::IsTrue(edgeApp.IsEdge());
-            Assert::IsFalse(edgeApp.IsChrome());
-            Assert::IsFalse(edgeApp.IsSteamGame());
-
-            Assert::IsFalse(chromeApp.IsEdge());
-            Assert::IsTrue(chromeApp.IsChrome());
-            Assert::IsFalse(chromeApp.IsSteamGame());
-
-            Assert::IsFalse(otherApp.IsEdge());
-            Assert::IsFalse(otherApp.IsChrome());
-            Assert::IsFalse(otherApp.IsSteamGame());
-        }
-
-        TEST_METHOD(GetAppsList_ReturnsAppList)
-        {
-            // Act
-            Utils::Apps::AppList apps = Utils::Apps::GetAppsList();
-
-            // Assert
-            // The list can be empty or non-empty depending on the system
-            // But it should not crash and should return a valid list
-            Assert::IsTrue(apps.size() >= 0);
-        }
-    };
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/JsonUtilsTests.cpp

@@ -1,186 +0,0 @@
-#include "pch.h"
-#include <filesystem>
-#include <fstream>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace WorkspacesLibUnitTests
-{
-    TEST_CLASS (JsonUtilsTests)
-    {
-    private:
-        std::wstring CreateTempJsonFile(const std::wstring& content)
-        {
-            std::wstring tempPath = std::filesystem::temp_directory_path();
-            tempPath += L"\\test_workspace_" + std::to_wstring(GetTickCount64()) + L".json";
-
-            std::wofstream file(tempPath);
-            file << content;
-            file.close();
-
-            return tempPath;
-        }
-
-        void DeleteTempFile(const std::wstring& filePath)
-        {
-            if (std::filesystem::exists(filePath))
-            {
-                std::filesystem::remove(filePath);
-            }
-        }
-
-    public:
-        TEST_METHOD (ReadSingleWorkspace_NonExistentFile_ReturnsEmptyWorkspace)
-        {
-            // Arrange
-            std::wstring nonExistentFile = L"C:\\NonExistent\\File.json";
-
-            // Act
-            auto result = JsonUtils::ReadSingleWorkspace(nonExistentFile);
-
-            // Assert
-            Assert::IsTrue(result.isOk());
-            auto workspace = result.value();
-            Assert::IsTrue(workspace.name.empty());
-        }
-
-        TEST_METHOD (ReadSingleWorkspace_InvalidJsonFile_ReturnsError)
-        {
-            // Arrange
-            std::wstring tempFile = CreateTempJsonFile(L"invalid json content {");
-
-            // Act
-            auto result = JsonUtils::ReadSingleWorkspace(tempFile);
-
-            // Assert
-            Assert::IsTrue(result.isError());
-            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
-                             static_cast<int>(result.error()));
-
-            // Cleanup
-            DeleteTempFile(tempFile);
-        }
-
-        TEST_METHOD (ReadWorkspaces_NonExistentFile_ReturnsEmptyVector)
-        {
-            // Arrange
-            std::wstring nonExistentFile = L"C:\\NonExistent\\File.json";
-
-            // Act
-            auto result = JsonUtils::ReadWorkspaces(nonExistentFile);
-
-            // Assert
-            Assert::IsTrue(result.isError());
-            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
-                             static_cast<int>(result.error()));
-        }
-
-        TEST_METHOD (ReadWorkspaces_InvalidJsonFile_ReturnsError)
-        {
-            // Arrange
-            std::wstring tempFile = CreateTempJsonFile(L"invalid json content {");
-
-            // Act
-            auto result = JsonUtils::ReadWorkspaces(tempFile);
-
-            // Assert
-            Assert::IsTrue(result.isError());
-            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
-                             static_cast<int>(result.error()));
-
-            // Cleanup
-            DeleteTempFile(tempFile);
-        }
-
-        TEST_METHOD (Write_ValidWorkspace_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring tempPath = std::filesystem::temp_directory_path();
-            tempPath += L"\\test_write_workspace_" + std::to_wstring(GetTickCount64()) + L".json";
-
-            WorkspacesData::WorkspacesProject workspace;
-            workspace.name = L"Test Workspace";
-
-            // Convert string to time_t
-            std::tm tm = {};
-            workspace.creationTime = std::mktime(&tm);
-
-            // Act
-            bool result = JsonUtils::Write(tempPath, workspace);
-
-            // Assert
-            Assert::IsTrue(result);
-            Assert::IsTrue(std::filesystem::exists(tempPath));
-
-            // Cleanup
-            DeleteTempFile(tempPath);
-        }
-
-        TEST_METHOD (Write_ValidWorkspacesList_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring tempPath = std::filesystem::temp_directory_path();
-            tempPath += L"\\test_write_workspaces_" + std::to_wstring(GetTickCount64()) + L".json";
-
-            std::vector<WorkspacesData::WorkspacesProject> workspaces;
-
-            WorkspacesData::WorkspacesProject workspace1;
-            workspace1.name = L"Test Workspace 1";
-            workspace1.creationTime = std::time(nullptr);
-
-            WorkspacesData::WorkspacesProject workspace2;
-            workspace2.name = L"Test Workspace 2";
-            workspace2.creationTime = std::time(nullptr);
-
-            workspaces.push_back(workspace1);
-            workspaces.push_back(workspace2);
-
-            // Act
-            bool result = JsonUtils::Write(tempPath, workspaces);
-
-            // Assert
-            Assert::IsTrue(result);
-            Assert::IsTrue(std::filesystem::exists(tempPath));
-
-            // Cleanup
-            DeleteTempFile(tempPath);
-        }
-
-        TEST_METHOD (Write_EmptyWorkspacesList_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring tempPath = std::filesystem::temp_directory_path();
-            tempPath += L"\\test_write_empty_" + std::to_wstring(GetTickCount64()) + L".json";
-
-            std::vector<WorkspacesData::WorkspacesProject> emptyWorkspaces;
-
-            // Act
-            bool result = JsonUtils::Write(tempPath, emptyWorkspaces);
-
-            // Assert
-            Assert::IsTrue(result);
-            Assert::IsTrue(std::filesystem::exists(tempPath));
-
-            // Cleanup
-            DeleteTempFile(tempPath);
-        }
-
-        /*
-        TEST_METHOD(Write_InvalidPath_ReturnsFalse)
-        {
-            // Arrange
-            std::wstring invalidPath = L"C:\\NonExistent\\Path\\workspace.json";
-            
-            WorkspacesData::WorkspacesProject workspace;
-            workspace.name = L"Test Workspace";
-            workspace.creationTime = std::time(nullptr);
-
-            // Act
-            bool result = JsonUtils::Write(invalidPath, workspace);
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-        */
-    };
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/PwaHelperTests.cpp

@@ -1,114 +0,0 @@
-#include "pch.h"
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace WorkspacesLibUnitTests
-{
-    TEST_CLASS (PwaHelperTests)
-    {
-    public:
-        TEST_METHOD (PwaHelper_Constructor_DoesNotThrow)
-        {
-            // Act & Assert - Constructor should not crash when called
-            try
-            {
-                Utils::PwaHelper helper;
-                // If we get here, the constructor didn't throw
-                Assert::IsTrue(true);
-            }
-            catch (...)
-            {
-                Assert::Fail(L"PwaHelper constructor should not throw exceptions");
-            }
-        }
-
-        TEST_METHOD (PwaHelper_GetEdgeAppId_EmptyAumid_ReturnsEmpty)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring emptyAumid = L"";
-
-            // Act
-            auto result = helper.GetEdgeAppId(emptyAumid);
-
-            // Assert
-            Assert::IsFalse(result.has_value());
-        }
-
-        TEST_METHOD (PwaHelper_GetChromeAppId_EmptyAumid_ReturnsEmpty)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring emptyAumid = L"";
-
-            // Act
-            auto result = helper.GetChromeAppId(emptyAumid);
-
-            // Assert
-            Assert::IsFalse(result.has_value());
-        }
-
-        TEST_METHOD (PwaHelper_SearchPwaName_EmptyParameters_ReturnsEmpty)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring emptyPwaAppId = L"";
-            std::wstring emptyWindowAumid = L"";
-
-            // Act
-            std::wstring result = helper.SearchPwaName(emptyPwaAppId, emptyWindowAumid);
-
-            // Assert
-            Assert::IsTrue(result.empty());
-        }
-
-        TEST_METHOD (PwaHelper_SearchPwaName_NonExistentIds_ReturnsEmpty)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring nonExistentPwaAppId = L"nonexistent_app_id";
-            std::wstring nonExistentWindowAumid = L"nonexistent_aumid";
-
-            // Act
-            std::wstring result = helper.SearchPwaName(nonExistentPwaAppId, nonExistentWindowAumid);
-
-            // TODO: is it really expected?
-            Assert::IsTrue(result == nonExistentWindowAumid);
-        }
-
-        TEST_METHOD (PwaHelper_GetAUMIDFromWindow_InvalidWindow_ReturnsEmpty)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            HWND invalidWindow = nullptr;
-
-            // Act
-            std::wstring result = helper.GetAUMIDFromWindow(invalidWindow);
-
-            // Assert
-            Assert::IsTrue(result.empty());
-        }
-
-        TEST_METHOD (PwaHelper_GetEdgeAppId_ValidConstruction_DoesNotCrash)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring testAumid = L"Microsoft.MicrosoftEdge_8wekyb3d8bbwe!App";
-
-            // Act & Assert - Should not crash
-            auto result = helper.GetEdgeAppId(testAumid);
-            // Result can be empty or have value, but should not crash
-        }
-
-        TEST_METHOD (PwaHelper_GetChromeAppId_ValidConstruction_DoesNotCrash)
-        {
-            // Arrange
-            Utils::PwaHelper helper;
-            std::wstring testAumid = L"Chrome.App.TestId";
-
-            // Act & Assert - Should not crash
-            auto result = helper.GetChromeAppId(testAumid);
-            // Result can be empty or have value, but should not crash
-        }
-    };
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/StringUtilsTests.cpp

@@ -1,115 +0,0 @@
-#include "pch.h"
-#include <StringUtils.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace WorkspacesLibUnitTests
-{
-    TEST_CLASS(StringUtilsTests)
-    {
-    public:
-        TEST_METHOD(CaseInsensitiveEquals_SameStrings_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring str1 = L"test";
-            std::wstring str2 = L"test";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_DifferentCase_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring str1 = L"Test";
-            std::wstring str2 = L"TEST";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_MixedCase_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring str1 = L"TeSt StRiNg";
-            std::wstring str2 = L"test STRING";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_DifferentStrings_ReturnsFalse)
-        {
-            // Arrange
-            std::wstring str1 = L"test";
-            std::wstring str2 = L"different";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_DifferentLengths_ReturnsFalse)
-        {
-            // Arrange
-            std::wstring str1 = L"test";
-            std::wstring str2 = L"testing";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_EmptyStrings_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring str1 = L"";
-            std::wstring str2 = L"";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_OneEmpty_ReturnsFalse)
-        {
-            // Arrange
-            std::wstring str1 = L"test";
-            std::wstring str2 = L"";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsFalse(result);
-        }
-
-        TEST_METHOD(CaseInsensitiveEquals_SpecialCharacters_ReturnsTrue)
-        {
-            // Arrange
-            std::wstring str1 = L"Test-123_Special!";
-            std::wstring str2 = L"test-123_special!";
-
-            // Act
-            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
-
-            // Assert
-            Assert::IsTrue(result);
-        }
-    };
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesDataTests.cpp

@@ -1,194 +0,0 @@
-#include "pch.h"
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
-namespace WorkspacesLibUnitTests
-{
-    TEST_CLASS(WorkspacesDataTests)
-    {
-    public:
-        TEST_METHOD(WorkspacesFile_ReturnsValidPath)
-        {
-            // Act
-            std::wstring result = WorkspacesData::WorkspacesFile();
-
-            // Assert
-            Assert::IsFalse(result.empty());
-            Assert::IsTrue(result.find(L"workspaces.json") != std::wstring::npos);
-        }
-
-        TEST_METHOD(TempWorkspacesFile_ReturnsValidPath)
-        {
-            // Act
-            std::wstring result = WorkspacesData::TempWorkspacesFile();
-
-            // Assert
-            Assert::IsFalse(result.empty());
-            Assert::IsTrue(result.find(L"temp-workspaces.json") != std::wstring::npos);
-        }
-
-        TEST_METHOD(WorkspacesFile_TempWorkspacesFile_DifferentPaths)
-        {
-            // Act
-            std::wstring workspacesFile = WorkspacesData::WorkspacesFile();
-            std::wstring tempWorkspacesFile = WorkspacesData::TempWorkspacesFile();
-
-            // Assert
-            Assert::AreNotEqual(workspacesFile, tempWorkspacesFile);
-        }
-
-        TEST_METHOD(Position_ToRect_ConvertsCorrectly)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application::Position position;
-            position.x = 100;
-            position.y = 200;
-            position.width = 800;
-            position.height = 600;
-
-            // Act
-            RECT rect = position.toRect();
-
-            // Assert
-            Assert::AreEqual(100, static_cast<int>(rect.left));
-            Assert::AreEqual(200, static_cast<int>(rect.top));
-            Assert::AreEqual(900, static_cast<int>(rect.right)); // x + width
-            Assert::AreEqual(800, static_cast<int>(rect.bottom)); // y + height
-        }
-
-        TEST_METHOD(Position_ToRect_ZeroPosition)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application::Position position;
-            position.x = 0;
-            position.y = 0;
-            position.width = 0;
-            position.height = 0;
-
-            // Act
-            RECT rect = position.toRect();
-
-            // Assert
-            Assert::AreEqual(0, static_cast<int>(rect.left));
-            Assert::AreEqual(0, static_cast<int>(rect.top));
-            Assert::AreEqual(0, static_cast<int>(rect.right));
-            Assert::AreEqual(0, static_cast<int>(rect.bottom));
-        }
-
-        TEST_METHOD(Position_ToRect_NegativeCoordinates)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application::Position position;
-            position.x = -100;
-            position.y = -50;
-            position.width = 200;
-            position.height = 150;
-
-            // Act
-            RECT rect = position.toRect();
-
-            // Assert
-            Assert::AreEqual(-100, static_cast<int>(rect.left));
-            Assert::AreEqual(-50, static_cast<int>(rect.top));
-            Assert::AreEqual(100, static_cast<int>(rect.right)); // -100 + 200
-            Assert::AreEqual(100, static_cast<int>(rect.bottom)); // -50 + 150
-        }
-
-        TEST_METHOD(Application_DefaultValues)
-        {
-            // Arrange & Act
-            WorkspacesData::WorkspacesProject::Application app;
-
-            // Assert
-            Assert::IsTrue(app.id.empty());
-            Assert::IsTrue(app.name.empty());
-            Assert::IsTrue(app.title.empty());
-            Assert::IsTrue(app.path.empty());
-            Assert::IsTrue(app.packageFullName.empty());
-            Assert::IsTrue(app.appUserModelId.empty());
-            Assert::IsTrue(app.pwaAppId.empty());
-            Assert::IsTrue(app.commandLineArgs.empty());
-            Assert::IsFalse(app.isElevated);
-            Assert::IsFalse(app.canLaunchElevated);
-            Assert::IsFalse(app.isMinimized);
-            Assert::IsFalse(app.isMaximized);
-            Assert::AreEqual(0, static_cast<int>(app.position.x));
-            Assert::AreEqual(0, static_cast<int>(app.position.y));
-            Assert::AreEqual(0, static_cast<int>(app.position.width));
-            Assert::AreEqual(0, static_cast<int>(app.position.height));
-            Assert::AreEqual(0u, static_cast<unsigned int>(app.monitor));
-        }
-
-        TEST_METHOD(Application_Comparison_EqualObjects)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application app1;
-            app1.id = L"test-id";
-            app1.name = L"Test App";
-            app1.position.x = 100;
-            app1.position.y = 200;
-
-            WorkspacesData::WorkspacesProject::Application app2;
-            app2.id = L"test-id";
-            app2.name = L"Test App";
-            app2.position.x = 100;
-            app2.position.y = 200;
-
-            // Act & Assert
-            Assert::IsTrue(app1 == app2);
-        }
-
-        TEST_METHOD(Application_Comparison_DifferentObjects)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application app1;
-            app1.id = L"test-id-1";
-            app1.name = L"Test App 1";
-
-            WorkspacesData::WorkspacesProject::Application app2;
-            app2.id = L"test-id-2";
-            app2.name = L"Test App 2";
-
-            // Act & Assert
-            Assert::IsTrue(app1 != app2);
-        }
-
-        TEST_METHOD(Position_Comparison_EqualPositions)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application::Position pos1;
-            pos1.x = 100;
-            pos1.y = 200;
-            pos1.width = 800;
-            pos1.height = 600;
-
-            WorkspacesData::WorkspacesProject::Application::Position pos2;
-            pos2.x = 100;
-            pos2.y = 200;
-            pos2.width = 800;
-            pos2.height = 600;
-
-            // Act & Assert
-            Assert::IsTrue(pos1 == pos2);
-        }
-
-        TEST_METHOD(Position_Comparison_DifferentPositions)
-        {
-            // Arrange
-            WorkspacesData::WorkspacesProject::Application::Position pos1;
-            pos1.x = 100;
-            pos1.y = 200;
-            pos1.width = 800;
-            pos1.height = 600;
-
-            WorkspacesData::WorkspacesProject::Application::Position pos2;
-            pos2.x = 150;
-            pos2.y = 200;
-            pos2.width = 800;
-            pos2.height = 600;
-
-            // Act & Assert
-            Assert::IsTrue(pos1 != pos2);
-        }
-    };
-}

src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj

@@ -1,76 +0,0 @@
-<?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">
-    <ProjectGuid>{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>WorkspacesLibUnitTests</RootNamespace>
-    <ProjectName>WorkspacesLibUnitTests</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\tests\Workspaces\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\WorkspacesLib\;$(SolutionDir)src\;$(SolutionDir)src\common;$(SolutionDir)src\common\Telemetry;..\..\;..\..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\\lib;$(SolutionDir)$(Platform)\\$(Configuration)\\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>propsys.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="WorkspacesDataTests.cpp" />
-    <ClCompile Include="StringUtilsTests.cpp" />
-    <ClCompile Include="JsonUtilsTests.cpp" />
-    <ClCompile Include="AppUtilsTests.cpp" />
-    <ClCompile Include="PwaHelperTests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\WorkspacesLib\WorkspacesLib.vcxproj">
-      <Project>{b31fcc55-b5a4-4ea7-b414-2dceae6af332}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <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>
-</Project>

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

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WorkspacesDataTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StringUtilsTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="JsonUtilsTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AppUtilsTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PwaHelperTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>

src/modules/Workspaces/WorkspacesLib.UnitTests/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>

src/modules/Workspaces/WorkspacesLib.UnitTests/pch.cpp

@@ -1 +0,0 @@
-#include "pch.h"

src/modules/Workspaces/WorkspacesLib.UnitTests/pch.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "targetver.h"
-
-// Headers for CppUnitTest
-#pragma warning(disable : 26466)
-#include "CppUnitTest.h"
-
-// Windows headers
-#include <windows.h>
-#include <string>
-#include <memory>
-#include <vector>
-#include <optional>
-
-// Workspaces headers
-#include <WorkspacesLib/WorkspacesData.h>
-#include <WorkspacesLib/JsonUtils.h>
-#include <WorkspacesLib/Result.h>
-#include <WorkspacesLib/AppUtils.h>
-#include <WorkspacesLib/PwaHelper.h>

src/modules/Workspaces/WorkspacesLib.UnitTests/targetver.h

@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>

src/modules/Workspaces/WorkspacesLib/StringUtils.h

@@ -6,7 +6,7 @@
 
 namespace StringUtils
 {
-    inline bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
+    bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
     {
         if (str1.size() != str2.size())
         {

src/modules/Workspaces/WorkspacesLib/WorkspacesData.h

@@ -69,10 +69,10 @@ namespace WorkspacesData
 
         std::wstring id;
         std::wstring name;
-        time_t creationTime{};
+        time_t creationTime;
         std::optional<time_t> lastLaunchedTime;
-        bool isShortcutNeeded{};
-        bool moveExistingWindows{};
+        bool isShortcutNeeded;
+        bool moveExistingWindows;
         std::vector<Monitor> monitors;
         std::vector<Application> apps;
     };

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

@@ -108,6 +108,7 @@
     <ClInclude Include="KeyboardListener.h">
       <DependentUpon>KeyboardListener.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -129,6 +130,9 @@
     <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">

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

@@ -16,6 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="KeyboardListener.idl" />
@@ -27,4 +28,9 @@
   <ItemGroup>
     <None Include="PropertySheet.props" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalKeyboardService.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

src/modules/cmdpal/CmdPalKeyboardService/resource.h

@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PowerToys.MeasureToolCore.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "CmdPalKeyboardService"
+#define INTERNAL_NAME "CmdPalKeyboardService"
+#define ORIGINAL_FILENAME "CmdPalKeyboardService.dll"
+
+// Non-localizable
+//////////////////////////////

src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.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/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj

@@ -44,6 +44,9 @@
     <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
       <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\common\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -63,6 +66,7 @@
 
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
@@ -70,6 +74,9 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CmdPalModuleInterface.rc" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -85,4 +92,4 @@
     <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>
-</Project>
+</Project>

src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp

@@ -217,11 +217,10 @@ public:
         CmdPal::m_enabled.store(true);
 
         std::wstring packageName = L"Microsoft.CommandPalette";
-        // Launch CmdPal as normal user using explorer
-        std::wstring launchPath = L"explorer.exe";
-        std::wstring launchArgs = L"x-cmdpal://background";
+        std::wstring launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette_8wekyb3d8bbwe!App";
 #ifdef IS_DEV_BRANDING
         packageName = L"Microsoft.CommandPalette.Dev";
+        launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App";
 #endif
 
         if (!package::GetRegisteredPackage(packageName, false).has_value())
@@ -270,13 +269,13 @@ public:
         if (!firstEnableCall)
         {
             Logger::trace("Not first attempt, try to launch");
-            LaunchApp(launchPath, launchArgs, false /*no elevated*/, false /*error pop up*/);
+            LaunchApp(launchPath, L"RunFromPT", false /*no elevated*/, false /*error pop up*/);
         }
         else
         {
             // If first time enable, do retry launch.
             Logger::trace("First attempt, try to launch");
-            std::thread launchThread(&CmdPal::RetryLaunch, launchPath, launchArgs);
+            std::thread launchThread(&CmdPal::RetryLaunch, launchPath);
             launchThread.detach();
         }
 
@@ -291,14 +290,14 @@ public:
         CmdPal::m_enabled.store(false);
     }
 
-    static void RetryLaunch(std::wstring path, std::wstring cmdArgs)
+    static void RetryLaunch(std::wstring path)
     {
         const int base_delay_milliseconds = 1000;
         int max_retry = 9; // 2**9 - 1 seconds. Control total wait time within 10 min.
         int retry = 0;
         do
         {
-            auto launch_result = LaunchApp(path, cmdArgs, false, retry < max_retry);
+            auto launch_result = LaunchApp(path, L"RunFromPT", false, retry < max_retry);
             if (launch_result)
             {
                 Logger::info(L"CmdPal launched successfully after {} retries.", retry);
@@ -350,4 +349,4 @@ std::atomic<bool> CmdPal::m_launched{ false };
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new CmdPal();
-}
+}

src/modules/cmdpal/CmdPalModuleInterface/resource.h

@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by AlwaysOnTopModuleInterface.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Command Palette Module"
+#define INTERNAL_NAME "PowerToys.CmdPalModuleInterface"
+#define ORIGINAL_FILENAME "PowerToys.CmdPalModuleInterface.dll"
+
+// Non-localizable
+//////////////////////////////

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

@@ -1,17 +1,17 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.1.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.3" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/Program.cs

@@ -14,12 +14,11 @@ namespace TemplateCmdPalExtension;
 public class Program
 {
     [MTAThread]
-    public static void Main(string[] args)
+    public static async Task Main(string[] args)
     {
         if (args.Length > 0 && args[0] == "-RegisterProcessAsComServer")
         {
-            global::Shmuelie.WinRTServer.ComServer server = new();
-
+            await using global::Shmuelie.WinRTServer.ComServer server = new();
             ManualResetEvent extensionDisposedEvent = new(false);
             
             // We are instantiating an extension instance once above, and returning it every time the callback in RegisterExtension below is called.
@@ -32,8 +31,6 @@ public class Program
             // This will make the main thread wait until the event is signalled by the extension class.
             // Since we have single instance of the extension object, we exit as soon as it is disposed.
             extensionDisposedEvent.WaitOne();
-            server.Stop();
-            server.UnsafeDispose();
         }
         else
         {

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TemplateCmdPalExtension</RootNamespace>
@@ -56,35 +56,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PublishSingleFile>true</PublishSingleFile>
     <IsAotCompatible>true</IsAotCompatible>
-
     <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
 
-    <!-- When publishing trimmed, make sure to treat trimming warnings as build errors -->
-    <ILLinkTreatWarningsAsErrors>true</ILLinkTreatWarningsAsErrors>
-
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <!-- In Debug builds, trimming is disabled by default, but all the trim & 
-         AOT warnings are enabled. This gives debug builds a tighter inner loop,
-         while at least warning about future trim violations -->
-    <PublishTrimmed>false</PublishTrimmed>
-    
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
-    <EnableAotAnalyzer>true</EnableAotAnalyzer>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'!='Debug'">
-    <!-- In Release builds, trimming is enabled by default. 
-         feel free to disable this if needed -->
     <PublishTrimmed>true</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
-
-
 </Project>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>

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

@@ -128,7 +128,7 @@ public partial class CommandBarViewModel : ObservableObject,
     // this comes in when the primary button is tapped
     public void InvokePrimaryCommand()
     {
-        PerformCommand(PrimaryCommand);
+        PerformCommand(SecondaryCommand);
     }
 
     // this comes in when the secondary button is tapped

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

@@ -190,7 +190,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             contextItem.SlowInitializeProperties();
         });
 
-        if (!string.IsNullOrEmpty(model.Command?.Name))
+        if (!string.IsNullOrEmpty(model.Command.Name))
         {
             _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
             {