Bundle localization files into

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
Transparency support (best-effort)
> Not every window can be made transparent. Transparency is applied on a
best-effort basis and depends on how the target app/window is built and
rendered.

## When it may not work
* Windows with special rendering pipelines (e.g., certain
hardware-accelerated / compositor-managed surfaces).
* Some tool/popup/owned windows where the foreground window isn’t the
actual surface being drawn.

## How it works (high-level)
* Resolve the best target window (preferring the top-level/root window
over transient children).
* Apply Windows’ standard layered-window alpha mechanism (per-window
opacity) to adjust transparency.
* When unpinned, Restore the original opacity/state when possible.

If transparency doesn’t change, it means the window doesn’t support this
mechanism in its current configuration.
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [X] Closes: 
#43278 
#42929
#28773

<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the 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
- [ ] **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
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [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 -->
## 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 -->
## Validation Steps Performed


https://github.com/user-attachments/assets/c97a87f2-3126-4e19-990f-8c684dbeb631

<img width="1119" height="426" alt="image"
src="https://github.com/user-attachments/assets/547671ee-81d3-4c94-8199-bf0c4b1b7760"
/>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

@@ -565,7 +565,7 @@ perl(?:\s+-[a-zA-Z]\w*)+
 regexp?\.MustCompile\((?:`[^`]*`|".*"|'.*')\)
 
 # regex choice
-\(\?:[^)]+\|[^)]+\)
+# \(\?:[^)]+\|[^)]+\)
 
 # proto
 ^\s*(\w+)\s\g{-1} =

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

@@ -104,8 +104,12 @@
 ^src/common/ManagedCommon/ColorFormatHelper\.cs$
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
+^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherComparisonTests.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CommandPalette\.Extensions\.Toolkit\.UnitTests/FuzzyMatcherDiacriticsTests.cs$
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
+^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
+^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/.*\.TestData\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$

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

@@ -22,7 +22,6 @@ ADate
 ADDSTRING
 ADDUNDORECORD
 ADifferent
-adjacents
 ADMINS
 adml
 admx
@@ -103,7 +102,6 @@ ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
 ATRIOX
-ATX
 aumid
 authenticode
 AUTOBUDDY
@@ -220,10 +218,11 @@ CIELCh
 cim
 CImage
 cla
-claude
 CLASSDC
+classguid
 classmethod
 CLASSNOTAVAILABLE
+claude
 CLEARTYPE
 clickable
 clickonce
@@ -262,7 +261,6 @@ colorhistory
 colorhistorylimit
 COLORKEY
 colorref
-Convs
 comctl
 comdlg
 comexp
@@ -283,6 +281,7 @@ CONTEXTHELP
 CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
+Convs
 copiedcolorrepresentation
 coppied
 copyable
@@ -298,7 +297,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
@@ -327,7 +325,7 @@ CURRENTDIR
 CURSORINFO
 cursorpos
 CURSORSHOWING
-CURSORWRAP
+cursorwrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -350,12 +348,14 @@ datareader
 datatracker
 dataversion
 Dayof
+dbcc
 DBID
 DBLCLKS
 DBLEPSILON
 DBPROP
 DBPROPIDSET
 DBPROPSET
+DBT
 DCBA
 DCOM
 DComposition
@@ -373,8 +373,7 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTSIZE
-DEFAULTTONEAREST
-Defaulttonearest
+defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -396,14 +395,19 @@ DESKTOPVERTRES
 devblogs
 devdocs
 devenv
+DEVICEINTERFACE
+devicetype
+DEVINTERFACE
 devmgmt
 DEVMODE
 DEVMODEW
+DEVNODES
 devpal
+DEVTYP
 dfx
 DIALOGEX
-digicert
 diffs
+digicert
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -546,7 +550,6 @@ fdx
 FErase
 fesf
 FFFF
-FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -567,6 +570,7 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
+FInc
 findfast
 findmymouse
 FIXEDFILEINFO
@@ -593,6 +597,7 @@ frm
 FROMTOUCH
 fsanitize
 fsmgmt
+ftps
 fuzzingtesting
 fxf
 FZE
@@ -668,13 +673,14 @@ HCRYPTPROV
 hcursor
 hcwhite
 hdc
+HDEVNOTIFY
 hdr
 hdrop
 hdwwiz
 Helpline
 helptext
-HGFE
 hgdiobj
+HGFE
 hglobal
 hhk
 HHmmssfff
@@ -750,9 +756,9 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
-icf
 IDCANCEL
 IDD
 idk
@@ -843,8 +849,8 @@ jeli
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
 jjw
-JOBOBJECT
 jobject
+JOBOBJECT
 jpe
 jpnime
 Jsons
@@ -888,6 +894,7 @@ Ldr
 LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
@@ -930,9 +937,9 @@ LOWORD
 lparam
 LPBITMAPINFOHEADER
 LPCFHOOKPROC
+lpch
 LPCITEMIDLIST
 LPCLSID
-lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -948,6 +955,7 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
+LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -957,7 +965,6 @@ lptpm
 LPTR
 LPTSTR
 lpv
-LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -1001,13 +1008,13 @@ mber
 MBM
 MBR
 Mbuttondown
+mcp
 MDICHILD
 MDL
 mdtext
 mdtxt
 mdwn
 meme
-mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1042,8 +1049,8 @@ mmi
 mmsys
 mobileredirect
 mockapi
-modelcontextprotocol
 MODALFRAME
+modelcontextprotocol
 MODESPRUNED
 MONITORENUMPROC
 MONITORINFO
@@ -1087,9 +1094,9 @@ MSLLHOOKSTRUCT
 Mso
 msrc
 msstore
+mstsc
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
@@ -1099,11 +1106,11 @@ muxxc
 muxxh
 MVPs
 mvvm
-myorg
-myrepo
 MVVMTK
 MWBEx
 MYICON
+myorg
+myrepo
 NAMECHANGE
 namespaceanddescendants
 nao
@@ -1244,10 +1251,8 @@ opencode
 OPENFILENAME
 openrdp
 opensource
-openxmlformats
-ollama
-onnx
 openurl
+openxmlformats
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1325,7 +1330,7 @@ phwnd
 pici
 pidl
 PIDLIST
-PII
+pii
 pinfo
 pinvoke
 pipename
@@ -1464,7 +1469,6 @@ rbhid
 Rbuttondown
 rclsid
 RCZOOMIT
-remotedesktop
 rdp
 RDW
 READMODE
@@ -1493,6 +1497,7 @@ remappings
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
+remotedesktop
 remoteip
 Removelnk
 renamable
@@ -1526,8 +1531,9 @@ RIGHTSCROLLBAR
 riid
 RKey
 RNumber
-rop
 rollups
+ROOTOWNER
+rop
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1711,6 +1717,7 @@ srw
 srwlock
 sse
 ssf
+Ssn
 sszzz
 STACKFRAME
 stackoverflow
@@ -1760,15 +1767,13 @@ SUBMODULEUPDATE
 subresource
 Superbar
 sut
-swe
 svchost
 SVGIn
 SVGIO
 svgz
 SVSI
 SWFO
-SWP
-Swp
+swp
 SWPNOSIZE
 SWPNOZORDER
 SWRESTORE
@@ -1787,8 +1792,7 @@ SYSKEY
 syskeydown
 SYSKEYUP
 SYSLIB
-SYSMENU
-Sysmenu
+sysmenu
 systemai
 SYSTEMAPPS
 SYSTEMMODAL
@@ -1823,6 +1827,7 @@ TEXTBOXNEWLINE
 textextractor
 TEXTINCLUDE
 tfopen
+tgamma
 tgz
 THEMECHANGED
 themeresources
@@ -1892,9 +1897,9 @@ uitests
 UITo
 ULONGLONG
 Ultrawide
-ums
 UMax
 UMin
+ums
 uncompilable
 UNCPRIORITY
 UNDNAME

.github/prompts/create-commit-title.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Generate an 80-character git commit title for the local diff'
 ---
 

.github/prompts/create-pr-summary.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Generate a PowerToys-ready pull request description from the local diff'
 ---
 

.github/prompts/fix-issue.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Execute the fix for a GitHub issue using the previously generated implementation plan'
 ---
 

.github/prompts/fix-pr-active-comments.prompt.md

@@ -0,0 +1,70 @@
+---
+description: 'Fix active pull request comments with scoped changes'
+name: 'fix-pr-active-comments'
+agent: 'agent'
+argument-hint: 'PR number or active PR URL'
+---
+
+# Fix Active PR Comments
+
+## Mission
+Resolve active pull request comments by applying only simple fixes. For complex refactors, write a plan instead of changing code.
+
+## Scope & Preconditions
+- You must have an active pull request context or a provided PR number.
+- Only implement simple changes. Do not implement large refactors.
+- If required context is missing, request it and stop.
+
+## Inputs
+- Required: ${input:pr_number:PR number or URL}
+- Optional: ${input:comment_scope:files or areas to focus on}
+- Optional: ${input:fixing_guidelines:additional fixing guidelines from the user}
+
+## Workflow
+1. Locate all active (unresolved) PR review comments for the given PR.
+2. For each comment, classify the change scope:
+   - Simple change: limited edits, localized fix, low risk, no broad redesign.
+   - Large refactor: multi-file redesign, architecture change, or risky behavior change.
+3. For each large refactor request:
+   - Do not modify code.
+   - Write a planning document to Generated Files/prReview/${input:pr_number}/fixPlan/.
+4. For each simple change request:
+   - Implement the fix with minimal edits.
+   - Run quick checks if needed.
+   - Commit and push the change.
+5. For comments that seem invalid, unclear, or not applicable (even if simple):
+   - Do not change code.
+   - Add the item to a summary table in Generated Files/prReview/${input:pr_number}/fixPlan/overview.md.
+   - Consult back to the end user in a friendly, polite tone.
+6. Respond to each comment that you fixed:
+   - Reply in the active conversation.
+   - Use a polite or friendly tone.
+   - Keep the response under 200 words.
+   - Resolve the comment after replying.
+
+## Output Expectations
+- Simple fixes: code changes committed and pushed.
+- Large refactors: a plan file saved to Generated Files/prReview/${input:pr_number}/fixPlan/.
+- Invalid or unclear comments: captured in Generated Files/prReview/${input:pr_number}/fixPlan/overview.md.
+- Each fixed comment has a reply under 200 words and is resolved.
+
+## Plan File Template
+Use this template for each large refactor item:
+
+# Fix Plan: <short title>
+
+## Context
+- Comment link:
+- Impacted areas:
+
+## Overview Table Template
+Use this table in Generated Files/prReview/${input:pr_number}/fixPlan/overview.md:
+
+| Comment link | Summary | Reason not applied | Suggested follow-up |
+| --- | --- | --- | --- |
+|  |  |  |  |
+
+## Quality Assurance
+- Verify plan file path exists.
+- Ensure no code changes were made for large refactor items.
+- Confirm replies are under 200 words and comments are resolved.

.github/prompts/fix-spelling.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Resolve Code scanning / check-spelling comments on the active PR'
 ---
 

.github/prompts/review-issue.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Review a GitHub issue, score it (0-100), and generate an implementation plan'
 ---
 

.github/prompts/review-pr.prompt.md

@@ -1,6 +1,5 @@
 ---
 agent: 'agent'
-model: 'GPT-5.1-Codex-Max'
 description: 'Perform a comprehensive PR review with per-step Markdown and machine-readable outputs'
 ---
 

.pipelines/v2/oneFuzz.yml

@@ -35,7 +35,9 @@ stages:
             ${{ else }}:
               name: SHINE-OSS-L
             ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS17-Preview
+              demands: ImageOverride -equals SHINE-VS18-Preview
+            ${{ else }}:
+              demands: ImageOverride -equals SHINE-VS18-Latest
           buildPlatforms:
             - ${{ parameters.platform }}
           buildConfigurations: [Release]

.pipelines/v2/release.yml

@@ -51,7 +51,9 @@ extends:
     pool:
       name: SHINE-INT-S
       ${{ if eq(parameters.useVSPreview, true) }}:
-        demands: ImageOverride -equals SHINE-VS17-Preview
+        demands: ImageOverride -equals SHINE-VS18-Preview
+      ${{ else }}:
+        demands: ImageOverride -equals SHINE-VS18-Latest
       os: windows
     sdl:
       tsa:
@@ -74,7 +76,9 @@ extends:
                 demands:
                   # Our INT agents have a large disk mounted at P:\
                   - ${{ if eq(parameters.useVSPreview, true) }}:
-                    - ImageOverride -equals SHINE-VS17-Preview
+                    - ImageOverride -equals SHINE-VS18-Latest-Preview
+                  - ${{ else }}:
+                    - ImageOverride -equals SHINE-VS18-Latest
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations

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

@@ -253,7 +253,7 @@ jobs:
       displayName: Build PowerToys main project
     inputs:
       solution: 'PowerToys.slnx'
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore -graph
         /p:RestorePackagesConfig=true
@@ -276,7 +276,7 @@ jobs:
     condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
     inputs:
       solution: PowerToys.slnx
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore
         /p:Configuration=$(BuildConfiguration)
@@ -338,7 +338,7 @@ jobs:
     displayName: Build BugReportTool
     inputs:
       solution: '**/tools/BugReportTool/BugReportTool.sln'
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore -graph
         /p:RestorePackagesConfig=true
@@ -359,7 +359,7 @@ jobs:
     displayName: Build StylesReportTool
     inputs:
       solution: '**/tools/StylesReportTool/StylesReportTool.sln'
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore -graph
         /p:RestorePackagesConfig=true
@@ -381,7 +381,7 @@ jobs:
       displayName: Publish ${{ project }} for Packaging
       inputs:
         solution: ${{ project }}
-        vsVersion: 17.0
+        vsVersion: 18.0
         msbuildArgs: >-
           /target:Publish
           /graph

.pipelines/v2/templates/job-build-ui-tests.yml

@@ -82,7 +82,7 @@ jobs:
       displayName: Build UI Test Projects
       inputs:
         solution: '**/*UITest*.csproj'
-        vsVersion: 17.0
+        vsVersion: 18.0
         msbuildArgs: >-
           -restore
           -graph
@@ -103,7 +103,7 @@ jobs:
         displayName: 'Build UI Test Module: ${{ module }}'
         inputs:
           solution: '**/*${{ module }}*.csproj'
-          vsVersion: 17.0
+          vsVersion: 18.0
           msbuildArgs: >-
             -restore
             -graph

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

@@ -49,7 +49,9 @@ stages:
               ${{ else }}:
                 name: SHINE-OSS-L
               ${{ if eq(parameters.useVSPreview, true) }}:
-                demands: ImageOverride -equals SHINE-VS17-Preview
+                demands: ImageOverride -equals SHINE-VS18-Preview
+              ${{ else }}:
+                demands: ImageOverride -equals SHINE-VS18-Latest
             buildPlatforms:
               - ${{ platform }}
             buildConfigurations: [Release]

.pipelines/v2/templates/pipeline-ui-tests-full-build.yml

@@ -29,7 +29,9 @@ stages:
             ${{ else }}:
               name: SHINE-OSS-L
             ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS17-Preview
+              demands: ImageOverride -equals SHINE-VS18-Preview
+            ${{ else }}:
+              demands: ImageOverride -equals SHINE-VS18-Latest
           buildPlatforms:
             - ${{ parameters.platform }}
           buildConfigurations: [Release]

.pipelines/v2/templates/steps-build-installer-vnext.yml

@@ -36,7 +36,7 @@ steps:
     displayName: Build Shared Support DLLs
     inputs:
       solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
         /p:RunBuildEvents=true;RestorePackagesConfig=true;CIBuild=true
@@ -75,7 +75,7 @@ steps:
     displayName: 💻 Build VNext MSI
     inputs:
       solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore
         /t:PowerToysInstallerVNext
@@ -92,7 +92,7 @@ steps:
     displayName: 👤 Build VNext MSI
     inputs:
       solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         /t:PowerToysInstallerVNext
         /p:RunBuildEvents=false;PerUser=true;BuildProjectReferences=false;CIBuild=true
@@ -143,7 +143,7 @@ steps:
     displayName: 💻 Build VNext Bootstrapper
     inputs:
       solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         -restore
         /t:PowerToysBootstrapperVNext
@@ -160,7 +160,7 @@ steps:
     displayName: 👤 Build VNext Bootstrapper
     inputs:
       solution: "**/installer/PowerToysSetup.slnx"
-      vsVersion: 17.0
+      vsVersion: 18.0
       msbuildArgs: >-
         /t:PowerToysBootstrapperVNext
         /p:PerUser=true;BuildProjectReferences=false;CIBuild=true

.pipelines/verifyAndSetLatestVCToolsVersion.ps1

@@ -1,9 +1,16 @@
-$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))
+# Build common vswhere base arguments
+$vsWhereBaseArgs = @('-latest', '-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64')
+if ($env:VCWhereExtraVersionTarget) {
+    # Add version target if specified (e.g., '-version [18.0,19.0)' for VS2026)
+    $vsWhereBaseArgs += $env:VCWhereExtraVersionTarget.Split(' ')
+}
+
+$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' @vsWhereBaseArgs -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
 $LatestVCPackage = ($VSPackages | ? { $_.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')
+$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' @vsWhereBaseArgs -property 'resolvedInstallationPath')
 $VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
 
 # We have observed a few instances where the VC tools package version actually
@@ -24,5 +31,12 @@ If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
 }
 
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
-Write-Output "Updating VCToolsVersion environment variable for job"
-Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"
+
+# VS2026 (MSVC 14.50+) doesn't need explicit VCToolsVersion - let MSBuild auto-select
+$MajorMinorVersion = [Version]::Parse($LatestVCToolsVersion)
+If ($MajorMinorVersion.Major -eq 14 -and $MajorMinorVersion.Minor -ge 50) {
+    Write-Output "VS2026 detected (MSVC 14.50+). Skipping VCToolsVersion override to allow MSBuild auto-selection."
+} Else {
+    Write-Output "Updating VCToolsVersion environment variable for job"
+    Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"
+}

AGENTS.md

@@ -40,7 +40,7 @@ These instruction files are automatically applied when working in their respecti
 
 ### Prerequisites
 
-- Visual Studio 2022 17.4+
+- Visual Studio 2022 17.4+ or Visual Studio 2026
 - Windows 10 1803+ (April 2018 Update or newer)
 - Initialize submodules once: `git submodule update --init --recursive`
 

Cpp.Build.props

@@ -51,7 +51,7 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4679;5271;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4679;4706;4874;5271;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableAnalyzeExternal >true</DisableAnalyzeExternal>
       <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
       <ConformanceMode>false</ConformanceMode>
@@ -110,6 +110,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
     <SpectreMitigation>Spectre</SpectreMitigation>

PowerToys.slnx

@@ -300,6 +300,10 @@
     </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/Tests/">
+    <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Core.Common.UnitTests/Microsoft.CmdPal.Core.Common.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <Project Path="src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/Microsoft.CmdPal.Ext.Apps.UnitTests.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -356,6 +360,10 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
+    <Project Path="src/modules/cmdpal/Tests/Microsoft.CommandPalette.Extensions.Toolkit.UnitTests/Microsoft.CommandPalette.Extensions.Toolkit.UnitTests.csproj" Id="2eca18b7-33b7-4829-88f1-439b20fd60f6">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
   </Folder>
   <Folder Name="/modules/CommandPalette/UI/">
     <Project Path="src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj">

README.md

@@ -51,19 +51,19 @@ But to get started quickly, choose one of the installation methods below:
 Go to the <a href="https://aka.ms/installPowerToys">PowerToys GitHub releases</a>, click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- 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.97%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.0/PowerToysUserSetup-0.97.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.0/PowerToysUserSetup-0.97.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.0/PowerToysSetup-0.97.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.0/PowerToysSetup-0.97.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.98%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysUserSetup-0.97.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysUserSetup-0.97.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysSetup-0.97.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.97.1/PowerToysSetup-0.97.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.97.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.97.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.97.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.97.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.97.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.97.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.97.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.97.1-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -103,18 +103,38 @@ There are <a href="https://learn.microsoft.com/windows/powertoys/install#communi
 </details>
 
 ## ✨ What's new
-**Version 0.97 (January 2026)**
+**Version 0.97.1 (January 2026)**
 
-For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
+This patch release fixes several important stability issues identified in v0.97.0 based on incoming reports. Check out the [v0.97.0](https://github.com/microsoft/PowerToys/releases/tag/v0.97.0) notes for the full list of changes.
 
-**✨ Highlights**
-- **Command Palette**: Major expansion with PowerToys extension (Windows 11 only), Remote Desktop built-in extension, theme customization, drag-and-drop support, fallback ranking controls, sections/separators for pages, pinyin Chinese matching, and many UX refinements.
-- **Settings**: Quick Access flyout is now a standalone process for significantly faster startup, theme-adaptive tray icon, AOT serialization, and multiple UI/accessibility fixes
-- **CursorWrap (New!)**: New mouse utility that lets your cursor wrap around screen edges, making multi-monitor navigation faster and more seamless.
-- **Advanced Paste**: Image input for AI, color detection in clipboard history, Foundry Local improvements, Azure AI icons, and multiple bug fixes
-- **CLI Support Expanded**: FancyZones, Image Resizer, and File Locksmith can now be controlled from the command line for layout management, batch image resizing, and file lock inspection.
-- **LightSwitch**: Added support for automatically following Windows Night Light mode.
-- **Release Experience & Quality**: Refreshed "What’s new" dialog, plus many performance improvements, stability fixes, and refinements across PowerToys.
+**Highlights**
+
+### Advanced Paste
+- #44862: Fixed Settings UI advanced paste page crash by using correct settings repository for null checking.
+
+### Command Palette
+- #44886: Fixed personalization section not appearing by using latest MSIX for installation.
+- #44938: Fixed loading of icons from internet shortcuts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- #45076: Fixed potential deadlock from lazy-loading AppListItem details. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+
+### Cursor Wrap
+- #44936: Added improved multi-monitor support; Added laptop lid close detection for dynamic monitor topology updates. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+- #44936: Added new settings dropdown to constrain wrapping to horizontal-only, vertical-only, or both directions. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+
+### Peek
+- #44995: Fixed Space key triggering Peek during file rename, search, or address bar typing.
+
+### PowerRename
+- #44944: Fixed regex `$` not working, preventing users from adding text at the end of filenames.
+
+### Runner
+- #44931: Monochrome tray icon now adapts to Windows system theme instead of app theme.
+- #44982: Fixed right-click menu to dynamically update based on Quick Access enabled/disabled state.
+
+### GPO / Enterprise
+- #45028: Added CursorWrap policy definition to ADMX templates. Thanks [@htcfreek](https://github.com/htcfreek)!
+
+For the full list of v0.97 changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
 
 ## Advanced Paste
 
@@ -289,7 +309,7 @@ For an in-depth look at the latest changes, visit the [Windows Command Line blog
 - Stabilized FancyZones UI tests with more reliable selectors and screen recordings.
 
 ## 🛣️ Roadmap 
-We are planning some nice new features and improvements for the next releases – PowerDisplay, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.97][github-next-release-work]!
+We are planning some nice new features and improvements for the next releases – PowerDisplay, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.98][github-next-release-work]!
 
 ## ❤️ PowerToys Community 
 The PowerToys team is extremely grateful to have the [support of an amazing active community][community-link]. The work you do is incredibly important. PowerToys wouldn't be nearly what it is today without your help filing bugs, updating documentation, guiding the design, or writing features. We want to say thank you and take time to recognize your work. Your contributions and feedback improve PowerToys month after month!

doc/devdocs/core/installer.md

@@ -88,7 +88,7 @@
 ### Building PowerToys Locally
 
 #### One stop script for building installer
-1. Open developer powershell for vs 2022
+1. Open `Developer Powershell for VS 2022` or `Developer PowerShell for VS` for VS 2026.
 2. Run tools\build\build-installer.ps1
 > For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.
 
@@ -109,7 +109,7 @@ dotnet tool install --global wix --version 5.0.2
 
 ##### From the command line
 
-1. From the start menu, open a `Developer Command Prompt for VS 2022`
+1. From the start menu, open a `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 1. Ensure `nuget.exe` is in your `%path%`
 1. In the repo root, run these commands:
   
@@ -140,7 +140,7 @@ If you prefer, you can alternatively build prerequisite projects for the install
 
 The resulting installer will be available in the `installer\PowerToysSetupVNext\x64\Release\` folder.
 
-To build the installer from the command line, run `Developer Command Prompt for VS 2022` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
+To build the installer from the command line, run `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
 
 ```
 git clean -xfd  -e *exe -- .\installer\

doc/devdocs/development/debugging.md

@@ -15,7 +15,7 @@ Before you can start debugging PowerToys, you need to set up your development en
 
 You can build the entire solution from the command line, which is sometimes faster than building within Visual Studio:
 
-1. Open Developer Command Prompt for VS 2022
+1. Open `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
    ```pwsh
@@ -105,7 +105,7 @@ If you encounter build errors about missing image files (e.g., `.png`, `.ico`, o
 
 1. **Clean the solution in Visual Studio**: Build > Clean Solution
 
-   Or from the command line (Developer Command Prompt for VS 2022):
+   Or from the command line (Developer Command Prompt for VS 2022 or Developer Command Prompt for VS):
    ```pwsh
    msbuild PowerToys.slnx /t:Clean /p:Platform=x64 /p:Configuration=Debug
    ```

doc/devdocs/development/dev-with-vscode.md

@@ -15,9 +15,11 @@ VS Code extensions Needed:
 ---
 
 ## Building in VS Code
-### Configure developer powershell for vs2022 for more convenient dev in vscode.
+### Configure Developer Powershell for VS 2022 or Developer Powershell for VS for more convenient dev in vscode.
 1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
-2. Add below config as entry:
+2. Add below config as entry (choose VS 2022 or VS 2026 based on your installation):
+
+**For Visual Studio 2022:**
 ```json
     "Developer PowerShell for VS 2022": {
 		// Configure based on your preference
@@ -27,16 +29,35 @@ VS Code extensions Needed:
             "-Command",
             "& {",
             "$orig = Get-Location;",
-            // Configure based on your environment
+            // Adjust path based on your edition (Community/Professional/Enterprise)
             "& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
             "Set-Location $orig",
             "}"
         ]
     },
 ```
-3. [Optional] Set Developer PowerShell for VS 2022 as your default profile, so that you can get a deep integration with vscode coding agent. 
 
-4. Now You can build with plain `msbuild` or configure tasks.json in below section
+**For Visual Studio 2026:**
+```json
+    "Developer PowerShell for VS": {
+		// Configure based on your preference
+        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
+        "args": [
+            "-NoExit",
+            "-Command",
+            "& {",
+            "$orig = Get-Location;",
+            // Adjust path based on your edition (Community/Professional/Enterprise)
+            "& 'C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
+            "Set-Location $orig",
+            "}"
+        ]
+    },
+```
+
+3. [Optional] Set your Developer PowerShell profile as the default, so that you can get a deep integration with vscode coding agent. 
+
+4. Now you can build with plain `msbuild` or configure tasks.json in below section.
 Or reach out to "tools\build\BUILD-GUIDELINES.md"
 
 ### Sample plain msbuild command

doc/devdocs/modules/fancyzones.md

@@ -152,7 +152,7 @@ FancyZones is divided into several projects:
 ## Development Environment Setup
 
 ### Prerequisites
-- Visual Studio 2022: Required for building and debugging
+- Visual Studio 2022 or 2026: Required for building and debugging
 - Windows 10 SDK: Ensure the latest version is installed
 - PowerToys Repository: Clone from GitHub
 
@@ -183,7 +183,7 @@ FancyZones is divided into several projects:
 ## Debugging
 
 ### Setup for Debugging
-1. In Visual Studio 2022, set FancyZonesEditor as the startup project
+1. In Visual Studio 2022 or 2026, set FancyZonesEditor as the startup project
 2. Set breakpoints in the code where needed
 3. Click Run to start debugging
 

doc/devdocs/readme.md

@@ -79,7 +79,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 ### Prerequisites for Compiling PowerToys
 
 1. Windows 10 April 2018 Update (version 1803) or newer
-1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer
+1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer, or Visual Studio 2026
 1. A local clone of the PowerToys repository
 1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
 

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -14,13 +14,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\deps\spdlog.props" />

installer/PowerToysSetupVNext/CmdPal.wxs

@@ -18,6 +18,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes" />
         </RegistryKey>
+        <RemoveFile Id="RemoveOldCmdPalMsix" Name="Microsoft.CmdPal.UI_*.msix" On="install" />
         <?if $(sys.BUILDARCH) = x64 ?>
         <File Id="Microsoft.CmdPal.UI___var.CmdPalVersion_._x64.msix" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
         <?else?>

installer/PowerToysSetupVNext/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
     <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
     <BaseIntermediateOutputPath Condition="'$(MSBuildProjectName)' == 'PowerToysInstallerVNext'">obj\Installer\</BaseIntermediateOutputPath>

installer/PowerToysSetupVNext/Resources.wxs

@@ -367,6 +367,12 @@
         </RegistryKey>
         <File Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.BgcodePreviewHandler.resources.dll" />
       </Component>
+      <Component Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" Guid="$(var.CompGUIDPrefix)23">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\Microsoft.CmdPal.Ext.PowerToys.resources.dll" />
+      </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj

@@ -37,14 +37,14 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -68,11 +68,10 @@
     <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
     <ClCompile Include="bafunctions.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="precomp.h" />
+    <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include "precomp.h"
+#include "pch.h"
 #include "BalBaseBAFunctions.h"
 #include "BalBaseBAFunctionsProc.h"
 
@@ -18,7 +18,6 @@ public: // IBootstrapperApplication
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);
 
-    LExit:
         return hr;
     }
 
@@ -37,7 +36,6 @@ public: // IBAFunctions
         // BalExitOnFailure(hr, "Change this message to represent real error handling.");
         //-------------------------------------------------------------------------------------------------
 
-    LExit:
         return hr;
     }
 
@@ -58,7 +56,7 @@ public: // IBAFunctions
         __in DWORD cFiles,
         __in_ecount_z(cFiles) LPCWSTR* rgwzFiles,
         __in int nRecommendation,
-        __in BOOTSTRAPPER_FILES_IN_USE_TYPE source,
+        __in BOOTSTRAPPER_FILES_IN_USE_TYPE /* source */,
         __inout int* pResult
         )
     {

installer/PowerToysSetupVNext/SilentFilesInUseBA/bafunctions.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#include "precomp.h"
+#include "pch.h"
 
 static HINSTANCE vhInstance = NULL;
 

src/ActionRunner/actionRunner.vcxproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>

src/Common.Dotnet.FuzzTest.props

@@ -5,6 +5,6 @@
        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>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>

src/PackageIdentity/PackageIdentity.vcxproj

@@ -55,26 +55,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
 

src/Update/PowerToys.Update.vcxproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="..\..\deps\expected.props" />
   <PropertyGroup>

src/common/COMUtils/COMUtils.vcxproj

@@ -10,7 +10,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -40,7 +40,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/CalculatorEngineCommon/ExprtkEvaluator.cpp

@@ -3,9 +3,27 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
+#include <cmath>
+#include <limits>
 
 namespace ExprtkCalculator::internal
 {
+    static double factorial(const double n)
+    {
+        // Only allow non-negative integers
+        if (n < 0.0 || std::floor(n) != n)
+        {
+            return std::numeric_limits<double>::quiet_NaN();
+        }
+        return std::tgamma(n + 1.0);
+    }
+
+    static double sign(const double n)
+    {
+        if (n > 0.0) return 1.0;
+        if (n < 0.0) return -1.0;
+        return 0.0;
+    }
 
     std::wstring ToWStringFullPrecision(double value)
     {
@@ -25,6 +43,9 @@ namespace ExprtkCalculator::internal
             symbol_table.add_constant(name, value);
         }
 
+        symbol_table.add_function("factorial", factorial);
+        symbol_table.add_function("sign", sign);
+
         exprtk::expression<double> expression;
         expression.register_symbol_table(symbol_table);
 

src/common/Display/Display.vcxproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{CABA8DFB-823B-4BF2-93AC-3F31984150D9}</ProjectGuid>
@@ -10,7 +11,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -39,5 +40,18 @@
     <ClCompile Include="monitors.cpp" />
     <ClCompile Include="dpi_aware.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </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/common/Display/packages.config

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

src/common/GPOWrapper/GPOWrapper.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
     <DesktopCompatible>true</DesktopCompatible>

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -12,7 +12,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -11,7 +11,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/Themes/Themes.vcxproj

@@ -11,7 +11,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/Themes/theme_listener.cpp

@@ -16,13 +16,50 @@ DWORD WINAPI _checkTheme(LPVOID lpParam)
 
 void ThemeListener::AddChangedHandler(THEME_HANDLE handle)
 {
+    std::lock_guard<std::mutex> lock(handlesMutex);
     handles.push_back(handle);
 }
 
 void ThemeListener::DelChangedHandler(THEME_HANDLE handle)
 {
+    std::lock_guard<std::mutex> lock(handlesMutex);
     auto it = std::find(handles.begin(), handles.end(), handle);
-    handles.erase(it);
+    if (it != handles.end())
+    {
+        handles.erase(it);
+    }
+}
+
+void ThemeListener::AddAppThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    appThemeHandles.push_back(handle);
+}
+
+void ThemeListener::DelAppThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    auto it = std::find(appThemeHandles.begin(), appThemeHandles.end(), handle);
+    if (it != appThemeHandles.end())
+    {
+        appThemeHandles.erase(it);
+    }
+}
+
+void ThemeListener::AddSystemThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    systemThemeHandles.push_back(handle);
+}
+
+void ThemeListener::DelSystemThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    auto it = std::find(systemThemeHandles.begin(), systemThemeHandles.end(), handle);
+    if (it != systemThemeHandles.end())
+    {
+        systemThemeHandles.erase(it);
+    }
 }
 
 void ThemeListener::CheckTheme()
@@ -48,13 +85,51 @@ void ThemeListener::CheckTheme()
 
             WaitForSingleObject(hEvent, INFINITE);
 
-            auto _theme = ThemeHelpers::GetAppTheme();
-            if (AppTheme != _theme)
+            auto _appTheme = ThemeHelpers::GetAppTheme();
+            auto _systemTheme = ThemeHelpers::GetSystemTheme();
+            
+            bool appThemeChanged = (AppTheme != _appTheme);
+            bool systemThemeChanged = (SystemTheme != _systemTheme);
+            
+            if (appThemeChanged || systemThemeChanged)
             {
-                AppTheme = _theme;
-                for (int i = 0; i < handles.size(); i++)
+                AppTheme = _appTheme;
+                SystemTheme = _systemTheme;
+                
+                // Copy handlers under lock, then invoke outside lock to avoid deadlock
+                std::vector<THEME_HANDLE> handlesCopy;
+                std::vector<THEME_HANDLE> appThemeHandlesCopy;
+                std::vector<THEME_HANDLE> systemThemeHandlesCopy;
+                
                 {
-                    handles[i]();
+                    std::lock_guard<std::mutex> lock(handlesMutex);
+                    handlesCopy = handles;
+                    if (appThemeChanged)
+                    {
+                        appThemeHandlesCopy = appThemeHandles;
+                    }
+                    if (systemThemeChanged)
+                    {
+                        systemThemeHandlesCopy = systemThemeHandles;
+                    }
+                }
+                
+                // Call generic handlers (backward compatible)
+                for (const auto& handler : handlesCopy)
+                {
+                    handler();
+                }
+                
+                // Call app theme specific handlers
+                for (const auto& handler : appThemeHandlesCopy)
+                {
+                    handler();
+                }
+                
+                // Call system theme specific handlers
+                for (const auto& handler : systemThemeHandlesCopy)
+                {
+                    handler();
                 }
             }
         }

src/common/Themes/theme_listener.h

@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <iostream>
 #include <vector>
+#include <mutex>
 
 typedef void (*THEME_HANDLE)();
 DWORD WINAPI _checkTheme(LPVOID lpParam);
@@ -14,6 +15,7 @@ public:
     ThemeListener()
     {
         AppTheme = ThemeHelpers::GetAppTheme();
+        SystemTheme = ThemeHelpers::GetSystemTheme();
         dwThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)_checkTheme, this, 0, &dwThreadId);
     }
     ~ThemeListener()
@@ -23,12 +25,20 @@ public:
     }
 
     Theme AppTheme;
+    Theme SystemTheme;
     void ThemeListener::AddChangedHandler(THEME_HANDLE handle);
     void ThemeListener::DelChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::AddAppThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::DelAppThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::AddSystemThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::DelSystemThemeChangedHandler(THEME_HANDLE handle);
     void CheckTheme();
 
 private:
     HANDLE dwThreadHandle;
     DWORD dwThreadId;
     std::vector<THEME_HANDLE> handles;
+    std::vector<THEME_HANDLE> appThemeHandles;
+    std::vector<THEME_HANDLE> systemThemeHandles;
+    mutable std::mutex handlesMutex;
 };

src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\tests\UnitTestsCommonLib\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/common/interop/PowerToys.Interop.vcxproj

@@ -41,7 +41,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/interop/shared_constants.h

@@ -72,6 +72,10 @@ namespace CommonSharedConstants
 
     const wchar_t ALWAYS_ON_TOP_TERMINATE_EVENT[] = L"Local\\AlwaysOnTopTerminateEvent-cfdf1eae-791f-4953-8021-2f18f3837eae";
 
+    const wchar_t ALWAYS_ON_TOP_INCREASE_OPACITY_EVENT[] = L"Local\\AlwaysOnTopIncreaseOpacityEvent-a1b2c3d4-e5f6-7890-abcd-ef1234567890";
+
+    const wchar_t ALWAYS_ON_TOP_DECREASE_OPACITY_EVENT[] = L"Local\\AlwaysOnTopDecreaseOpacityEvent-b2c3d4e5-f6a7-8901-bcde-f12345678901";
+
     // Path to the event used by PowerAccent
     const wchar_t POWERACCENT_EXIT_EVENT[] = L"Local\\PowerToysPowerAccentExitEvent-53e93389-d19a-4fbb-9b36-1981c8965e17";
 

src/common/logger/logger.vcxproj

@@ -36,7 +36,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -18,7 +18,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj

@@ -10,7 +10,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/notifications/notifications.vcxproj

@@ -11,7 +11,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/common/updating/updating.vcxproj

@@ -12,7 +12,7 @@
   <Import Project="..\..\..\deps\expected.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="..\..\..\deps\spdlog.props" />

src/common/utils/package.h

@@ -2,6 +2,7 @@
 
 #include <Windows.h>
 
+#include <algorithm>
 #include <appxpackaging.h>
 #include <exception>
 #include <filesystem>
@@ -337,6 +338,30 @@ namespace package
                     }
                 }
             }
+
+            // Sort by package version in descending order (newest first)
+            std::sort(matchedFiles.begin(), matchedFiles.end(), [](const std::wstring& a, const std::wstring& b) {
+                std::wstring nameA, nameB;
+                PACKAGE_VERSION versionA{}, versionB{};
+
+                bool gotA = GetPackageNameAndVersionFromAppx(a, nameA, versionA);
+                bool gotB = GetPackageNameAndVersionFromAppx(b, nameB, versionB);
+
+                // Files that failed to parse go to the end
+                if (!gotA)
+                    return false;
+                if (!gotB)
+                    return true;
+
+                // Compare versions: Major, Minor, Build, Revision (descending)
+                if (versionA.Major != versionB.Major)
+                    return versionA.Major > versionB.Major;
+                if (versionA.Minor != versionB.Minor)
+                    return versionA.Minor > versionB.Minor;
+                if (versionA.Build != versionB.Build)
+                    return versionA.Build > versionB.Build;
+                return versionA.Revision > versionB.Revision;
+            });
         }
         catch (const std::exception& ex)
         {

src/common/version/version.vcxproj

@@ -47,7 +47,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/gpo/assets/PowerToys.admx

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
   </policyNamespaces>
-  <resources minRequiredRevision="1.18"/><!-- Last changed with PowerToys v0.96.0 -->
+  <resources minRequiredRevision="1.19"/><!-- Last changed with PowerToys v0.97.0 -->
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -27,6 +27,7 @@
       <definition name="SUPPORTED_POWERTOYS_0_89_0" displayName="$(string.SUPPORTED_POWERTOYS_0_89_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_90_0" displayName="$(string.SUPPORTED_POWERTOYS_0_90_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_96_0" displayName="$(string.SUPPORTED_POWERTOYS_0_96_0)"/>
+      <definition name="SUPPORTED_POWERTOYS_0_97_0" displayName="$(string.SUPPORTED_POWERTOYS_0_97_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1)"/>
     </definitions>
   </supportedOn>
@@ -338,6 +339,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="ConfigureEnabledUtilityCursorWrap" class="Both" displayName="$(string.ConfigureEnabledUtilityCursorWrap)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityCursorWrap">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_97_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="ConfigureEnabledUtilityFindMyMouse" class="Both" displayName="$(string.ConfigureEnabledUtilityFindMyMouse)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityFindMyMouse">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_64_0" />

src/gpo/assets/en-US/PowerToys.adml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>
@@ -34,6 +34,7 @@
       <string id="SUPPORTED_POWERTOYS_0_89_0">PowerToys version 0.89.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_90_0">PowerToys version 0.90.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_96_0">PowerToys version 0.96.0 or later</string>
+      <string id="SUPPORTED_POWERTOYS_0_97_0">PowerToys version 0.97.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1">From PowerToys version 0.64.0 until PowerToys version 0.87.1</string>
 
       <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@@ -266,6 +267,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityKeyboardManager">Keyboard Manager: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFindMyMouse">Find My Mouse: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseHighlighter">Mouse Highlighter: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityCursorWrap">CursorWrap: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseJump">Mouse Jump: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMousePointerCrosshairs">Mouse Pointer Crosshairs: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseWithoutBorders">Mouse Without Borders: Configure enabled state</string>

src/logging/logging.vcxproj

@@ -36,7 +36,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <OutDir>..\..\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -34,10 +34,6 @@
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj

@@ -15,13 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj

@@ -14,13 +14,11 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLIUnitTests.vcxproj

@@ -11,7 +11,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="..\..\..\..\..\deps\spdlog.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj

@@ -20,13 +20,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj

@@ -16,13 +16,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj

@@ -32,7 +32,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>

src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj

@@ -15,13 +15,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/LightSwitch/LightSwitchLib/LightSwitchLib.vcxproj

@@ -31,26 +31,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -31,13 +31,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj

@@ -13,13 +13,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -84,14 +84,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="CursorWrapCore.h" />
     <ClInclude Include="CursorWrapTests.h" />
+    <ClInclude Include="MonitorTopology.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="trace.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="CursorWrapCore.cpp" />
     <ClCompile Include="dllmain.cpp" />
-
+    <ClCompile Include="MonitorTopology.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>

src/modules/MouseUtils/CursorWrap/CursorWrapCore.cpp

@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#include "pch.h"
+#include "CursorWrapCore.h"
+#include "../../../common/logger/logger.h"
+#include <sstream>
+#include <iomanip>
+#include <ctime>
+
+CursorWrapCore::CursorWrapCore()
+{
+}
+
+#ifdef _DEBUG
+std::wstring CursorWrapCore::GenerateTopologyJSON() const
+{
+    std::wostringstream json;
+
+    // Get current time
+    auto now = std::time(nullptr);
+    std::tm tm{};
+    localtime_s(&tm, &now);
+
+    wchar_t computerName[MAX_COMPUTERNAME_LENGTH + 1] = {0};
+    DWORD size = MAX_COMPUTERNAME_LENGTH + 1;
+    GetComputerNameW(computerName, &size);
+
+    wchar_t userName[256] = {0};
+    size = 256;
+    GetUserNameW(userName, &size);
+
+    json << L"{\n";
+    json << L"  \"captured_at\": \"" << std::put_time(&tm, L"%Y-%m-%dT%H:%M:%S%z") << L"\",\n";
+    json << L"  \"computer_name\": \"" << computerName << L"\",\n";
+    json << L"  \"user_name\": \"" << userName << L"\",\n";
+    json << L"  \"monitor_count\": " << m_monitors.size() << L",\n";
+    json << L"  \"monitors\": [\n";
+
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        const auto& monitor = m_monitors[i];
+
+        // Get DPI for this monitor
+        UINT dpiX = 96, dpiY = 96;
+        POINT center = {
+            (monitor.rect.left + monitor.rect.right) / 2,
+            (monitor.rect.top + monitor.rect.bottom) / 2
+        };
+        HMONITOR hMon = MonitorFromPoint(center, MONITOR_DEFAULTTONEAREST);
+        if (hMon)
+        {
+            // Try GetDpiForMonitor (requires linking Shcore.lib)
+            using GetDpiForMonitorFunc = HRESULT (WINAPI *)(HMONITOR, int, UINT*, UINT*);
+            HMODULE shcore = LoadLibraryW(L"Shcore.dll");
+            if (shcore)
+            {
+                auto getDpi = reinterpret_cast<GetDpiForMonitorFunc>(GetProcAddress(shcore, "GetDpiForMonitor"));
+                if (getDpi)
+                {
+                    getDpi(hMon, 0, &dpiX, &dpiY); // MDT_EFFECTIVE_DPI = 0
+                }
+                FreeLibrary(shcore);
+            }
+        }
+
+        int scalingPercent = static_cast<int>((dpiX / 96.0) * 100);
+
+        json << L"    {\n";
+        json << L"      \"left\": " << monitor.rect.left << L",\n";
+        json << L"      \"top\": " << monitor.rect.top << L",\n";
+        json << L"      \"right\": " << monitor.rect.right << L",\n";
+        json << L"      \"bottom\": " << monitor.rect.bottom << L",\n";
+        json << L"      \"width\": " << (monitor.rect.right - monitor.rect.left) << L",\n";
+        json << L"      \"height\": " << (monitor.rect.bottom - monitor.rect.top) << L",\n";
+        json << L"      \"dpi\": " << dpiX << L",\n";
+        json << L"      \"scaling_percent\": " << scalingPercent << L",\n";
+        json << L"      \"primary\": " << (monitor.isPrimary ? L"true" : L"false") << L",\n";
+        json << L"      \"monitor_id\": " << monitor.monitorId << L"\n";
+        json << L"    }";
+        if (i < m_monitors.size() - 1)
+        {
+            json << L",";
+        }
+        json << L"\n";
+    }
+
+    json << L"  ]\n";
+    json << L"}";
+
+    return json.str();
+}
+#endif
+
+void CursorWrapCore::UpdateMonitorInfo()
+{
+    size_t previousMonitorCount = m_monitors.size();
+    Logger::info(L"======= UPDATE MONITOR INFO START =======");
+    Logger::info(L"Previous monitor count: {}", previousMonitorCount);
+
+    m_monitors.clear();
+
+    EnumDisplayMonitors(nullptr, nullptr, [](HMONITOR hMonitor, HDC, LPRECT, LPARAM lParam) -> BOOL {
+        auto* self = reinterpret_cast<CursorWrapCore*>(lParam);
+
+        MONITORINFO mi{};
+        mi.cbSize = sizeof(MONITORINFO);
+        if (GetMonitorInfo(hMonitor, &mi))
+        {
+            MonitorInfo info{};
+            info.hMonitor = hMonitor; // Store handle for direct comparison later
+            info.rect = mi.rcMonitor;
+            info.isPrimary = (mi.dwFlags & MONITORINFOF_PRIMARY) != 0;
+            info.monitorId = static_cast<int>(self->m_monitors.size());
+            self->m_monitors.push_back(info);
+            
+            Logger::info(L"Enumerated monitor {}: hMonitor={}, rect=({},{},{},{}), primary={}",
+                info.monitorId, reinterpret_cast<uintptr_t>(hMonitor),
+                mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
+                info.isPrimary ? L"yes" : L"no");
+        }
+
+        return TRUE;
+    }, reinterpret_cast<LPARAM>(this));
+
+    if (previousMonitorCount != m_monitors.size())
+    {
+        Logger::info(L"*** MONITOR CONFIGURATION CHANGED: {} -> {} monitors ***", 
+            previousMonitorCount, m_monitors.size());
+    }
+
+    m_topology.Initialize(m_monitors);
+
+    // Log monitor configuration summary
+    Logger::info(L"Monitor configuration updated: {} monitor(s)", m_monitors.size());
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        const auto& m = m_monitors[i];
+        int width = m.rect.right - m.rect.left;
+        int height = m.rect.bottom - m.rect.top;
+        Logger::info(L"  Monitor {}: {}x{} at ({}, {}){}",
+            i, width, height, m.rect.left, m.rect.top,
+            m.isPrimary ? L" [PRIMARY]" : L"");
+    }
+    Logger::info(L"  Detected {} outer edges for cursor wrapping", m_topology.GetOuterEdges().size());
+
+    // Detect and log monitor gaps
+    auto gaps = m_topology.DetectMonitorGaps();
+    if (!gaps.empty())
+    {
+        Logger::warn(L"Monitor configuration has coordinate gaps that may prevent wrapping:");
+        for (const auto& gap : gaps)
+        {
+            Logger::warn(L"  Gap between Monitor {} and Monitor {}: {}px horizontal gap, {}px vertical overlap",
+                gap.monitor1Index, gap.monitor2Index, gap.horizontalGap, gap.verticalOverlap);
+        }
+        Logger::warn(L"  If monitors appear snapped in Display Settings but show gaps here:");
+        Logger::warn(L"  1. Try dragging monitors apart and snapping them back together");
+        Logger::warn(L"  2. Update your GPU drivers");
+    }
+
+    Logger::info(L"======= UPDATE MONITOR INFO END =======");
+}
+
+POINT CursorWrapCore::HandleMouseMove(const POINT& currentPos, bool disableWrapDuringDrag, int wrapMode)
+{
+    // Check if wrapping should be disabled during drag
+    if (disableWrapDuringDrag && (GetAsyncKeyState(VK_LBUTTON) & 0x8000))
+    {
+#ifdef _DEBUG
+        OutputDebugStringW(L"[CursorWrap] [DRAG] Left mouse button down - skipping wrap\n");
+#endif
+        return currentPos;
+    }
+
+    // Convert int wrapMode to WrapMode enum
+    WrapMode mode = static_cast<WrapMode>(wrapMode);
+
+#ifdef _DEBUG
+    {
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [MOVE] Cursor at (" << currentPos.x << L", " << currentPos.y << L")";
+
+        // Get current monitor and identify which one
+        HMONITOR currentMonitor = MonitorFromPoint(currentPos, MONITOR_DEFAULTTONEAREST);
+        RECT monitorRect;
+        if (m_topology.GetMonitorRect(currentMonitor, monitorRect))
+        {
+            // Find monitor ID
+            int monitorId = -1;
+            for (const auto& monitor : m_monitors)
+            {
+                if (monitor.rect.left == monitorRect.left &&
+                    monitor.rect.top == monitorRect.top &&
+                    monitor.rect.right == monitorRect.right &&
+                    monitor.rect.bottom == monitorRect.bottom)
+                {
+                    monitorId = monitor.monitorId;
+                    break;
+                }
+            }
+            oss << L" on Monitor " << monitorId << L" [" << monitorRect.left << L".." << monitorRect.right
+                << L", " << monitorRect.top << L".." << monitorRect.bottom << L"]";
+        }
+        else
+        {
+            oss << L" (beyond monitor bounds)";
+        }
+        oss << L"\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+#endif
+
+    // Get current monitor
+    HMONITOR currentMonitor = MonitorFromPoint(currentPos, MONITOR_DEFAULTTONEAREST);
+
+    // Check if cursor is on an outer edge (filtered by wrap mode)
+    EdgeType edgeType;
+    if (!m_topology.IsOnOuterEdge(currentMonitor, currentPos, edgeType, mode))
+    {
+#ifdef _DEBUG
+        static bool lastWasNotOuter = false;
+        if (!lastWasNotOuter)
+        {
+            OutputDebugStringW(L"[CursorWrap] [MOVE] Not on outer edge - no wrapping\n");
+            lastWasNotOuter = true;
+        }
+#endif
+        return currentPos; // Not on an outer edge
+    }
+
+#ifdef _DEBUG
+    {
+        const wchar_t* edgeStr = L"Unknown";
+        switch (edgeType)
+        {
+        case EdgeType::Left: edgeStr = L"Left"; break;
+        case EdgeType::Right: edgeStr = L"Right"; break;
+        case EdgeType::Top: edgeStr = L"Top"; break;
+        case EdgeType::Bottom: edgeStr = L"Bottom"; break;
+        }
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [EDGE] Detected outer " << edgeStr << L" edge at (" << currentPos.x << L", " << currentPos.y << L")\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+#endif
+
+    // Calculate wrap destination
+    POINT newPos = m_topology.GetWrapDestination(currentMonitor, currentPos, edgeType);
+
+#ifdef _DEBUG
+    if (newPos.x != currentPos.x || newPos.y != currentPos.y)
+    {
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [WRAP] Position change: (" << currentPos.x << L", " << currentPos.y
+            << L") -> (" << newPos.x << L", " << newPos.y << L")\n";
+        oss << L"[CursorWrap] [WRAP] Delta: (" << (newPos.x - currentPos.x) << L", " << (newPos.y - currentPos.y) << L")\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+    else
+    {
+        OutputDebugStringW(L"[CursorWrap] [WRAP] No position change (same-monitor wrap?)\n");
+    }
+#endif
+
+    return newPos;
+}

src/modules/MouseUtils/CursorWrap/CursorWrapCore.h

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#pragma once
+#include <windows.h>
+#include <vector>
+#include <string>
+#include "MonitorTopology.h"
+
+// Core cursor wrapping engine
+class CursorWrapCore
+{
+public:
+    CursorWrapCore();
+
+    void UpdateMonitorInfo();
+    
+    // Handle mouse move with wrap mode filtering
+    // wrapMode: 0=Both, 1=VerticalOnly, 2=HorizontalOnly
+    POINT HandleMouseMove(const POINT& currentPos, bool disableWrapDuringDrag, int wrapMode);
+
+    const std::vector<MonitorInfo>& GetMonitors() const { return m_monitors; }
+    const MonitorTopology& GetTopology() const { return m_topology; }
+
+private:
+#ifdef _DEBUG
+    std::wstring GenerateTopologyJSON() const;
+#endif
+
+    std::vector<MonitorInfo> m_monitors;
+    MonitorTopology m_topology;
+};

src/modules/MouseUtils/CursorWrap/MonitorTopology.cpp

@@ -0,0 +1,546 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#include "pch.h"
+#include "MonitorTopology.h"
+#include "../../../common/logger/logger.h"
+#include <algorithm>
+#include <cmath>
+
+void MonitorTopology::Initialize(const std::vector<MonitorInfo>& monitors)
+{
+    Logger::info(L"======= TOPOLOGY INITIALIZATION START =======");
+    Logger::info(L"Initializing edge-based topology for {} monitors", monitors.size());
+
+    m_monitors = monitors;
+    m_outerEdges.clear();
+    m_edgeMap.clear();
+
+    if (monitors.empty())
+    {
+        Logger::warn(L"No monitors provided to Initialize");
+        return;
+    }
+
+    // Log monitor details
+    for (size_t i = 0; i < monitors.size(); ++i)
+    {
+        const auto& m = monitors[i];
+        Logger::info(L"Monitor {}: hMonitor={}, rect=({},{},{},{}), primary={}",
+            i, reinterpret_cast<uintptr_t>(m.hMonitor),
+            m.rect.left, m.rect.top, m.rect.right, m.rect.bottom,
+            m.isPrimary ? L"yes" : L"no");
+    }
+
+    BuildEdgeMap();
+    IdentifyOuterEdges();
+
+    Logger::info(L"Found {} outer edges", m_outerEdges.size());
+    for (const auto& edge : m_outerEdges)
+    {
+        const wchar_t* typeStr = L"Unknown";
+        switch (edge.type)
+        {
+        case EdgeType::Left: typeStr = L"Left"; break;
+        case EdgeType::Right: typeStr = L"Right"; break;
+        case EdgeType::Top: typeStr = L"Top"; break;
+        case EdgeType::Bottom: typeStr = L"Bottom"; break;
+        }
+        Logger::info(L"Outer edge: Monitor {} {} at position {}, range [{}, {}]",
+            edge.monitorIndex, typeStr, edge.position, edge.start, edge.end);
+    }
+    Logger::info(L"======= TOPOLOGY INITIALIZATION COMPLETE =======");
+}
+
+void MonitorTopology::BuildEdgeMap()
+{
+    // Create edges for each monitor using monitor index (not HMONITOR)
+    // This is important because HMONITOR handles can change when monitors are
+    // added/removed dynamically, but indices remain stable within a single
+    // topology configuration
+    for (size_t idx = 0; idx < m_monitors.size(); ++idx)
+    {
+        const auto& monitor = m_monitors[idx];
+        int monitorIndex = static_cast<int>(idx);
+
+        // Left edge
+        MonitorEdge leftEdge;
+        leftEdge.monitorIndex = monitorIndex;
+        leftEdge.type = EdgeType::Left;
+        leftEdge.position = monitor.rect.left;
+        leftEdge.start = monitor.rect.top;
+        leftEdge.end = monitor.rect.bottom;
+        leftEdge.isOuter = true; // Will be updated in IdentifyOuterEdges
+        m_edgeMap[{monitorIndex, EdgeType::Left}] = leftEdge;
+      
+        // Right edge
+        MonitorEdge rightEdge;
+        rightEdge.monitorIndex = monitorIndex;
+        rightEdge.type = EdgeType::Right;
+        rightEdge.position = monitor.rect.right - 1;
+        rightEdge.start = monitor.rect.top;
+        rightEdge.end = monitor.rect.bottom;
+        rightEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Right}] = rightEdge;
+
+        // Top edge
+        MonitorEdge topEdge;
+        topEdge.monitorIndex = monitorIndex;
+        topEdge.type = EdgeType::Top;
+        topEdge.position = monitor.rect.top;
+        topEdge.start = monitor.rect.left;
+        topEdge.end = monitor.rect.right;
+        topEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Top}] = topEdge;
+
+        // Bottom edge
+        MonitorEdge bottomEdge;
+        bottomEdge.monitorIndex = monitorIndex;
+        bottomEdge.type = EdgeType::Bottom;
+        bottomEdge.position = monitor.rect.bottom - 1;
+        bottomEdge.start = monitor.rect.left;
+        bottomEdge.end = monitor.rect.right;
+        bottomEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Bottom}] = bottomEdge;
+    }
+}
+
+void MonitorTopology::IdentifyOuterEdges()
+{
+    const int tolerance = 50;
+    
+    // Check each edge against all other edges to find adjacent ones
+    for (auto& [key1, edge1] : m_edgeMap)
+    {
+        for (const auto& [key2, edge2] : m_edgeMap)
+        {
+            if (edge1.monitorIndex == edge2.monitorIndex)
+            {
+                continue; // Same monitor
+            }
+
+            // Check if edges are adjacent
+            if (EdgesAreAdjacent(edge1, edge2, tolerance))
+            {
+                edge1.isOuter = false;
+                break; // This edge has an adjacent monitor
+            }
+        }
+
+        if (edge1.isOuter)
+        {
+            m_outerEdges.push_back(edge1);
+        }
+    }
+}
+
+bool MonitorTopology::EdgesAreAdjacent(const MonitorEdge& edge1, const MonitorEdge& edge2, int tolerance) const
+{
+    // Edges must be opposite types to be adjacent
+    bool oppositeTypes = false;
+
+    if ((edge1.type == EdgeType::Left && edge2.type == EdgeType::Right) ||
+        (edge1.type == EdgeType::Right && edge2.type == EdgeType::Left) ||
+        (edge1.type == EdgeType::Top && edge2.type == EdgeType::Bottom) ||
+        (edge1.type == EdgeType::Bottom && edge2.type == EdgeType::Top))
+    {
+        oppositeTypes = true;
+    }
+
+    if (!oppositeTypes)
+    {
+        return false;
+    }
+
+    // Check if positions are within tolerance
+    if (abs(edge1.position - edge2.position) > tolerance)
+    {
+        return false;
+    }
+
+    // Check if perpendicular ranges overlap
+    int overlapStart = max(edge1.start, edge2.start);
+    int overlapEnd = min(edge1.end, edge2.end);
+
+    return overlapEnd > overlapStart + tolerance;
+}
+
+bool MonitorTopology::IsOnOuterEdge(HMONITOR monitor, const POINT& cursorPos, EdgeType& outEdgeType, WrapMode wrapMode) const
+{
+    RECT monitorRect;
+    if (!GetMonitorRect(monitor, monitorRect))
+    {
+        Logger::warn(L"IsOnOuterEdge: GetMonitorRect failed for monitor handle {}", reinterpret_cast<uintptr_t>(monitor));
+        return false;
+    }
+
+    // Get monitor index for edge map lookup
+    int monitorIndex = GetMonitorIndex(monitor);
+    if (monitorIndex < 0)
+    {
+        Logger::warn(L"IsOnOuterEdge: Monitor index not found for handle {} at cursor ({}, {})", 
+            reinterpret_cast<uintptr_t>(monitor), cursorPos.x, cursorPos.y);
+        return false; // Monitor not found in our list
+    }
+
+    // Check each edge type
+    const int edgeThreshold = 1;
+
+    // At corners, multiple edges may match - collect all candidates and try each
+    // to find one with a valid wrap destination
+    std::vector<EdgeType> candidateEdges;
+
+    // Left edge - only if mode allows horizontal wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::HorizontalOnly) &&
+        cursorPos.x <= monitorRect.left + edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Left});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Left);
+        }
+    }
+
+    // Right edge - only if mode allows horizontal wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::HorizontalOnly) &&
+        cursorPos.x >= monitorRect.right - 1 - edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Right});
+        if (it != m_edgeMap.end())
+        {
+            if (it->second.isOuter)
+            {
+                candidateEdges.push_back(EdgeType::Right);
+            }
+            // Debug: Log why right edge isn't outer
+            else
+            {
+                Logger::trace(L"IsOnOuterEdge: Monitor {} right edge is NOT outer (inner edge)", monitorIndex);
+            }
+        }
+    }
+
+    // Top edge - only if mode allows vertical wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::VerticalOnly) &&
+        cursorPos.y <= monitorRect.top + edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Top});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Top);
+        }
+    }
+
+    // Bottom edge - only if mode allows vertical wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::VerticalOnly) &&
+        cursorPos.y >= monitorRect.bottom - 1 - edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Bottom});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Bottom);
+        }
+    }
+
+    if (candidateEdges.empty())
+    {
+        return false;
+    }
+
+    // Try each candidate edge and return first with valid wrap destination
+    for (EdgeType candidate : candidateEdges)
+    {
+        MonitorEdge oppositeEdge = FindOppositeOuterEdge(candidate,
+            (candidate == EdgeType::Left || candidate == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+        if (oppositeEdge.monitorIndex >= 0)
+        {
+            outEdgeType = candidate;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+POINT MonitorTopology::GetWrapDestination(HMONITOR fromMonitor, const POINT& cursorPos, EdgeType edgeType) const
+{
+    // Get monitor index for edge map lookup
+    int monitorIndex = GetMonitorIndex(fromMonitor);
+    if (monitorIndex < 0)
+    {
+        return cursorPos; // Monitor not found
+    }
+
+    auto it = m_edgeMap.find({monitorIndex, edgeType});
+    if (it == m_edgeMap.end())
+    {
+        return cursorPos; // Edge not found
+    }
+
+    const MonitorEdge& fromEdge = it->second;
+
+    // Calculate relative position on current edge (0.0 to 1.0)
+    double relativePos = GetRelativePosition(fromEdge,
+        (edgeType == EdgeType::Left || edgeType == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+    // Find opposite outer edge
+    MonitorEdge oppositeEdge = FindOppositeOuterEdge(edgeType,
+        (edgeType == EdgeType::Left || edgeType == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+    if (oppositeEdge.monitorIndex < 0)
+    {
+        // No opposite edge found, wrap within same monitor
+        RECT monitorRect;
+        if (GetMonitorRect(fromMonitor, monitorRect))
+        {
+            POINT result = cursorPos;
+            switch (edgeType)
+            {
+            case EdgeType::Left:
+                result.x = monitorRect.right - 2;
+                break;
+            case EdgeType::Right:
+                result.x = monitorRect.left + 1;
+                break;
+            case EdgeType::Top:
+                result.y = monitorRect.bottom - 2;
+                break;
+            case EdgeType::Bottom:
+                result.y = monitorRect.top + 1;
+                break;
+            }
+            return result;
+        }
+        return cursorPos;
+    }
+
+    // Calculate target position on opposite edge
+    POINT result;
+
+    if (edgeType == EdgeType::Left || edgeType == EdgeType::Right)
+    {
+        // Horizontal edge -> vertical movement
+        result.x = oppositeEdge.position;
+        result.y = GetAbsolutePosition(oppositeEdge, relativePos);
+    }
+    else
+    {
+        // Vertical edge -> horizontal movement
+        result.y = oppositeEdge.position;
+        result.x = GetAbsolutePosition(oppositeEdge, relativePos);
+    }
+
+    return result;
+}
+
+MonitorEdge MonitorTopology::FindOppositeOuterEdge(EdgeType fromEdge, int relativePosition) const
+{
+    EdgeType targetType;
+    bool findMax; // true = find max position, false = find min position
+
+    switch (fromEdge)
+    {
+    case EdgeType::Left:
+        targetType = EdgeType::Right;
+        findMax = true;
+        break;
+    case EdgeType::Right:
+        targetType = EdgeType::Left;
+        findMax = false;
+        break;
+    case EdgeType::Top:
+        targetType = EdgeType::Bottom;
+        findMax = true;
+        break;
+    case EdgeType::Bottom:
+        targetType = EdgeType::Top;
+        findMax = false;
+        break;
+    default:
+        return { .monitorIndex = -1 }; // Invalid edge type
+    }
+
+    MonitorEdge result = { .monitorIndex = -1 }; // -1 indicates not found
+    int extremePosition = findMax ? INT_MIN : INT_MAX;
+
+    for (const auto& edge : m_outerEdges)
+    {
+        if (edge.type != targetType)
+        {
+            continue;
+        }
+
+        // Check if this edge overlaps with the relative position
+        if (relativePosition >= edge.start && relativePosition <= edge.end)
+        {
+            if ((findMax && edge.position > extremePosition) ||
+                (!findMax && edge.position < extremePosition))
+            {
+                extremePosition = edge.position;
+                result = edge;
+            }
+        }
+    }
+
+    return result;
+}
+
+double MonitorTopology::GetRelativePosition(const MonitorEdge& edge, int coordinate) const
+{
+    if (edge.end == edge.start)
+    {
+        return 0.5; // Avoid division by zero
+    }
+
+    int clamped = max(edge.start, min(coordinate, edge.end));
+    // Use int64_t to avoid overflow warning C26451
+    int64_t numerator = static_cast<int64_t>(clamped) - static_cast<int64_t>(edge.start);
+    int64_t denominator = static_cast<int64_t>(edge.end) - static_cast<int64_t>(edge.start);
+    return static_cast<double>(numerator) / static_cast<double>(denominator);
+}
+
+int MonitorTopology::GetAbsolutePosition(const MonitorEdge& edge, double relativePosition) const
+{
+    // Use int64_t to prevent arithmetic overflow during subtraction and multiplication
+    int64_t range = static_cast<int64_t>(edge.end) - static_cast<int64_t>(edge.start);
+    int64_t offset = static_cast<int64_t>(relativePosition * static_cast<double>(range));
+    // Clamp result to int range before returning
+    int64_t result = static_cast<int64_t>(edge.start) + offset;
+    return static_cast<int>(result);
+}
+
+std::vector<MonitorTopology::GapInfo> MonitorTopology::DetectMonitorGaps() const
+{
+    std::vector<GapInfo> gaps;
+    const int gapThreshold = 50; // Same as ADJACENCY_TOLERANCE
+
+    // Check each pair of monitors
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        for (size_t j = i + 1; j < m_monitors.size(); ++j)
+        {
+            const auto& m1 = m_monitors[i];
+            const auto& m2 = m_monitors[j];
+
+            // Check vertical overlap
+            int vOverlapStart = max(m1.rect.top, m2.rect.top);
+            int vOverlapEnd = min(m1.rect.bottom, m2.rect.bottom);
+            int vOverlap = vOverlapEnd - vOverlapStart;
+
+            if (vOverlap <= 0)
+            {
+                continue; // No vertical overlap, skip
+            }
+
+            // Check horizontal gap
+            int hGap = min(abs(m1.rect.right - m2.rect.left), abs(m2.rect.right - m1.rect.left));
+
+            if (hGap > gapThreshold)
+            {
+                GapInfo gap;
+                gap.monitor1Index = static_cast<int>(i);
+                gap.monitor2Index = static_cast<int>(j);
+                gap.horizontalGap = hGap;
+                gap.verticalOverlap = vOverlap;
+                gaps.push_back(gap);
+            }
+        }
+    }
+
+    return gaps;
+}
+
+HMONITOR MonitorTopology::GetMonitorFromPoint(const POINT& pt) const
+{
+    return MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);
+}
+
+bool MonitorTopology::GetMonitorRect(HMONITOR monitor, RECT& rect) const
+{
+    // First try direct HMONITOR comparison
+    for (const auto& monitorInfo : m_monitors)
+    {
+        if (monitorInfo.hMonitor == monitor)
+        {
+            rect = monitorInfo.rect;
+            return true;
+        }
+    }
+
+    // Fallback: If direct comparison fails, try matching by current monitor info
+    MONITORINFO mi{};
+    mi.cbSize = sizeof(MONITORINFO);
+    if (GetMonitorInfo(monitor, &mi))
+    {
+        for (const auto& monitorInfo : m_monitors)
+        {
+            if (monitorInfo.rect.left == mi.rcMonitor.left &&
+                monitorInfo.rect.top == mi.rcMonitor.top &&
+                monitorInfo.rect.right == mi.rcMonitor.right &&
+                monitorInfo.rect.bottom == mi.rcMonitor.bottom)
+            {
+                rect = monitorInfo.rect;
+                return true;
+            }
+        }
+    }
+    
+    return false;
+}
+
+HMONITOR MonitorTopology::GetMonitorFromRect(const RECT& rect) const
+{
+    return MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST);
+}
+
+int MonitorTopology::GetMonitorIndex(HMONITOR monitor) const
+{
+    // First try direct HMONITOR comparison (fast and accurate)
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        if (m_monitors[i].hMonitor == monitor)
+        {
+            return static_cast<int>(i);
+        }
+    }
+
+    // Fallback: If direct comparison fails (e.g., handle changed after display reconfiguration),
+    // try matching by position. Get the monitor's current rect and find matching stored rect.
+    MONITORINFO mi{};
+    mi.cbSize = sizeof(MONITORINFO);
+    if (GetMonitorInfo(monitor, &mi))
+    {
+        for (size_t i = 0; i < m_monitors.size(); ++i)
+        {
+            // Match by rect bounds
+            if (m_monitors[i].rect.left == mi.rcMonitor.left &&
+                m_monitors[i].rect.top == mi.rcMonitor.top &&
+                m_monitors[i].rect.right == mi.rcMonitor.right &&
+                m_monitors[i].rect.bottom == mi.rcMonitor.bottom)
+            {
+                Logger::trace(L"GetMonitorIndex: Found monitor {} via rect fallback (handle changed from {} to {})", 
+                    i, reinterpret_cast<uintptr_t>(m_monitors[i].hMonitor), reinterpret_cast<uintptr_t>(monitor));
+                return static_cast<int>(i);
+            }
+        }
+        
+        // Log all stored monitors vs the requested one for debugging
+        Logger::warn(L"GetMonitorIndex: No match found. Requested monitor rect=({},{},{},{})",
+            mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom);
+        for (size_t i = 0; i < m_monitors.size(); ++i)
+        {
+            Logger::warn(L"  Stored monitor {}: rect=({},{},{},{})",
+                i, m_monitors[i].rect.left, m_monitors[i].rect.top, 
+                m_monitors[i].rect.right, m_monitors[i].rect.bottom);
+        }
+    }
+    else
+    {
+        Logger::warn(L"GetMonitorIndex: GetMonitorInfo failed for handle {}", reinterpret_cast<uintptr_t>(monitor));
+    }
+
+    return -1; // Not found
+}
+

src/modules/MouseUtils/CursorWrap/MonitorTopology.h

@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#pragma once
+#include <windows.h>
+#include <vector>
+#include <map>
+
+// Monitor information structure
+struct MonitorInfo
+{
+    HMONITOR hMonitor; // Direct handle for accurate lookup after display changes
+    RECT rect;
+    bool isPrimary;
+    int monitorId;
+};
+
+// Edge type enumeration
+enum class EdgeType
+{
+    Left = 0,
+    Right = 1,
+    Top = 2,
+    Bottom = 3
+};
+
+// Wrap mode enumeration (matches Settings UI dropdown)
+enum class WrapMode
+{
+    Both = 0,           // Wrap in both directions
+    VerticalOnly = 1,   // Only wrap top/bottom
+    HorizontalOnly = 2  // Only wrap left/right
+};
+
+// Represents a single edge of a monitor
+struct MonitorEdge
+{
+    int monitorIndex;  // Index into m_monitors (stable across display changes)
+    EdgeType type;
+    int start;      // For vertical edges: Y start; horizontal: X start
+    int end;        // For vertical edges: Y end; horizontal: X end
+    int position;   // For vertical edges: X coord; horizontal: Y coord
+    bool isOuter;   // True if no adjacent monitor touches this edge
+};
+
+// Monitor topology helper - manages edge-based monitor layout
+struct MonitorTopology
+{
+    void Initialize(const std::vector<MonitorInfo>& monitors);
+
+    // Check if cursor is on an outer edge of the given monitor
+    // wrapMode filters which edges are considered (Both, VerticalOnly, HorizontalOnly)
+    bool IsOnOuterEdge(HMONITOR monitor, const POINT& cursorPos, EdgeType& outEdgeType, WrapMode wrapMode) const;
+
+    // Get the wrap destination point for a cursor on an outer edge
+    POINT GetWrapDestination(HMONITOR fromMonitor, const POINT& cursorPos, EdgeType edgeType) const;
+
+    // Get monitor at point (helper)
+    HMONITOR GetMonitorFromPoint(const POINT& pt) const;
+
+    // Get monitor rectangle (helper)
+    bool GetMonitorRect(HMONITOR monitor, RECT& rect) const;
+
+    // Get outer edges collection (for debugging)
+    const std::vector<MonitorEdge>& GetOuterEdges() const { return m_outerEdges; }
+
+    // Detect gaps between monitors that should be snapped together
+    struct GapInfo {
+        int monitor1Index;
+        int monitor2Index;
+        int horizontalGap;
+        int verticalOverlap;
+    };
+    std::vector<GapInfo> DetectMonitorGaps() const;
+
+private:
+    std::vector<MonitorInfo> m_monitors;
+    std::vector<MonitorEdge> m_outerEdges;
+
+    // Map from (monitor index, edge type) to edge info
+    // Using monitor index instead of HMONITOR because HMONITOR handles can change
+    // when monitors are added/removed dynamically
+    std::map<std::pair<int, EdgeType>, MonitorEdge> m_edgeMap;
+
+    // Helper to resolve HMONITOR to monitor index at runtime
+    int GetMonitorIndex(HMONITOR monitor) const;
+
+    // Helper to get consistent HMONITOR from RECT
+    HMONITOR GetMonitorFromRect(const RECT& rect) const;
+    
+    void BuildEdgeMap();
+    void IdentifyOuterEdges();
+
+    // Check if two edges are adjacent (within tolerance)
+    bool EdgesAreAdjacent(const MonitorEdge& edge1, const MonitorEdge& edge2, int tolerance = 50) const;
+
+    // Find the opposite outer edge for wrapping
+    MonitorEdge FindOppositeOuterEdge(EdgeType fromEdge, int relativePosition) const;
+
+    // Calculate relative position along an edge (0.0 to 1.0)
+    double GetRelativePosition(const MonitorEdge& edge, int coordinate) const;
+
+    // Convert relative position to absolute coordinate on target edge
+    int GetAbsolutePosition(const MonitorEdge& edge, double relativePosition) const;
+};

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -33,13 +33,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MouseJump.Common.UnitTests/Helpers/DrawingHelperTests.cs

@@ -143,11 +143,12 @@ public static class DrawingHelperTests
                     var actualPixel = actual.GetPixel(x, y);
 
                     // allow a small tolerance for rounding differences in gdi
+                    // using a tolerance of 3 for support of minor differences in Windows Server 2025 CI
                     Assert.IsTrue(
-                        (Math.Abs(expectedPixel.A - actualPixel.A) <= 1) &&
-                        (Math.Abs(expectedPixel.R - actualPixel.R) <= 1) &&
-                        (Math.Abs(expectedPixel.G - actualPixel.G) <= 1) &&
-                        (Math.Abs(expectedPixel.B - actualPixel.B) <= 1),
+                        (Math.Abs(expectedPixel.A - actualPixel.A) <= 3) &&
+                        (Math.Abs(expectedPixel.R - actualPixel.R) <= 3) &&
+                        (Math.Abs(expectedPixel.G - actualPixel.G) <= 3) &&
+                        (Math.Abs(expectedPixel.B - actualPixel.B) <= 3),
                         $"images differ at pixel ({x}, {y}) - expected: {expectedPixel}, actual: {actualPixel}");
                 }
             }

src/modules/MouseUtils/MouseJump/MouseJump.vcxproj

@@ -12,13 +12,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj

@@ -13,13 +13,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj

@@ -12,7 +12,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj

@@ -14,7 +14,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj

@@ -16,13 +16,13 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj

@@ -17,7 +17,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>

src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj

@@ -15,14 +15,14 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>

src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj

@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

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

@@ -9,7 +9,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <PropertyGroup>
     <ConfigurationType>DynamicLibrary</ConfigurationType>

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -11,7 +11,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/Workspaces/WorkspacesModuleInterface/WorkspacesModuleInterface.vcxproj

@@ -13,7 +13,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj

@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>

src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj

@@ -60,7 +60,7 @@
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>