build(notifications): add additional options for compiler settings

Standardize mixed usage of SolutionDir and RepoRoot in AdditionalIncludeDirectories
across CropAndLock, EnvironmentVariables, KeyboardManagerEditor, and ModuleLoader.

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

@@ -22,7 +22,6 @@ ADate
 ADDSTRING
 ADDUNDORECORD
 ADifferent
-adjacents
 ADMINS
 adml
 admx
@@ -219,10 +218,11 @@ CIELCh
 cim
 CImage
 cla
-claude
 CLASSDC
+classguid
 classmethod
 CLASSNOTAVAILABLE
+claude
 CLEARTYPE
 clickable
 clickonce
@@ -261,7 +261,6 @@ colorhistory
 colorhistorylimit
 COLORKEY
 colorref
-Convs
 comctl
 comdlg
 comexp
@@ -282,6 +281,7 @@ CONTEXTHELP
 CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
+Convs
 copiedcolorrepresentation
 coppied
 copyable
@@ -348,12 +348,14 @@ datareader
 datatracker
 dataversion
 Dayof
+dbcc
 DBID
 DBLCLKS
 DBLEPSILON
 DBPROP
 DBPROPIDSET
 DBPROPSET
+DBT
 DCBA
 DCOM
 DComposition
@@ -371,8 +373,7 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTSIZE
-DEFAULTTONEAREST
-Defaulttonearest
+defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -394,14 +395,19 @@ DESKTOPVERTRES
 devblogs
 devdocs
 devenv
+DEVICEINTERFACE
+devicetype
+DEVINTERFACE
 devmgmt
 DEVMODE
 DEVMODEW
+DEVNODES
 devpal
+DEVTYP
 dfx
 DIALOGEX
-digicert
 diffs
+digicert
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -544,7 +550,6 @@ fdx
 FErase
 fesf
 FFFF
-FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -565,6 +570,7 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
+FInc
 findfast
 findmymouse
 FIXEDFILEINFO
@@ -666,13 +672,14 @@ HCRYPTPROV
 hcursor
 hcwhite
 hdc
+HDEVNOTIFY
 hdr
 hdrop
 hdwwiz
 Helpline
 helptext
-HGFE
 hgdiobj
+HGFE
 hglobal
 hhk
 HHmmssfff
@@ -748,9 +755,9 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
-icf
 IDCANCEL
 IDD
 idk
@@ -841,8 +848,8 @@ jeli
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
 jjw
-JOBOBJECT
 jobject
+JOBOBJECT
 jpe
 jpnime
 Jsons
@@ -886,6 +893,7 @@ Ldr
 LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
@@ -928,9 +936,9 @@ LOWORD
 lparam
 LPBITMAPINFOHEADER
 LPCFHOOKPROC
+lpch
 LPCITEMIDLIST
 LPCLSID
-lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -946,6 +954,7 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
+LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -955,7 +964,6 @@ lptpm
 LPTR
 LPTSTR
 lpv
-LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -999,13 +1007,13 @@ mber
 MBM
 MBR
 Mbuttondown
+mcp
 MDICHILD
 MDL
 mdtext
 mdtxt
 mdwn
 meme
-mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1040,8 +1048,8 @@ mmi
 mmsys
 mobileredirect
 mockapi
-modelcontextprotocol
 MODALFRAME
+modelcontextprotocol
 MODESPRUNED
 MONITORENUMPROC
 MONITORINFO
@@ -1085,9 +1093,9 @@ MSLLHOOKSTRUCT
 Mso
 msrc
 msstore
+mstsc
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
@@ -1097,11 +1105,11 @@ muxxc
 muxxh
 MVPs
 mvvm
-myorg
-myrepo
 MVVMTK
 MWBEx
 MYICON
+myorg
+myrepo
 NAMECHANGE
 namespaceanddescendants
 nao
@@ -1242,10 +1250,8 @@ opencode
 OPENFILENAME
 openrdp
 opensource
-openxmlformats
-ollama
-onnx
 openurl
+openxmlformats
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1462,7 +1468,6 @@ rbhid
 Rbuttondown
 rclsid
 RCZOOMIT
-remotedesktop
 rdp
 RDW
 READMODE
@@ -1491,6 +1496,7 @@ remappings
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
+remotedesktop
 remoteip
 Removelnk
 renamable
@@ -1524,8 +1530,8 @@ RIGHTSCROLLBAR
 riid
 RKey
 RNumber
-rop
 rollups
+rop
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1764,8 +1770,7 @@ SVGIO
 svgz
 SVSI
 SWFO
-SWP
-Swp
+swp
 SWPNOSIZE
 SWPNOZORDER
 SWRESTORE
@@ -1784,8 +1789,7 @@ SYSKEY
 syskeydown
 SYSKEYUP
 SYSLIB
-SYSMENU
-Sysmenu
+sysmenu
 systemai
 SYSTEMAPPS
 SYSTEMMODAL
@@ -1889,9 +1893,9 @@ uitests
 UITo
 ULONGLONG
 Ultrawide
-ums
 UMax
 UMin
+ums
 uncompilable
 UNCPRIORITY
 UNDNAME

.github/instructions/common-libraries.instructions.md

@@ -0,0 +1,61 @@
+---
+description: 'Guidelines for shared libraries including logging, IPC, settings, DPI, telemetry, and utilities consumed by multiple modules'
+applyTo: 'src/common/**'
+---
+
+# Common Libraries – Shared Code Guidance
+
+Guidelines for modifying shared code in `src/common/`. Changes here can have wide-reaching impact across the entire PowerToys codebase.
+
+## Scope
+
+- Logging infrastructure (`src/common/logger/`)
+- IPC primitives and named pipe utilities
+- Settings serialization and management
+- DPI awareness and scaling utilities
+- Telemetry helpers
+- General utilities (JSON parsing, string helpers, etc.)
+
+## Guidelines
+
+### API Stability
+
+- Avoid breaking public headers/APIs; if changed, search & update all callers
+- Coordinate ABI-impacting struct/class layout changes; keep binary compatibility
+- When modifying public interfaces, grep the entire codebase for usages
+
+### Performance
+
+- Watch perf in hot paths (hooks, timers, serialization)
+- Avoid avoidable allocations in frequently called code
+- Profile changes that touch performance-sensitive areas
+
+### Dependencies
+
+- Ask before adding third-party deps or changing serialization formats
+- New dependencies must be MIT-licensed or approved by PM team
+- Add any new external packages to `NOTICE.md`
+
+### Logging
+
+- C++ logging uses spdlog (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`)
+- Initialize with `init_logger()` early in startup
+- Keep hot paths quiet – no logging in tight loops or hooks
+
+## Acceptance Criteria
+
+- No unintended ABI breaks
+- No noisy logs in hot paths
+- New non-obvious symbols briefly commented
+- All callers updated when interfaces change
+
+## Code Style
+
+- **C++**: Follow `.clang-format` in `src/`; use Modern C++ patterns per C++ Core Guidelines
+- **C#**: Follow `src/.editorconfig`; enforce StyleCop.Analyzers
+
+## Validation
+
+- Build: `tools\build\build.cmd` from `src/common/` folder
+- Verify no ABI breaks: grep for changed function/struct names across codebase
+- Check logs: ensure no new logging in performance-critical paths

.github/instructions/runner-settings-ui.instructions.md

@@ -0,0 +1,68 @@
+---
+description: 'Guidelines for Runner and Settings UI components that communicate via named pipes and manage module lifecycle'
+applyTo: 'src/runner/**,src/settings-ui/**'
+---
+
+# Runner & Settings UI – Core Components Guidance
+
+Guidelines for modifying the Runner (tray/module loader) and Settings UI (configuration app). These components communicate via Windows Named Pipes using JSON messages.
+
+## Runner (`src/runner/`)
+
+### Scope
+
+- Module bootstrap, hotkey management, settings bridge, update/elevation handling
+
+### Guidelines
+
+- If IPC/JSON contracts change, mirror updates in `src/settings-ui/**`
+- Keep module discovery in `src/runner/main.cpp` in sync when adding/removing modules
+- Keep startup lean: avoid blocking/network calls in early init path
+- Preserve GPO & elevation behaviors; confirm no regression in policy handling
+- Ask before modifying update workflow or elevation logic
+
+### Acceptance Criteria
+
+- Stable startup, consistent contracts, no unnecessary logging noise
+
+## Settings UI (`src/settings-ui/`)
+
+### Scope
+
+- WinUI/WPF UI, communicates with Runner over named pipes; manages persisted settings schema
+
+### Guidelines
+
+- Don't break settings schema silently; add migration when shape changes
+- If IPC/JSON contracts change, align with `src/runner/**` implementation
+- Keep UI responsive: marshal to UI thread for UI-bound operations
+- Reuse existing styles/resources; avoid duplicate theme keys
+- Add/adjust migration or serialization tests when changing persisted settings
+
+### Acceptance Criteria
+
+- Schema integrity preserved, responsive UI, consistent contracts, no style duplication
+
+## Shared Concerns
+
+### IPC Contract Changes
+
+When modifying the JSON message format between Runner and Settings UI:
+
+1. Update both `src/runner/` and `src/settings-ui/` in the same PR
+2. Preserve backward compatibility where possible
+3. Add migration logic for settings schema changes
+4. Test both directions of communication
+
+### Code Style
+
+- **C++ (Runner)**: Follow `.clang-format` in `src/`
+- **C# (Settings UI)**: Follow `src/.editorconfig`, use StyleCop.Analyzers
+- **XAML**: Use XamlStyler or run `.\.pipelines\applyXamlStyling.ps1 -Main`
+
+## Validation
+
+- Build Runner: `tools\build\build.cmd` from `src/runner/`
+- Build Settings UI: `tools\build\build.cmd` from `src/settings-ui/`
+- Test IPC: Launch both Runner and Settings UI, verify communication works
+- Schema changes: Run serialization tests if settings shape changed

.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

@@ -0,0 +1,165 @@
+---
+description: 'Top-level AI contributor guidance for developing PowerToys - a collection of Windows productivity utilities'
+applyTo: '**'
+---
+
+# PowerToys – AI Contributor Guide
+
+This is the top-level guidance for AI contributions to PowerToys. Keep changes atomic, follow existing patterns, and cite exact paths in PRs.
+
+## Overview
+
+PowerToys is a set of utilities for power users to tune and streamline their Windows experience.
+
+| Area | Location | Description |
+|------|----------|-------------|
+| Runner | `src/runner/` | Main executable, tray icon, module loader, hotkey management |
+| Settings UI | `src/settings-ui/` | WinUI/WPF configuration app communicating via named pipes |
+| Modules | `src/modules/` | Individual PowerToys utilities (each in its own subfolder) |
+| Common Libraries | `src/common/` | Shared code: logging, IPC, settings, DPI, telemetry, utilities |
+| Build Tools | `tools/build/` | Build scripts and automation |
+| Documentation | `doc/devdocs/` | Developer documentation |
+| Installer | `installer/` | WiX-based installer projects |
+
+For architecture details and module types, see [Architecture Overview](doc/devdocs/core/architecture.md).
+
+## Conventions
+
+For detailed coding conventions, see:
+- [Coding Guidelines](doc/devdocs/development/guidelines.md) – Dependencies, testing, PR management
+- [Coding Style](doc/devdocs/development/style.md) – Formatting, C++/C#/XAML style rules
+- [Logging](doc/devdocs/development/logging.md) – C++ spdlog and C# Logger usage
+
+### Component-Specific Instructions
+
+These instruction files are automatically applied when working in their respective areas:
+- [Runner & Settings UI](.github/instructions/runner-settings-ui.instructions.md) – IPC contracts, schema migrations
+- [Common Libraries](.github/instructions/common-libraries.instructions.md) – ABI stability, shared code guidelines
+
+## Build
+
+### Prerequisites
+
+- 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`
+
+### Build Commands
+
+| Task | Command |
+|------|---------|
+| First build / NuGet restore | `tools\build\build-essentials.cmd` |
+| Build current folder | `tools\build\build.cmd` |
+| Build with options | `build.ps1 -Platform x64 -Configuration Release` |
+
+### Build Discipline
+
+1. One terminal per operation (build → test). Do not switch or open new ones mid-flow
+2. After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`)
+3. Use scripts to build: `tools/build/build.ps1` or `tools/build/build.cmd`
+4. For first build or missing NuGet packages, run `build-essentials.cmd` first
+5. **Exit code 0 = success; non-zero = failure** – treat this as absolute
+6. On failure, read the errors log: `build.<config>.<platform>.errors.log`
+7. Do not start tests or launch Runner until the build succeeds
+
+### Build Logs
+
+Located next to the solution/project being built:
+- `build.<configuration>.<platform>.errors.log` – errors only (check this first)
+- `build.<configuration>.<platform>.all.log` – full log
+- `build.<configuration>.<platform>.trace.binlog` – for MSBuild Structured Log Viewer
+
+For complete details, see [Build Guidelines](tools/build/BUILD-GUIDELINES.md).
+
+## Tests
+
+### Test Discovery
+
+- Find test projects by product code prefix (e.g., `FancyZones`, `AdvancedPaste`)
+- Look for sibling folders or 1-2 levels up named `<Product>*UnitTests` or `<Product>*UITests`
+
+### Running Tests
+
+1. **Build the test project first**, wait for exit code 0
+2. Run via VS Test Explorer (`Ctrl+E, T`) or `vstest.console.exe` with filters
+3. **Avoid `dotnet test`** in this repo – use VS Test Explorer or vstest.console.exe
+
+### Test Types
+
+| Type | Requirements | Setup |
+|------|--------------|-------|
+| Unit Tests | Standard dev environment | None |
+| UI Tests | WinAppDriver v1.2.1, Developer Mode | Install from [WinAppDriver releases](https://github.com/microsoft/WinAppDriver/releases/tag/v1.2.1) |
+| Fuzz Tests | OneFuzz, .NET 8 | See [Fuzzing Tests](doc/devdocs/tools/fuzzingtesting.md) |
+
+### Test Discipline
+
+1. Add or adjust tests when changing behavior
+2. If tests skipped, state why (e.g., comment-only change, string rename)
+3. New modules handling file I/O or user input **must** implement fuzzing tests
+
+### Special Requirements
+
+- **Mouse Without Borders**: Requires 2+ physical computers (not VMs)
+- **Multi-monitor utilities**: Test with 2+ monitors, different DPI settings
+
+For UI test setup details, see [UI Tests](doc/devdocs/development/ui-tests.md).
+
+## Boundaries
+
+### Ask for Clarification When
+
+- Ambiguous spec after scanning relevant docs
+- Cross-module impact (shared enum/struct) is unclear
+- Security, elevation, or installer changes involved
+- GPO or policy handling modifications needed
+
+### Areas Requiring Extra Care
+
+| Area | Concern | Reference |
+|------|---------|-----------|
+| `src/common/` | ABI breaks | [Common Libraries Instructions](.github/instructions/common-libraries.instructions.md) |
+| `src/runner/`, `src/settings-ui/` | IPC contracts, schema | [Runner & Settings UI Instructions](.github/instructions/runner-settings-ui.instructions.md) |
+| Installer files | Release impact | Careful review required |
+| Elevation/GPO logic | Security | Confirm no regression in policy handling |
+
+### What NOT to Do
+
+- Don't merge incomplete features into main (use feature branches)
+- Don't break IPC/JSON contracts without updating both runner and settings-ui
+- Don't add noisy logs in hot paths
+- Don't introduce third-party deps without PM approval and `NOTICE.md` update
+
+## Validation Checklist
+
+Before finishing, verify:
+
+- [ ] Build clean with exit code 0
+- [ ] Tests updated and passing locally
+- [ ] No unintended ABI breaks or schema changes
+- [ ] IPC contracts consistent between runner and settings-ui
+- [ ] New dependencies added to `NOTICE.md`
+- [ ] PR is atomic (one logical change), with issue linked
+
+## Documentation Index
+
+### Core Architecture
+- [Architecture Overview](doc/devdocs/core/architecture.md)
+- [Runner](doc/devdocs/core/runner.md)
+- [Settings System](doc/devdocs/core/settings/readme.md)
+- [Module Interface](doc/devdocs/modules/interface.md)
+
+### Development
+- [Coding Guidelines](doc/devdocs/development/guidelines.md)
+- [Coding Style](doc/devdocs/development/style.md)
+- [Logging](doc/devdocs/development/logging.md)
+- [UI Tests](doc/devdocs/development/ui-tests.md)
+- [Fuzzing Tests](doc/devdocs/tools/fuzzingtesting.md)
+
+### Build & Tools
+- [Build Guidelines](tools/build/BUILD-GUIDELINES.md)
+- [Tools Overview](doc/devdocs/tools/readme.md)
+
+### Instructions (Auto-Applied)
+- [Runner & Settings UI](.github/instructions/runner-settings-ui.instructions.md)
+- [Common Libraries](.github/instructions/common-libraries.instructions.md)

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>

Directory.Build.props

@@ -1,5 +1,8 @@
 <Project>
-  <Import Project="src\Version.props" />
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+  </PropertyGroup>
+  <Import Project="$(RepoRoot)src\Version.props" />
   <PropertyGroup>
     <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
     <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
@@ -28,15 +31,15 @@
 
   <PropertyGroup>
     <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
-    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
+    <ForceImportBeforeCppProps>$(RepoRoot)Cpp.Build.props</ForceImportBeforeCppProps>
   </PropertyGroup>
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Include="StyleCop.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
+    <Compile Include="$(RepoRoot)src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
+    <AdditionalFiles Include="$(RepoRoot)src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
 
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <PrivateAssets>all</PrivateAssets>

Directory.Packages.props

@@ -63,7 +63,7 @@
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.66.0-alpha" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.66.0-alpha" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3405.78" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.10" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
@@ -77,8 +77,10 @@
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.231216.1"/>
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental4" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="2.0.130-experimental" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.251104000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.39" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.251106002" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />

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!

SEMANTIC_SEARCH_API_SUMMARY.md

@@ -1,244 +0,0 @@
-# Windows App SDK Semantic Search API 总结
-
-## 1. 环境与依赖
-
-| 项目 | 版本/值 |
-|------|---------|
-| **Windows App SDK** | `2.0.0-experimental3` |
-| **.NET** | `net9.0-windows10.0.26100.0` |
-| **AI Search NuGet** | `Microsoft.WindowsAppSDK.AI` (2.0.57-experimental) |
-| **命名空间** | `Microsoft.Windows.AI.Search.Experimental.AppContentIndex` |
-| **应用类型** | WinUI 3 MSIX 打包应用 |
-
----
-
-## 2. 核心 API
-
-### 2.1 索引管理
-```csharp
-// 创建/打开索引
-var result = AppContentIndexer.GetOrCreateIndex("indexName");
-if (result.Succeeded) {
-    _indexer = result.Indexer;
-    // result.Status: CreatedNew | OpenedExisting
-}
-
-// 等待索引能力就绪
-await _indexer.WaitForIndexCapabilitiesAsync();
-
-// 等待索引空闲（建索引完成）
-await _indexer.WaitForIndexingIdleAsync(TimeSpan.FromSeconds(120));
-
-// 清理
-_indexer.RemoveAll();  // 删除所有索引
-_indexer.Remove(id);   // 删除单个
-_indexer.Dispose();
-```
-
-### 2.2 添加内容到索引
-```csharp
-// 索引文本 → 自动建立 TextLexical + TextSemantic 索引
-IndexableAppContent textContent = AppManagedIndexableAppContent.CreateFromString(id, text);
-_indexer.AddOrUpdate(textContent);
-
-// 索引图片 → 自动建立 ImageSemantic + ImageOcr 索引
-IndexableAppContent imageContent = AppManagedIndexableAppContent.CreateFromBitmap(id, softwareBitmap);
-_indexer.AddOrUpdate(imageContent);
-```
-
-### 2.3 查询
-```csharp
-// 文本查询
-TextQueryOptions options = new TextQueryOptions {
-    Language = "en-US",                          // 可选
-    MatchScope = QueryMatchScope.Unconstrained,  // 匹配范围
-    TextMatchType = TextLexicalMatchType.Fuzzy   // Fuzzy | Exact
-};
-AppIndexTextQuery query = _indexer.CreateTextQuery(searchText, options);
-IReadOnlyList<TextQueryMatch> matches = query.GetNextMatches(5);
-
-// 图片查询
-ImageQueryOptions imgOptions = new ImageQueryOptions {
-    MatchScope = QueryMatchScope.Unconstrained,
-    ImageOcrTextMatchType = TextLexicalMatchType.Fuzzy
-};
-AppIndexImageQuery imgQuery = _indexer.CreateImageQuery(searchText, imgOptions);
-IReadOnlyList<ImageQueryMatch> imgMatches = imgQuery.GetNextMatches(5);
-```
-
-### 2.4 能力检查（只读）
-```csharp
-IndexCapabilities capabilities = _indexer.GetIndexCapabilities();
-
-bool textLexicalOK = capabilities.GetCapabilityState(IndexCapability.TextLexical)
-    .InitializationStatus == IndexCapabilityInitializationStatus.Initialized;
-bool textSemanticOK = capabilities.GetCapabilityState(IndexCapability.TextSemantic)
-    .InitializationStatus == IndexCapabilityInitializationStatus.Initialized;
-bool imageSemanticOK = capabilities.GetCapabilityState(IndexCapability.ImageSemantic)
-    .InitializationStatus == IndexCapabilityInitializationStatus.Initialized;
-bool imageOcrOK = capabilities.GetCapabilityState(IndexCapability.ImageOcr)
-    .InitializationStatus == IndexCapabilityInitializationStatus.Initialized;
-```
-
----
-
-## 3. 四种索引能力
-
-| 能力 | 说明 | 触发方式 |
-|------|------|----------|
-| `TextLexical` | 词法/关键词搜索 | CreateFromString() 自动 |
-| `TextSemantic` | AI 语义搜索 (Embedding) | CreateFromString() 自动 |
-| `ImageSemantic` | 图像语义搜索 | CreateFromBitmap() 自动 |
-| `ImageOcr` | 图片 OCR 文字搜索 | CreateFromBitmap() 自动 |
-
----
-
-## 4. 可控选项（有限）
-
-### TextQueryOptions
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `Language` | string | 查询语言（可选，如 "en-US"）|
-| `MatchScope` | QueryMatchScope | Unconstrained / Region / ContentItem |
-| `TextMatchType` | TextLexicalMatchType | **Fuzzy** / Exact（仅影响 Lexical）|
-
-### ImageQueryOptions
-| 属性 | 类型 | 说明 |
-|------|------|------|
-| `MatchScope` | QueryMatchScope | Unconstrained / Region / ContentItem |
-| `ImageOcrTextMatchType` | TextLexicalMatchType | **Fuzzy** / Exact（仅影响 OCR）|
-
-### 枚举值说明
-
-**QueryMatchScope:**
-- `Unconstrained` - 无约束，同时使用 Lexical + Semantic
-- `Region` - 限制在特定区域
-- `ContentItem` - 限制在单个内容项
-
-**TextLexicalMatchType:**
-- `Fuzzy` - 模糊匹配，允许拼写错误、近似词
-- `Exact` - 精确匹配，必须完全一致
-
----
-
-## 5. 关键限制 ⚠️
-
-| 限制 | 说明 |
-|------|------|
-| **不能单独指定 Semantic/Lexical** | 系统自动同时使用所有可用能力 |
-| **Fuzzy/Exact 只影响 Lexical** | 对 Semantic 搜索无效 |
-| **能力检查是只读的** | `GetIndexCapabilities()` 只能查看，不能控制 |
-| **无相似度阈值** | 不能设置 Semantic 匹配的阈值 |
-| **无结果排序控制** | 无法指定按相关度或其他方式排序 |
-| **语言需手动传** | 不会自动检测，需开发者指定 |
-| **无相关度分数** | 查询结果不返回匹配分数 |
-
----
-
-## 6. 典型使用流程
-
-```
-┌─────────────────────────────────────────────────────────┐
-│                    App 启动时                           │
-├─────────────────────────────────────────────────────────┤
-│ 1. GetOrCreateIndex("name")     // 创建/打开索引        │
-│ 2. WaitForIndexCapabilitiesAsync()  // 等待能力就绪     │
-│ 3. GetIndexCapabilities()        // 检查可用能力        │
-│ 4. IndexAll()                    // 索引所有数据        │
-│    ├─ CreateFromString() × N                           │
-│    └─ CreateFromBitmap() × N                           │
-│ 5. WaitForIndexingIdleAsync()    // 等待索引完成        │
-└─────────────────────────────────────────────────────────┘
-                         ↓
-┌─────────────────────────────────────────────────────────┐
-│                    运行时查询                            │
-├─────────────────────────────────────────────────────────┤
-│ 1. CreateTextQuery(text, options)   // 创建查询         │
-│ 2. query.GetNextMatches(N)          // 获取结果         │
-│ 3. 处理 TextQueryMatch / ImageQueryMatch               │
-└─────────────────────────────────────────────────────────┘
-                         ↓
-┌─────────────────────────────────────────────────────────┐
-│                    App 退出时                           │
-├─────────────────────────────────────────────────────────┤
-│ 1. _indexer.RemoveAll()             // 清理索引         │
-│ 2. _indexer.Dispose()               // 释放资源         │
-└─────────────────────────────────────────────────────────┘
-```
-
----
-
-## 7. 查询结果处理
-
-```csharp
-// 文本查询结果
-foreach (var match in textMatches)
-{
-    if (match.ContentKind == QueryMatchContentKind.AppManagedText)
-    {
-        AppManagedTextQueryMatch textResult = (AppManagedTextQueryMatch)match;
-        string contentId = match.ContentId;      // 内容 ID
-        int offset = textResult.TextOffset;      // 匹配文本偏移
-        int length = textResult.TextLength;      // 匹配文本长度
-    }
-}
-
-// 图片查询结果
-foreach (var match in imageMatches)
-{
-    if (match.ContentKind == QueryMatchContentKind.AppManagedImage)
-    {
-        AppManagedImageQueryMatch imageResult = (AppManagedImageQueryMatch)match;
-        string contentId = imageResult.ContentId;  // 图片 ID
-    }
-}
-```
-
----
-
-## 8. 能力变化监听
-
-```csharp
-// 监听索引能力变化
-_indexer.Listener.IndexCapabilitiesChanged += (indexer, capabilities) =>
-{
-    // 重新检查能力状态，更新 UI
-    LoadAppIndexCapabilities();
-};
-```
-
----
-
-## 9. 结论
-
-这是一个**高度封装的黑盒 API**：
-
-### 优点 ✅
-- 简单易用，几行代码即可实现搜索
-- 自动处理 Lexical + Semantic
-- 支持文本和图片多模态搜索
-- 系统级集成，无需额外部署模型
-
-### 缺点 ❌
-- 无法精细控制搜索类型
-- 不能只用 Semantic Search
-- 选项有限，缺乏高级配置
-- 实验性 API，可能变更
-
-### 替代方案
-**如果需要纯 Semantic Search（向量搜索）**，建议：
-- 直接使用 Embedding 模型生成向量
-- 配合向量数据库（Azure Cosmos DB、FAISS、Qdrant 等）
-
----
-
-## 10. 相关 NuGet 包
-
-```xml
-<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
-<PackageReference Include="Microsoft.WindowsAppSDK.AI" Version="2.0.57-experimental" />
-```
-
----
-
-*文档生成日期: 2026-01-21*

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)
 

doc/devdocs/sparse-package-investigation.md

@@ -1,325 +0,0 @@
-# Sparse Package + WinUI 3 调查报告
-
-## 背景
-
-PowerToys 希望使用 Windows App SDK 的 Semantic Search API (`AppContentIndexer.GetOrCreateIndex`) 来实现语义搜索功能。该 API 要求应用具有 **Package Identity**。
-
-## 问题现象
-
-### 1. Semantic Search API 调用失败
-
-在 [SemanticSearchIndex.cs](../../src/common/Common.Search/SemanticSearch/SemanticSearchIndex.cs) 中调用 `AppContentIndexer.GetOrCreateIndex(_indexName)` 时，抛出 COM 异常：
-
-```
-System.Runtime.InteropServices.COMException (0x80004005): Error HRESULT E_FAIL has been returned from a call to a COM component.
-   at WinRT.ExceptionHelpers.<ThrowExceptionForHR>g__Throw|39_0(Int32 hr)
-   at Microsoft.Windows.AI.Search.AppContentIndexer.GetOrCreateIndex(String indexName)
-```
-
-### 2. API 要求
-
-根据 [Windows App SDK 文档](https://learn.microsoft.com/en-us/windows/ai/apis/content-search)，Semantic Search API 需要：
-- Windows 11 24H2 或更高版本
-- NPU 硬件支持
-- **Package Identity**（应用需要有 MSIX 包标识）
-
-## Sparse Package 方案
-
-### 什么是 Sparse Package
-
-Sparse Package（稀疏包）是一种为非打包（unpackaged）Win32 应用提供 Package Identity 的技术，无需完整的 MSIX 打包。
-
-参考：[Grant package identity by packaging with external location](https://learn.microsoft.com/en-us/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps)
-
-### 实现架构
-
-```
-PowerToysSparse.msix (仅包含 manifest 和图标)
-    │
-    ├── AppxManifest.xml  (声明应用和依赖)
-    ├── Square44x44Logo.png
-    ├── Square150x150Logo.png
-    └── StoreLogo.png
-
-ExternalLocation (指向实际应用目录)
-    │
-    └── ARM64\Debug\
-        ├── PowerToys.Settings.exe
-        ├── PowerToys.Settings.pri
-        └── ... (其他应用文件)
-```
-
-### 关键组件
-
-| 文件 | 位置 | 作用 |
-|------|------|------|
-| AppxManifest.xml | src/PackageIdentity/ | 定义 sparse package 的应用、依赖和能力 |
-| app.manifest | src/settings-ui/Settings.UI/ | 嵌入 exe 中，声明与 sparse package 的关联 |
-| BuildSparsePackage.ps1 | src/PackageIdentity/ | 构建和签名脚本 |
-
-### Publisher 配置
-
-**重要**：app.manifest 和 AppxManifest.xml 中的 Publisher 必须匹配。
-
-| 环境 | Publisher |
-|------|-----------|
-| 开发环境 | `CN=PowerToys Dev, O=PowerToys, L=Redmond, S=Washington, C=US` |
-| 生产环境 | `CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US` |
-
-BuildSparsePackage.ps1 会在本地构建时**自动**将 AppxManifest.xml 的 Publisher 替换为开发环境值，无需手动修改源码。
-
-## 当前问题：WinUI 3 + Sparse Package 崩溃
-
-### 现象
-
-当 Settings.exe（WinUI 3 应用）通过 sparse package 启动时，立即崩溃：
-
-```
-Microsoft.UI.Xaml.Markup.XamlParseException (-2144665590):
-Cannot locate resource from 'ms-appx:///Microsoft.UI.Xaml/Themes/themeresources.xaml'. [Line: 11 Position: 40]
-```
-
-### 新观察（2026-01-25）
-
-对齐 WinAppSDK 版本并恢复 app-local 运行时后，仍可复现**更早期**的崩溃（未写入 Settings 日志）：
-
-- Application Error / WER（AUMID 启动）：
-  - Faulting module: `CoreMessagingXP.dll`
-  - Exception code: `0xc0000602`
-  - Faulting module path: `C:\PowerToys\ARM64\Debug\WinUI3Apps\CoreMessagingXP.dll`
-- 暂时移除 `CoreMessagingXP.dll` 后，出现 .NET Runtime 1026：
-  - `COMException (0x80040111): ClassFactory cannot supply requested class`
-  - 发生在 `Microsoft.UI.Xaml.Application.Start(...)`
-
-这说明 **“themeresources.xaml 无法解析”并不是唯一/必现的失败模式**，app-local 运行时在 sparse identity 下可能存在更底层的初始化问题。
-
-### 新观察（2026-01-25 晚间）
-
-framework-dependent + bootstrap 方向有实质进展：
-
-- 设置 `WindowsAppSDKSelfContained=false`（仅在 `UseSparseIdentity=true` 时生效）
-- 添加 `WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp=true`
-- **从 ExternalLocation 根目录与 `WinUI3Apps` 目录移除 app-local WinAppSDK 运行时文件**
-  - 尤其是 `CoreMessagingXP.dll`，否则会优先加载并导致 `0xc0000602`
-- **保留/放回 bootstrap DLL**
-  - 必需：`Microsoft.WindowsAppRuntime.Bootstrap.Net.dll`
-  - 建议同时保留：`Microsoft.WindowsAppRuntime.Bootstrap.dll`
-
-按以上处理后，Settings 通过 AUMID 启动不再崩溃，日志写入恢复。
-
-### 根本原因分析
-
-1. **ms-appx:/// URI 机制**
-   - WinUI 3 使用 `ms-appx:///` URI 加载 XAML 资源
-   - 这个 URI scheme 依赖于 MSIX 包的资源索引系统
-
-2. **框架资源位置**
-   - `themeresources.xaml` 等主题资源在 Windows App Runtime 框架包中
-   - 框架包位置：`C:\Program Files\WindowsApps\Microsoft.WindowsAppRuntime.2.0-experimental4_*\`（应与 WinAppSDK 版本匹配）
-   - 资源编译在框架包的 `resources.pri` 中
-
-3. **WinAppSDK 版本/依赖不一致（更可能的原因）**
-   - 仓库当前引用 `Microsoft.WindowsAppSDK` **2.0.0-experimental4**（见 `Directory.Packages.props`）
-   - Sparse manifest 仍依赖 **Microsoft.WindowsAppRuntime.2.0-experimental3**（`MinVersion=0.676.658.0`）
-   - 通过包标识启动时会走框架包资源图，如果依赖版本不匹配，WinUI 资源解析可能失败，从而触发上述 `XamlParseException`
-   - 需要先对齐依赖版本，再判断是否是 sparse 本身限制
-
-4. **app-local 运行时在 sparse identity 下崩溃（已观测）**
-   - 即使对齐 WinAppSDK 版本，也可能在 `CoreMessagingXP.dll` 处崩溃（`0xc0000602`）
-   - 此时 Settings 日志不一定写入，需查看 Application Event Log
-
-4. **Sparse Package 的限制（待验证）**
-   - 之前推断 `ms-appx:///` 在 sparse package 下无法解析框架依赖资源
-   - 但在修正依赖版本之前无法下结论
-
-### 对比：WPF 应用可以工作
-
-WPF 应用（如 ImageResizer）使用 sparse package 时**可以正常工作**，因为：
-- WPF 不依赖 `ms-appx:///` URI
-- WPF 资源加载使用不同的机制
-
-## 已尝试的解决方案
-
-| 方案 | 结果 | 原因 |
-|------|------|------|
-| 复制 PRI 文件到根目录 | ❌ 失败 | `ms-appx:///` 不查找本地 PRI |
-| 复制 themeresources 到本地 | ❌ 失败 | 资源在 PRI 中，不是独立文件 |
-| 修改 Settings OutputPath 到根目录 | ❌ 失败 | 问题不在于应用资源位置 |
-| 复制框架 resources.pri | ❌ 失败 | `ms-appx:///` 机制问题 |
-| 对齐 WindowsAppRuntime 依赖版本 | ⏳ 待验证 | 先排除依赖不一致导致的资源解析失败 |
-| app-local 运行时（self-contained）+ sparse identity | ❌ 失败 | Application Error: `CoreMessagingXP.dll` / `0xc0000602` |
-| 移除 `CoreMessagingXP.dll` | ❌ 失败 | .NET Runtime 1026: `ClassFactory cannot supply requested class` |
-| framework-dependent + bootstrap + 清理 ExternalLocation 中 app-local 运行时 | ✅ 成功 | 需保留 `Microsoft.WindowsAppRuntime.Bootstrap*.dll` |
-| 将 resources.pri 打进 sparse MSIX | ✅ 成功 | MRT 可从包内 resources.pri 正常解析字符串 |
-
-## 当前代码状态
-
-### 已修正（建议保留）
-
-1. **Settings.UI 输出路径**
-   - 文件：`src/settings-ui/Settings.UI/PowerToys.Settings.csproj`
-   - 修改：恢复为 `WinUI3Apps`（避免破坏 runner/installer/脚本路径假设）
-
-2. **AppxManifest.xml 的 Executable 路径**
-   - 文件：`src/PackageIdentity/AppxManifest.xml`
-   - 修改：恢复为 `WinUI3Apps\PowerToys.Settings.exe`
-
-3. **AppxManifest.xml 的 WindowsAppRuntime 依赖**
-   - 文件：`src/PackageIdentity/AppxManifest.xml`
-   - 修改：更新为 `Microsoft.WindowsAppRuntime.2.0-experimental4`，`MinVersion=0.738.2207.0`（与 `Microsoft.WindowsAppSDK.Runtime` 2.0.0-experimental4 对齐）
-
-### 未修改（源码中保持生产配置）
-
-- AppxManifest.xml 的 Publisher 保持 Microsoft Corporation（脚本会自动替换）
-
-### 验证步骤（建议）
-
-1. **确认 WindowsAppRuntime 版本已安装**
-   - `Get-AppxPackage -Name Microsoft.WindowsAppRuntime.2.0-experimental4`
-   - 如缺失，可从 NuGet 缓存安装：  
-     `Add-AppxPackage -Path "$env:USERPROFILE\.nuget\packages\microsoft.windowsappsdk.runtime\2.0.0-experimental4\tools\MSIX\win10-x64\Microsoft.WindowsAppRuntime.2.0-experimental4.msix"`
-
-2. **构建并注册 sparse package**
-   - `.\src\PackageIdentity\BuildSparsePackage.ps1 -Platform x64 -Configuration Debug`
-   - `Add-AppxPackage -Path ".\x64\Debug\PowerToysSparse.msix" -ExternalLocation ".\x64\Debug"`
-
-3. **用包标识启动 Settings**
-   - AUMID：`Microsoft.PowerToys.SparseApp!PowerToys.SettingsUI`
-   - 预期：不再触发 `themeresources.xaml` 解析错误
-
-## 可能的解决方向
-
-### 方向 1：等待 Windows App SDK 修复
-
-- 可能是 Windows App SDK 的已知限制或 bug
-- 需要在 GitHub issues 中搜索或提交新 issue
-
-### 方向 2：使用完整 MSIX 打包
-
-- 不使用 sparse package，而是完整打包
-- 影响：改变部署模型，增加复杂性
-
-### 方向 3：创建非 WinUI 3 的 Helper 进程
-
-- 创建一个 Console App 或 WPF App 作为 helper
-- 该 helper 具有 package identity，专门调用 Semantic Search API
-- Settings 通过 IPC 与 helper 通信
-- 优点：不影响现有 Settings 架构
-
-### 方向 4：进一步调查 ms-appx:/// 解析
-
-- 研究是否有配置选项让 sparse package 正确解析框架资源
-- 可能需要深入 Windows App SDK 源码或联系微软
-
-### 方向 5：切换为 framework-dependent + Bootstrap（待验证）
-
-- 设置 `WindowsAppSDKSelfContained=false` 并**重新构建** Settings
-- 确保外部目录不再携带 app-local WinAppSDK 运行时
-- 让 `Bootstrap.TryInitialize(...)` 生效，走框架包动态依赖
-
-## 可复现的工作流（已验证 2026-01-25）
-
-目标：Settings 使用 sparse identity 启动，WinUI 资源/字符串正常加载。
-
-### 1) 构建 Settings（framework-dependent + bootstrap no-op）
-
-在 `PowerToys.Settings.csproj` 中添加（仅在 `UseSparseIdentity=true` 时生效）：
-
-```
-<PropertyGroup Condition="'$(UseSparseIdentity)'=='true'">
-  <WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>
-  <WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp>true</WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp>
-</PropertyGroup>
-```
-
-构建：
-
-```
-MSBuild.exe src\settings-ui\Settings.UI\PowerToys.Settings.csproj /p:Platform=ARM64 /p:Configuration=Debug /p:UseSparseIdentity=true /m:1 /p:CL_MPCount=1 /nodeReuse:false
-```
-
-### 2) 清理 ExternalLocation 的 app-local WinAppSDK 运行时
-
-**必须移除** app-local WinAppSDK 运行时文件，否则会优先加载并崩溃（`CoreMessagingXP.dll` / `0xc0000602`）。
-
-需清理的目录：
-- `ARM64\Debug`（ExternalLocation 根）
-- `ARM64\Debug\WinUI3Apps`
-
-建议只移除 app-local WinAppSDK 相关文件（保留业务 DLL）。
-
-**保留/放回 bootstrap DLL（必要）：**
-- `Microsoft.WindowsAppRuntime.Bootstrap.dll`
-- `Microsoft.WindowsAppRuntime.Bootstrap.Net.dll`
-
-### 3) 生成与包名一致的 resources.pri
-
-关键点：resources.pri 的 **ResourceMap name 必须与包名一致**。
-
-使用 `makepri.exe new` 生成，确保 `/mn` 指向 sparse 包的 `AppxManifest.xml`：
-
-```
-makepri.exe new ^
-  /pr C:\PowerToys\src\settings-ui\Settings.UI ^
-  /cf C:\PowerToys\src\settings-ui\Settings.UI\obj\ARM64\Debug\priconfig.xml ^
-  /mn C:\PowerToys\src\PackageIdentity\AppxManifest.xml ^
-  /of C:\PowerToys\ARM64\Debug\resources.pri ^
-  /o
-```
-
-### 4) 将 resources.pri 打进 sparse MSIX
-
-在 `BuildSparsePackage.ps1` 中把 `resources.pri` 放入 staging（脚本已更新）：
-- 优先取 `ARM64\Debug\resources.pri`
-- 如果不存在则回退 `ARM64\Debug\WinUI3Apps\PowerToys.Settings.pri`
-
-重新打包：
-
-```
-.\src\PackageIdentity\BuildSparsePackage.ps1 -Platform ARM64 -Configuration Debug
-```
-
-### 5) 重新注册 sparse 包（如需先卸载）
-
-如果因为内容变更被阻止，先卸载再安装：
-
-```
-Get-AppxPackage -Name Microsoft.PowerToys.SparseApp | Remove-AppxPackage
-Add-AppxPackage -Path .\ARM64\Debug\PowerToysSparse.msix -ExternalLocation .\ARM64\Debug -ForceApplicationShutdown
-```
-
-### 6) 启动 Settings（验证）
-
-```
-Start-Process "shell:AppsFolder\Microsoft.PowerToys.SparseApp_djwsxzxb4ksa8!PowerToys.SettingsUI"
-```
-
-验证要点：
-- Settings 正常启动，UI 文本显示
-- 日志正常写入：`%LOCALAPPDATA%\Microsoft\PowerToys\Settings\Logs\0.0.1.0\`
-
-### 备注（可选）
-
-如果出现 `ms-appx:///CommunityToolkit...` 资源缺失，可将对应的 `.pri`（从 NuGet 缓存）复制到 `ARM64\Debug\WinUI3Apps`，但在 **resources.pri 已正确打包** 后通常不再需要。
-
-## 待确认事项
-
-1. [ ] WinUI 3 + Sparse Package 的兼容性问题是否有官方文档说明？
-2. [ ] 是否有其他项目成功实现 WinUI 3 + Sparse Package？
-3. [ ] Windows App SDK GitHub 上是否有相关 issue？
-4. [ ] 修正依赖版本后，Settings 是否能在 sparse identity 下正常启动？
-5. [ ] framework-dependent（Bootstrap）方式是否能在 sparse identity 下启动？
-
-## 相关文件
-
-- [SemanticSearchIndex.cs](../../src/common/Common.Search/SemanticSearch/SemanticSearchIndex.cs) - Semantic Search 实现
-- [AppxManifest.xml](../../src/PackageIdentity/AppxManifest.xml) - Sparse package manifest
-- [BuildSparsePackage.ps1](../../src/PackageIdentity/BuildSparsePackage.ps1) - 构建脚本
-- [app.manifest](../../src/settings-ui/Settings.UI/app.manifest) - Settings 应用 manifest
-- [PowerToys.Settings.csproj](../../src/settings-ui/Settings.UI/PowerToys.Settings.csproj) - Settings 项目文件
-
-## 参考链接
-
-- [Grant package identity by packaging with external location](https://learn.microsoft.com/en-us/windows/apps/desktop/modernize/grant-identity-to-nonpackaged-apps)
-- [Windows App SDK - Content Search API](https://learn.microsoft.com/en-us/windows/ai/apis/content-search)
-- [Windows App SDK GitHub Issues](https://github.com/microsoft/WindowsAppSDK/issues)

doc/specs/common-search-library.md

@@ -1,496 +0,0 @@
-# Common.Search Library Specification
-
-## Overview
-
-本文档描述 `Common.Search` 库的重构设计，目标是提供一个通用的、可插拔的搜索框架，支持多种搜索引擎实现（Fuzzy Match、Semantic Search 等）。
-
-## Goals
-
-1. **解耦** - 搜索引擎与数据源完全解耦
-2. **可插拔** - 支持替换不同的搜索引擎实现
-3. **泛型** - 不绑定特定业务类型（如 SettingEntry）
-4. **可组合** - 支持多引擎组合（即时 Fuzzy + 延迟 Semantic）
-5. **可复用** - 可被 PowerToys 多个模块使用
-
-## Architecture
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                      Consumer (e.g., Settings.UI)               │
-├─────────────────────────────────────────────────────────────────┤
-│  SettingsDataProvider        ← 业务特定的数据加载               │
-│  SettingsSearchService       ← 业务特定的搜索服务               │
-│  SettingEntry : ISearchable  ← 业务实体实现搜索契约             │
-└─────────────────────────────────────────────────────────────────┘
-                              │ uses
-                              ▼
-┌─────────────────────────────────────────────────────────────────┐
-│                      Common.Search (Library)                    │
-├─────────────────────────────────────────────────────────────────┤
-│                                                                 │
-│  ┌─────────────────────────────────────────────────────────┐   │
-│  │                    Core Abstractions                     │   │
-│  ├─────────────────────────────────────────────────────────┤   │
-│  │  ISearchable              ← 可搜索内容契约               │   │
-│  │  ISearchEngine<T>         ← 搜索引擎接口                 │   │
-│  │  SearchResult<T>          ← 统一结果模型                 │   │
-│  │  SearchOptions            ← 搜索选项                     │   │
-│  └─────────────────────────────────────────────────────────┘   │
-│                                                                 │
-│  ┌─────────────────────────────────────────────────────────┐   │
-│  │                    Implementations                       │   │
-│  ├─────────────────────────────────────────────────────────┤   │
-│  │  FuzzSearch/                                             │   │
-│  │  ├── FuzzSearchEngine<T>  ← 内存 Fuzzy 搜索              │   │
-│  │  ├── StringMatcher        ← 现有的模糊匹配算法           │   │
-│  │  └── MatchResult          ← Fuzzy 匹配结果               │   │
-│  │                                                          │   │
-│  │  SemanticSearch/                                         │   │
-│  │  ├── SemanticSearchEngine ← Windows AI Search 封装       │   │
-│  │  └── SemanticSearchCapabilities                          │   │
-│  │                                                          │   │
-│  │  CompositeSearch/                                        │   │
-│  │  └── CompositeSearchEngine<T> ← 多引擎组合               │   │
-│  └─────────────────────────────────────────────────────────┘   │
-│                                                                 │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-## Core Interfaces
-
-### ISearchable
-
-定义可搜索内容的最小契约。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// Defines a searchable item that can be indexed and searched.
-/// </summary>
-public interface ISearchable
-{
-    /// <summary>
-    /// Gets the unique identifier for this item.
-    /// </summary>
-    string Id { get; }
-
-    /// <summary>
-    /// Gets the primary searchable text (e.g., title, header).
-    /// </summary>
-    string SearchableText { get; }
-
-    /// <summary>
-    /// Gets optional secondary searchable text (e.g., description).
-    /// Returns null if not available.
-    /// </summary>
-    string? SecondarySearchableText { get; }
-}
-```
-
-### ISearchEngine&lt;T&gt;
-
-搜索引擎核心接口。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// Defines a pluggable search engine that can index and search items.
-/// </summary>
-/// <typeparam name="T">The type of items to search, must implement ISearchable.</typeparam>
-public interface ISearchEngine<T> : IDisposable
-    where T : ISearchable
-{
-    /// <summary>
-    /// Gets a value indicating whether the engine is ready to search.
-    /// </summary>
-    bool IsReady { get; }
-
-    /// <summary>
-    /// Gets the engine capabilities.
-    /// </summary>
-    SearchEngineCapabilities Capabilities { get; }
-
-    /// <summary>
-    /// Initializes the search engine.
-    /// </summary>
-    Task InitializeAsync(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Indexes a single item.
-    /// </summary>
-    Task IndexAsync(T item, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Indexes multiple items in batch.
-    /// </summary>
-    Task IndexBatchAsync(IEnumerable<T> items, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Removes an item from the index by its ID.
-    /// </summary>
-    Task RemoveAsync(string id, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Clears all indexed items.
-    /// </summary>
-    Task ClearAsync(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Searches for items matching the query.
-    /// </summary>
-    Task<IReadOnlyList<SearchResult<T>>> SearchAsync(
-        string query,
-        SearchOptions? options = null,
-        CancellationToken cancellationToken = default);
-}
-```
-
-### SearchResult&lt;T&gt;
-
-统一的搜索结果模型。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// Represents a search result with the matched item and scoring information.
-/// </summary>
-public sealed class SearchResult<T>
-    where T : ISearchable
-{
-    /// <summary>
-    /// Gets the matched item.
-    /// </summary>
-    public required T Item { get; init; }
-
-    /// <summary>
-    /// Gets the relevance score (higher is more relevant).
-    /// </summary>
-    public required double Score { get; init; }
-
-    /// <summary>
-    /// Gets the type of match that produced this result.
-    /// </summary>
-    public required SearchMatchKind MatchKind { get; init; }
-
-    /// <summary>
-    /// Gets the match details for highlighting (optional).
-    /// </summary>
-    public IReadOnlyList<MatchSpan>? MatchSpans { get; init; }
-}
-
-/// <summary>
-/// Represents a span of matched text for highlighting.
-/// </summary>
-public readonly record struct MatchSpan(int Start, int Length);
-
-/// <summary>
-/// Specifies the kind of match that produced a search result.
-/// </summary>
-public enum SearchMatchKind
-{
-    /// <summary>Exact text match.</summary>
-    Exact,
-
-    /// <summary>Fuzzy/approximate text match.</summary>
-    Fuzzy,
-
-    /// <summary>Semantic/AI-based match.</summary>
-    Semantic,
-
-    /// <summary>Combined match from multiple engines.</summary>
-    Composite,
-}
-```
-
-### SearchOptions
-
-搜索配置选项。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// Options for configuring search behavior.
-/// </summary>
-public sealed class SearchOptions
-{
-    /// <summary>
-    /// Gets or sets the maximum number of results to return.
-    /// Default is 20.
-    /// </summary>
-    public int MaxResults { get; set; } = 20;
-
-    /// <summary>
-    /// Gets or sets the minimum score threshold (0.0 to 1.0).
-    /// Results below this score are filtered out.
-    /// Default is 0.0 (no filtering).
-    /// </summary>
-    public double MinScore { get; set; } = 0.0;
-
-    /// <summary>
-    /// Gets or sets the language hint for the search (e.g., "en-US").
-    /// </summary>
-    public string? Language { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether to include match spans for highlighting.
-    /// Default is false.
-    /// </summary>
-    public bool IncludeMatchSpans { get; set; } = false;
-}
-```
-
-### SearchEngineCapabilities
-
-引擎能力描述。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// Describes the capabilities of a search engine.
-/// </summary>
-public sealed class SearchEngineCapabilities
-{
-    /// <summary>
-    /// Gets a value indicating whether the engine supports fuzzy matching.
-    /// </summary>
-    public bool SupportsFuzzyMatch { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports semantic search.
-    /// </summary>
-    public bool SupportsSemanticSearch { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine persists the index to disk.
-    /// </summary>
-    public bool PersistsIndex { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports incremental indexing.
-    /// </summary>
-    public bool SupportsIncrementalIndex { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports match span highlighting.
-    /// </summary>
-    public bool SupportsMatchSpans { get; init; }
-}
-```
-
-## Implementations
-
-### FuzzSearchEngine&lt;T&gt;
-
-基于现有 StringMatcher 的内存搜索引擎。
-
-**特点：**
-- 纯内存，无持久化
-- 即时响应（毫秒级）
-- 支持 match spans 高亮
-- 基于字符的模糊匹配
-
-**Capabilities：**
-```csharp
-new SearchEngineCapabilities
-{
-    SupportsFuzzyMatch = true,
-    SupportsSemanticSearch = false,
-    PersistsIndex = false,
-    SupportsIncrementalIndex = true,
-    SupportsMatchSpans = true,
-}
-```
-
-### SemanticSearchEngine
-
-基于 Windows App SDK AI Search API 的语义搜索引擎。
-
-**特点：**
-- 系统管理的持久化索引
-- AI 驱动的语义理解
-- 需要模型初始化（可能较慢）
-- 可能不可用（依赖系统支持）
-
-**Capabilities：**
-```csharp
-new SearchEngineCapabilities
-{
-    SupportsFuzzyMatch = true,  // API 同时提供 lexical + semantic
-    SupportsSemanticSearch = true,
-    PersistsIndex = true,
-    SupportsIncrementalIndex = true,
-    SupportsMatchSpans = false,  // API 不返回详细位置
-}
-```
-
-**注意：** SemanticSearchEngine 不是泛型的，因为它需要将内容转换为字符串存入系统索引。实现时通过 `ISearchable` 接口提取文本。
-
-### CompositeSearchEngine&lt;T&gt;
-
-组合多个搜索引擎，支持 fallback 和结果合并。
-
-```csharp
-namespace Common.Search;
-
-/// <summary>
-/// A search engine that combines results from multiple engines.
-/// </summary>
-public sealed class CompositeSearchEngine<T> : ISearchEngine<T>
-    where T : ISearchable
-{
-    /// <summary>
-    /// Strategy for combining results from multiple engines.
-    /// </summary>
-    public enum CombineStrategy
-    {
-        /// <summary>Use first ready engine only.</summary>
-        FirstReady,
-
-        /// <summary>Merge results from all ready engines.</summary>
-        MergeAll,
-
-        /// <summary>Use primary, fallback to secondary if primary not ready.</summary>
-        PrimaryWithFallback,
-    }
-}
-```
-
-**典型用法：** Fuzzy 作为即时响应，Semantic 准备好后增强结果。
-
-## Directory Structure
-
-```
-src/common/Common.Search/
-├── Common.Search.csproj
-├── GlobalSuppressions.cs
-├── ISearchable.cs
-├── ISearchEngine.cs
-├── SearchResult.cs
-├── SearchOptions.cs
-├── SearchEngineCapabilities.cs
-├── SearchMatchKind.cs
-├── MatchSpan.cs
-│
-├── FuzzSearch/
-│   ├── FuzzSearchEngine.cs
-│   ├── StringMatcher.cs         (existing)
-│   ├── MatchOption.cs           (existing)
-│   ├── MatchResult.cs           (existing)
-│   └── SearchPrecisionScore.cs  (existing)
-│
-├── SemanticSearch/
-│   ├── SemanticSearchEngine.cs
-│   ├── SemanticSearchCapabilities.cs
-│   └── SemanticSearchAdapter.cs  (adapts ISearchable to Windows API)
-│
-└── CompositeSearch/
-    └── CompositeSearchEngine.cs
-```
-
-## Consumer Usage (Settings.UI)
-
-### SettingEntry 实现 ISearchable
-
-```csharp
-// Settings.UI.Library/SettingEntry.cs
-public struct SettingEntry : ISearchable
-{
-    // Existing properties...
-
-    // ISearchable implementation
-    public string Id => ElementUid ?? $"{PageTypeName}|{ElementName}";
-    public string SearchableText => Header ?? string.Empty;
-    public string? SecondarySearchableText => Description;
-}
-```
-
-### SettingsSearchService
-
-```csharp
-// Settings.UI/Services/SettingsSearchService.cs
-public sealed class SettingsSearchService : IDisposable
-{
-    private readonly ISearchEngine<SettingEntry> _engine;
-
-    public SettingsSearchService(ISearchEngine<SettingEntry> engine)
-    {
-        _engine = engine;
-    }
-
-    public async Task InitializeAsync(IEnumerable<SettingEntry> entries)
-    {
-        await _engine.InitializeAsync();
-        await _engine.IndexBatchAsync(entries);
-    }
-
-    public async Task<List<SettingEntry>> SearchAsync(string query, CancellationToken ct = default)
-    {
-        var results = await _engine.SearchAsync(query, cancellationToken: ct);
-        return results.Select(r => r.Item).ToList();
-    }
-}
-```
-
-### Startup Configuration
-
-```csharp
-// Option 1: Fuzzy only (default, immediate)
-var engine = new FuzzSearchEngine<SettingEntry>();
-
-// Option 2: Semantic only (requires Windows AI)
-var engine = new SemanticSearchAdapter<SettingEntry>("PowerToysSettings");
-
-// Option 3: Composite (best of both worlds)
-var engine = new CompositeSearchEngine<SettingEntry>(
-    primary: new SemanticSearchAdapter<SettingEntry>("PowerToysSettings"),
-    fallback: new FuzzSearchEngine<SettingEntry>(),
-    strategy: CombineStrategy.PrimaryWithFallback
-);
-
-var searchService = new SettingsSearchService(engine);
-await searchService.InitializeAsync(settingEntries);
-```
-
-## Migration Plan
-
-### Phase 1: Core Abstractions
-1. 创建 `ISearchable`, `ISearchEngine<T>`, `SearchResult<T>` 等核心接口
-2. 保持现有 FuzzSearch 代码不变
-
-### Phase 2: FuzzSearchEngine&lt;T&gt;
-1. 创建泛型 `FuzzSearchEngine<T>` 实现
-2. 内部复用现有 `StringMatcher`
-
-### Phase 3: SemanticSearchEngine
-1. 完善现有 `SemanticSearchEngine` 实现
-2. 创建 `SemanticSearchAdapter<T>` 桥接泛型接口
-
-### Phase 4: Settings.UI Migration
-1. `SettingEntry` 实现 `ISearchable`
-2. 创建 `SettingsSearchService`
-3. 迁移 `SearchIndexService` 到新架构
-4. 保持 API 兼容，逐步废弃旧方法
-
-### Phase 5: CompositeSearchEngine (Optional)
-1. 实现组合引擎
-2. 支持 Fuzzy + Semantic 混合搜索
-
-## Open Questions
-
-1. **是否需要支持图片搜索？** 当前 SemanticSearchEngine 支持 `IndexImage`，但 `ISearchable` 只有文本。如果需要图片，可能需要 `IImageSearchable` 扩展。
-
-2. **结果去重策略？** CompositeEngine 合并结果时，同一个 Item 可能被多个引擎匹配，如何去重和合并分数？
-
-3. **异步 vs 同步？** FuzzSearch 完全可以同步执行，但接口统一用 `Task` 是否合适？考虑提供同步重载？
-
-4. **索引更新策略？** 当 Settings 内容变化时（例如用户切换语言），如何高效更新索引？
-
----
-
-*Document Version: 1.0*
-*Last Updated: 2026-01-21*

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" />
   <Import Project="..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props" Condition="Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" />
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B3A354B0-1E54-4B55-A962-FB5AF9330C19}</ProjectGuid>
@@ -10,17 +11,16 @@
     <RootNamespace>PowerToysSetupCustomActionsVNext</RootNamespace>
     <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props')" />
   <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/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/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

@@ -1,8 +1,9 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h actionRunner.base.rc actionRunner.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(RepoRoot)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h actionRunner.base.rc actionRunner.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -10,11 +11,10 @@
     <RootNamespace>actionRunner</RootNamespace>
     <ProjectName>PowerToys.ActionRunner</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
-  <Import Project="..\..\deps\expected.props" />
+  <Import Project="$(RepoRoot)deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
@@ -59,17 +59,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

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/AppxManifest.xml

@@ -29,7 +29,6 @@
   </Resources>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.26226.0" />
-    <PackageDependency Name="Microsoft.WindowsAppRuntime.2.0-experimental4" MinVersion="0.738.2207.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
   <Capabilities>
     <Capability Name="internetClient" />
@@ -81,7 +80,6 @@
       <Extensions>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
-
             <com:ExeServer Executable="Microsoft.CmdPal.Ext.PowerToys.exe" Arguments="-RegisterProcessAsComServer" DisplayName="PowerToys Command Palette Extension">
               <com:Class Id="7EC02C7D-8F98-4A2E-9F23-B58C2C2F2B17" DisplayName="PowerToys Command Palette Extension" />
             </com:ExeServer>

src/PackageIdentity/BuildSparsePackage.ps1

@@ -320,19 +320,6 @@ try {
             }
         }
     }
-
-    # Include resources.pri in the sparse MSIX if available to enable MRT in packaged mode.
-    # Prefer a prebuilt resources.pri in output root; fall back to Settings pri.
-    $resourcesPriSource = Join-Path $outDir "resources.pri"
-    if (-not (Test-Path $resourcesPriSource)) {
-        $resourcesPriSource = Join-Path $outDir "WinUI3Apps\\PowerToys.Settings.pri"
-    }
-    if (Test-Path $resourcesPriSource) {
-        Copy-Item -Path $resourcesPriSource -Destination (Join-Path $stagingDir "resources.pri") -Force -ErrorAction SilentlyContinue
-        Write-BuildLog "Including resources.pri from: $resourcesPriSource" -Level Info
-    } else {
-        Write-BuildLog "resources.pri not found; strings may be missing in sparse identity." -Level Warning
-    }
     
     # Ensure publisher matches the dev certificate for local builds
     $manifestStagingPath = Join-Path $stagingDir 'AppxManifest.xml'

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

@@ -1,8 +1,9 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(RepoRoot)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -10,11 +11,10 @@
     <RootNamespace>Update</RootNamespace>
     <ProjectName>PowerToys.Update</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
-  <Import Project="..\..\deps\expected.props" />
+  <Import Project="$(RepoRoot)deps\expected.props" />
   <PropertyGroup>
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
@@ -65,17 +65,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/AllExperiments/AllExperiments.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>

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">
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -36,12 +36,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
@@ -37,10 +38,9 @@
     <_NoWinAPIFamilyApp>true</_NoWinAPIFamilyApp>
   </PropertyGroup>
   <!-- END cppwinrt.build.pre.props -->
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -66,7 +66,7 @@
   </ImportGroup>
   <PropertyGroup>
     <TargetName>CalculatorEngineCommon</TargetName>
-    <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(RepoRoot)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -138,16 +138,16 @@
     <ResourceCompile Include="CalculatorEngineCommon.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
   <!-- BEGIN common.build.post.props -->
   <!--

src/common/Common.Search/Common.Search.csproj

@@ -1,19 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <WarningsNotAsErrors>$(WarningsNotAsErrors);CS8305</WarningsNotAsErrors>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.WindowsAppSDK.AI" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
 </Project>

src/common/Common.Search/FuzzSearch/FuzzSearchEngine`1.cs

@@ -1,306 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Concurrent;
-using System.Globalization;
-using System.Text;
-
-namespace Common.Search.FuzzSearch;
-
-/// <summary>
-/// A search engine that uses fuzzy string matching for search.
-/// </summary>
-/// <typeparam name="T">The type of items to search.</typeparam>
-public sealed class FuzzSearchEngine<T> : ISearchEngine<T>
-    where T : ISearchable
-{
-    private readonly object _lockObject = new();
-    private readonly Dictionary<string, T> _itemsById = new();
-    private readonly Dictionary<string, (string PrimaryNorm, string? SecondaryNorm)> _normalizedCache = new();
-    private bool _isReady;
-    private bool _disposed;
-
-    /// <inheritdoc/>
-    public bool IsReady
-    {
-        get
-        {
-            lock (_lockObject)
-            {
-                return _isReady;
-            }
-        }
-    }
-
-    /// <inheritdoc/>
-    public SearchEngineCapabilities Capabilities { get; } = new()
-    {
-        SupportsFuzzyMatch = true,
-        SupportsSemanticSearch = false,
-        PersistsIndex = false,
-        SupportsIncrementalIndex = true,
-        SupportsMatchSpans = true,
-    };
-
-    /// <inheritdoc/>
-    public Task InitializeAsync(CancellationToken cancellationToken = default)
-    {
-        lock (_lockObject)
-        {
-            _isReady = true;
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task IndexAsync(T item, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(item);
-        ThrowIfDisposed();
-
-        lock (_lockObject)
-        {
-            _itemsById[item.Id] = item;
-            _normalizedCache[item.Id] = (
-                NormalizeString(item.SearchableText),
-                item.SecondarySearchableText != null ? NormalizeString(item.SecondarySearchableText) : null
-            );
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task IndexBatchAsync(IEnumerable<T> items, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(items);
-        ThrowIfDisposed();
-
-        lock (_lockObject)
-        {
-            foreach (var item in items)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    break;
-                }
-
-                _itemsById[item.Id] = item;
-                _normalizedCache[item.Id] = (
-                    NormalizeString(item.SearchableText),
-                    item.SecondarySearchableText != null ? NormalizeString(item.SecondarySearchableText) : null
-                );
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task RemoveAsync(string id, CancellationToken cancellationToken = default)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-        ThrowIfDisposed();
-
-        lock (_lockObject)
-        {
-            _itemsById.Remove(id);
-            _normalizedCache.Remove(id);
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task ClearAsync(CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-
-        lock (_lockObject)
-        {
-            _itemsById.Clear();
-            _normalizedCache.Clear();
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task<IReadOnlyList<SearchResult<T>>> SearchAsync(
-        string query,
-        SearchOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            return Task.FromResult<IReadOnlyList<SearchResult<T>>>(Array.Empty<SearchResult<T>>());
-        }
-
-        options ??= new SearchOptions();
-        var normalizedQuery = NormalizeString(query);
-
-        List<KeyValuePair<string, T>> snapshot;
-        lock (_lockObject)
-        {
-            if (_itemsById.Count == 0)
-            {
-                return Task.FromResult<IReadOnlyList<SearchResult<T>>>(Array.Empty<SearchResult<T>>());
-            }
-
-            snapshot = _itemsById.ToList();
-        }
-
-        var bag = new ConcurrentBag<SearchResult<T>>();
-        var po = new ParallelOptions
-        {
-            CancellationToken = cancellationToken,
-            MaxDegreeOfParallelism = Math.Max(1, Environment.ProcessorCount - 1),
-        };
-
-        try
-        {
-            Parallel.ForEach(snapshot, po, kvp =>
-            {
-                var (primaryNorm, secondaryNorm) = GetNormalizedTexts(kvp.Key);
-
-                var primaryResult = StringMatcher.FuzzyMatch(normalizedQuery, primaryNorm);
-                double score = primaryResult.Score;
-                List<int>? matchData = primaryResult.MatchData;
-
-                if (!string.IsNullOrEmpty(secondaryNorm))
-                {
-                    var secondaryResult = StringMatcher.FuzzyMatch(normalizedQuery, secondaryNorm);
-                    if (secondaryResult.Success && secondaryResult.Score * 0.8 > score)
-                    {
-                        score = secondaryResult.Score * 0.8;
-                        matchData = null; // Secondary matches don't have primary text spans
-                    }
-                }
-
-                if (score > options.MinScore)
-                {
-                    var result = new SearchResult<T>
-                    {
-                        Item = kvp.Value,
-                        Score = score,
-                        MatchKind = SearchMatchKind.Fuzzy,
-                        MatchSpans = options.IncludeMatchSpans && matchData != null
-                            ? ConvertToMatchSpans(matchData)
-                            : null,
-                    };
-
-                    bag.Add(result);
-                }
-            });
-        }
-        catch (OperationCanceledException)
-        {
-            return Task.FromResult<IReadOnlyList<SearchResult<T>>>(Array.Empty<SearchResult<T>>());
-        }
-
-        var results = bag
-            .OrderByDescending(r => r.Score)
-            .Take(options.MaxResults)
-            .ToList();
-
-        return Task.FromResult<IReadOnlyList<SearchResult<T>>>(results);
-    }
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        lock (_lockObject)
-        {
-            _itemsById.Clear();
-            _normalizedCache.Clear();
-            _isReady = false;
-        }
-
-        _disposed = true;
-    }
-
-    private (string PrimaryNorm, string? SecondaryNorm) GetNormalizedTexts(string id)
-    {
-        lock (_lockObject)
-        {
-            if (_normalizedCache.TryGetValue(id, out var cached))
-            {
-                return cached;
-            }
-        }
-
-        return (string.Empty, null);
-    }
-
-    private static IReadOnlyList<MatchSpan> ConvertToMatchSpans(List<int> matchData)
-    {
-        if (matchData == null || matchData.Count == 0)
-        {
-            return Array.Empty<MatchSpan>();
-        }
-
-        // Convert individual match indices to spans
-        var spans = new List<MatchSpan>();
-        var sortedIndices = matchData.OrderBy(i => i).ToList();
-
-        int start = sortedIndices[0];
-        int length = 1;
-
-        for (int i = 1; i < sortedIndices.Count; i++)
-        {
-            if (sortedIndices[i] == sortedIndices[i - 1] + 1)
-            {
-                // Consecutive index, extend the span
-                length++;
-            }
-            else
-            {
-                // Gap found, save current span and start new one
-                spans.Add(new MatchSpan(start, length));
-                start = sortedIndices[i];
-                length = 1;
-            }
-        }
-
-        // Add the last span
-        spans.Add(new MatchSpan(start, length));
-
-        return spans;
-    }
-
-    private static string NormalizeString(string? input)
-    {
-        if (string.IsNullOrEmpty(input))
-        {
-            return string.Empty;
-        }
-
-        var normalized = input.ToLowerInvariant().Normalize(NormalizationForm.FormKD);
-        var sb = new StringBuilder(normalized.Length);
-
-        foreach (var c in normalized)
-        {
-            var category = CharUnicodeInfo.GetUnicodeCategory(c);
-            if (category != UnicodeCategory.NonSpacingMark)
-            {
-                sb.Append(c);
-            }
-        }
-
-        return sb.ToString();
-    }
-
-    private void ThrowIfDisposed()
-    {
-        ObjectDisposedException.ThrowIf(_disposed, this);
-    }
-}

src/common/Common.Search/FuzzSearch/StringMatcher.cs

@@ -25,9 +25,9 @@ public class StringMatcher
     /// 6. Move onto the next substring's characters until all substrings are checked.
     /// 7. Consider success and move onto scoring if every char or substring without whitespaces matched
     /// </summary>
-    public static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption? opt = null)
+    public static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt = null)
     {
-        opt ??= new MatchOption();
+        opt = opt ?? new MatchOption();
 
         if (string.IsNullOrEmpty(stringToCompare))
         {

src/common/Common.Search/GlobalSuppressions.cs

@@ -11,10 +11,6 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.MatchResult._rawScore")]
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._defaultMatchOption")]
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.SemanticSearch.SemanticSearchIndex._indexName")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.SemanticSearch.SemanticSearchIndex._indexer")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.SemanticSearch.SemanticSearchIndex._disposed")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.SemanticSearch.SemanticSearchIndex._capabilities")]
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore)")]
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore,System.Collections.Generic.List{System.Int32},System.Int32)")]
 [assembly: SuppressMessage("Compiler", "CS8618:Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.", Justification = "Coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]

src/common/Common.Search/ISearchEngine`1.cs

@@ -1,73 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Defines a pluggable search engine that can index and search items.
-/// </summary>
-/// <typeparam name="T">The type of items to search, must implement ISearchable.</typeparam>
-public interface ISearchEngine<T> : IDisposable
-    where T : ISearchable
-{
-    /// <summary>
-    /// Gets a value indicating whether the engine is ready to search.
-    /// </summary>
-    bool IsReady { get; }
-
-    /// <summary>
-    /// Gets the engine capabilities.
-    /// </summary>
-    SearchEngineCapabilities Capabilities { get; }
-
-    /// <summary>
-    /// Initializes the search engine.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A task representing the async operation.</returns>
-    Task InitializeAsync(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Indexes a single item.
-    /// </summary>
-    /// <param name="item">The item to index.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A task representing the async operation.</returns>
-    Task IndexAsync(T item, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Indexes multiple items in batch.
-    /// </summary>
-    /// <param name="items">The items to index.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A task representing the async operation.</returns>
-    Task IndexBatchAsync(IEnumerable<T> items, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Removes an item from the index by its ID.
-    /// </summary>
-    /// <param name="id">The ID of the item to remove.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A task representing the async operation.</returns>
-    Task RemoveAsync(string id, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Clears all indexed items.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A task representing the async operation.</returns>
-    Task ClearAsync(CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Searches for items matching the query.
-    /// </summary>
-    /// <param name="query">The search query.</param>
-    /// <param name="options">Optional search options.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A list of search results ordered by relevance.</returns>
-    Task<IReadOnlyList<SearchResult<T>>> SearchAsync(
-        string query,
-        SearchOptions? options = null,
-        CancellationToken cancellationToken = default);
-}

src/common/Common.Search/ISearchable.cs

@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Defines a searchable item that can be indexed and searched.
-/// </summary>
-public interface ISearchable
-{
-    /// <summary>
-    /// Gets the unique identifier for this item.
-    /// </summary>
-    string Id { get; }
-
-    /// <summary>
-    /// Gets the primary searchable text (e.g., title, header).
-    /// </summary>
-    string SearchableText { get; }
-
-    /// <summary>
-    /// Gets optional secondary searchable text (e.g., description).
-    /// Returns null if not available.
-    /// </summary>
-    string? SecondarySearchableText { get; }
-}

src/common/Common.Search/MatchSpan.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Represents a span of matched text for highlighting.
-/// </summary>
-/// <param name="Start">The starting index of the match.</param>
-/// <param name="Length">The length of the match.</param>
-public readonly record struct MatchSpan(int Start, int Length);

src/common/Common.Search/SearchEngineCapabilities.cs

@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Describes the capabilities of a search engine.
-/// </summary>
-public sealed class SearchEngineCapabilities
-{
-    /// <summary>
-    /// Gets a value indicating whether the engine supports fuzzy matching.
-    /// </summary>
-    public bool SupportsFuzzyMatch { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports semantic search.
-    /// </summary>
-    public bool SupportsSemanticSearch { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine persists the index to disk.
-    /// </summary>
-    public bool PersistsIndex { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports incremental indexing.
-    /// </summary>
-    public bool SupportsIncrementalIndex { get; init; }
-
-    /// <summary>
-    /// Gets a value indicating whether the engine supports match span highlighting.
-    /// </summary>
-    public bool SupportsMatchSpans { get; init; }
-}

src/common/Common.Search/SearchError.cs

@@ -1,134 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Represents an error that occurred during a search operation.
-/// </summary>
-public sealed class SearchError
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SearchError"/> class.
-    /// </summary>
-    /// <param name="code">The error code.</param>
-    /// <param name="message">The error message.</param>
-    /// <param name="details">Optional additional details.</param>
-    /// <param name="exception">Optional exception that caused the error.</param>
-    public SearchError(SearchErrorCode code, string message, string? details = null, Exception? exception = null)
-    {
-        Code = code;
-        Message = message;
-        Details = details;
-        Exception = exception;
-        Timestamp = DateTime.UtcNow;
-    }
-
-    /// <summary>
-    /// Gets the error code.
-    /// </summary>
-    public SearchErrorCode Code { get; }
-
-    /// <summary>
-    /// Gets the error message.
-    /// </summary>
-    public string Message { get; }
-
-    /// <summary>
-    /// Gets additional details about the error.
-    /// </summary>
-    public string? Details { get; }
-
-    /// <summary>
-    /// Gets the exception that caused the error, if any.
-    /// </summary>
-    public Exception? Exception { get; }
-
-    /// <summary>
-    /// Gets the timestamp when the error occurred.
-    /// </summary>
-    public DateTime Timestamp { get; }
-
-    /// <summary>
-    /// Creates an error for initialization failure.
-    /// </summary>
-    /// <param name="indexName">The name of the index.</param>
-    /// <param name="details">Optional details.</param>
-    /// <param name="exception">Optional exception.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError InitializationFailed(string indexName, string? details = null, Exception? exception = null)
-        => new(SearchErrorCode.InitializationFailed, $"Failed to initialize search index '{indexName}'.", details, exception);
-
-    /// <summary>
-    /// Creates an error for indexing failure.
-    /// </summary>
-    /// <param name="contentId">The ID of the content that failed to index.</param>
-    /// <param name="details">Optional details.</param>
-    /// <param name="exception">Optional exception.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError IndexingFailed(string contentId, string? details = null, Exception? exception = null)
-        => new(SearchErrorCode.IndexingFailed, $"Failed to index content '{contentId}'.", details, exception);
-
-    /// <summary>
-    /// Creates an error for search query failure.
-    /// </summary>
-    /// <param name="query">The search query that failed.</param>
-    /// <param name="details">Optional details.</param>
-    /// <param name="exception">Optional exception.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError SearchFailed(string query, string? details = null, Exception? exception = null)
-        => new(SearchErrorCode.SearchFailed, $"Search query '{query}' failed.", details, exception);
-
-    /// <summary>
-    /// Creates an error for engine not ready.
-    /// </summary>
-    /// <param name="operation">The operation that was attempted.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError EngineNotReady(string operation)
-        => new(SearchErrorCode.EngineNotReady, $"Search engine is not ready. Operation '{operation}' cannot be performed.");
-
-    /// <summary>
-    /// Creates an error for capability unavailable.
-    /// </summary>
-    /// <param name="capability">The capability that is unavailable.</param>
-    /// <param name="details">Optional details.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError CapabilityUnavailable(string capability, string? details = null)
-        => new(SearchErrorCode.CapabilityUnavailable, $"Search capability '{capability}' is not available.", details);
-
-    /// <summary>
-    /// Creates an error for timeout.
-    /// </summary>
-    /// <param name="operation">The operation that timed out.</param>
-    /// <param name="timeout">The timeout duration.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError Timeout(string operation, TimeSpan timeout)
-        => new(SearchErrorCode.Timeout, $"Operation '{operation}' timed out after {timeout.TotalSeconds:F1} seconds.");
-
-    /// <summary>
-    /// Creates an error for an unexpected error.
-    /// </summary>
-    /// <param name="operation">The operation that failed.</param>
-    /// <param name="exception">The exception that occurred.</param>
-    /// <returns>A new SearchError instance.</returns>
-    public static SearchError Unexpected(string operation, Exception exception)
-        => new(SearchErrorCode.Unexpected, $"Unexpected error during '{operation}'.", exception.Message, exception);
-
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-        var result = $"[{Code}] {Message}";
-        if (!string.IsNullOrEmpty(Details))
-        {
-            result += $" Details: {Details}";
-        }
-
-        if (Exception != null)
-        {
-            result += $" Exception: {Exception.GetType().Name}: {Exception.Message}";
-        }
-
-        return result;
-    }
-}

src/common/Common.Search/SearchErrorCode.cs

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Defines error codes for search operations.
-/// </summary>
-public enum SearchErrorCode
-{
-    /// <summary>
-    /// No error occurred.
-    /// </summary>
-    None = 0,
-
-    /// <summary>
-    /// The search engine failed to initialize.
-    /// </summary>
-    InitializationFailed = 1,
-
-    /// <summary>
-    /// Failed to index content.
-    /// </summary>
-    IndexingFailed = 2,
-
-    /// <summary>
-    /// The search query failed to execute.
-    /// </summary>
-    SearchFailed = 3,
-
-    /// <summary>
-    /// The search engine is not ready to perform the operation.
-    /// </summary>
-    EngineNotReady = 4,
-
-    /// <summary>
-    /// A required capability is not available.
-    /// </summary>
-    CapabilityUnavailable = 5,
-
-    /// <summary>
-    /// The operation timed out.
-    /// </summary>
-    Timeout = 6,
-
-    /// <summary>
-    /// An unexpected error occurred.
-    /// </summary>
-    Unexpected = 99,
-}

src/common/Common.Search/SearchMatchKind.cs

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Specifies the kind of match that produced a search result.
-/// </summary>
-public enum SearchMatchKind
-{
-    /// <summary>
-    /// Exact text match.
-    /// </summary>
-    Exact,
-
-    /// <summary>
-    /// Fuzzy/approximate text match.
-    /// </summary>
-    Fuzzy,
-
-    /// <summary>
-    /// Semantic/AI-based match.
-    /// </summary>
-    Semantic,
-
-    /// <summary>
-    /// Combined match from multiple engines.
-    /// </summary>
-    Composite,
-}

src/common/Common.Search/SearchOperationResult.cs

@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Represents the result of a search operation that may have errors.
-/// </summary>
-public sealed class SearchOperationResult
-{
-    private SearchOperationResult(bool success, SearchError? error = null)
-    {
-        IsSuccess = success;
-        Error = error;
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the operation was successful.
-    /// </summary>
-    public bool IsSuccess { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the operation failed.
-    /// </summary>
-    public bool IsFailure => !IsSuccess;
-
-    /// <summary>
-    /// Gets the error if the operation failed, null otherwise.
-    /// </summary>
-    public SearchError? Error { get; }
-
-    /// <summary>
-    /// Creates a successful result.
-    /// </summary>
-    /// <returns>A successful SearchOperationResult.</returns>
-    public static SearchOperationResult Success() => new(true);
-
-    /// <summary>
-    /// Creates a failed result with the specified error.
-    /// </summary>
-    /// <param name="error">The error that caused the failure.</param>
-    /// <returns>A failed SearchOperationResult.</returns>
-    public static SearchOperationResult Failure(SearchError error)
-    {
-        ArgumentNullException.ThrowIfNull(error);
-        return new SearchOperationResult(false, error);
-    }
-
-    /// <inheritdoc/>
-    public override string ToString()
-        => IsSuccess ? "Success" : $"Failure: {Error}";
-}

src/common/Common.Search/SearchOperationResult1.cs

@@ -1,87 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.CodeAnalysis;
-
-#pragma warning disable SA1649 // File name should match first type name - Generic type file naming convention
-
-namespace Common.Search;
-
-/// <summary>
-/// Represents the result of a search operation that returns a value and may have errors.
-/// </summary>
-/// <typeparam name="T">The type of the result value.</typeparam>
-public sealed class SearchOperationResult<T>
-{
-    private SearchOperationResult(bool success, T? value, SearchError? error)
-    {
-        IsSuccess = success;
-        Value = value;
-        Error = error;
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the operation was successful.
-    /// </summary>
-    public bool IsSuccess { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the operation failed.
-    /// </summary>
-    public bool IsFailure => !IsSuccess;
-
-    /// <summary>
-    /// Gets the result value if the operation was successful.
-    /// </summary>
-    public T? Value { get; }
-
-    /// <summary>
-    /// Gets the error if the operation failed, null otherwise.
-    /// </summary>
-    public SearchError? Error { get; }
-
-    /// <summary>
-    /// Gets the value or a default if the operation failed.
-    /// </summary>
-    /// <param name="defaultValue">The default value to return if the operation failed.</param>
-    /// <returns>The value if successful, otherwise the default value.</returns>
-    public T GetValueOrDefault(T defaultValue) => IsSuccess && Value is not null ? Value : defaultValue;
-
-    /// <inheritdoc/>
-    public override string ToString()
-        => IsSuccess ? $"Success: {Value}" : $"Failure: {Error}";
-
-    /// <summary>
-    /// Creates a successful result with the specified value.
-    /// </summary>
-    /// <param name="value">The result value.</param>
-    /// <returns>A successful SearchOperationResult.</returns>
-    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "Factory method pattern is the idiomatic way to create instances of generic result types")]
-    public static SearchOperationResult<T> Success(T value) => new(true, value, null);
-
-    /// <summary>
-    /// Creates a failed result with the specified error.
-    /// </summary>
-    /// <param name="error">The error that caused the failure.</param>
-    /// <returns>A failed SearchOperationResult.</returns>
-    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "Factory method pattern is the idiomatic way to create instances of generic result types")]
-    public static SearchOperationResult<T> Failure(SearchError error)
-    {
-        ArgumentNullException.ThrowIfNull(error);
-        return new SearchOperationResult<T>(false, default, error);
-    }
-
-    /// <summary>
-    /// Creates a failed result with the specified error and a fallback value.
-    /// </summary>
-    /// <param name="error">The error that caused the failure.</param>
-    /// <param name="fallbackValue">A fallback value to use despite the failure.</param>
-    /// <returns>A failed SearchOperationResult with a fallback value.</returns>
-    [SuppressMessage("Design", "CA1000:Do not declare static members on generic types", Justification = "Factory method pattern is the idiomatic way to create instances of generic result types")]
-    public static SearchOperationResult<T> FailureWithFallback(SearchError error, T fallbackValue)
-    {
-        ArgumentNullException.ThrowIfNull(error);
-        return new SearchOperationResult<T>(false, fallbackValue, error);
-    }
-}

src/common/Common.Search/SearchOptions.cs

@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Options for configuring search behavior.
-/// </summary>
-public sealed class SearchOptions
-{
-    /// <summary>
-    /// Gets or sets the maximum number of results to return.
-    /// Default is 20.
-    /// </summary>
-    public int MaxResults { get; set; } = 20;
-
-    /// <summary>
-    /// Gets or sets the minimum score threshold.
-    /// Results below this score are filtered out.
-    /// Default is 0.0 (no filtering).
-    /// </summary>
-    public double MinScore { get; set; }
-
-    /// <summary>
-    /// Gets or sets the language hint for the search (e.g., "en-US").
-    /// </summary>
-    public string? Language { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether to include match spans for highlighting.
-    /// Default is false.
-    /// </summary>
-    public bool IncludeMatchSpans { get; set; }
-}

src/common/Common.Search/SearchResult`1.cs

@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search;
-
-/// <summary>
-/// Represents a search result with the matched item and scoring information.
-/// </summary>
-/// <typeparam name="T">The type of the matched item.</typeparam>
-public sealed class SearchResult<T>
-    where T : ISearchable
-{
-    /// <summary>
-    /// Gets the matched item.
-    /// </summary>
-    public required T Item { get; init; }
-
-    /// <summary>
-    /// Gets the relevance score (higher is more relevant).
-    /// </summary>
-    public required double Score { get; init; }
-
-    /// <summary>
-    /// Gets the type of match that produced this result.
-    /// </summary>
-    public required SearchMatchKind MatchKind { get; init; }
-
-    /// <summary>
-    /// Gets the match details for highlighting (optional).
-    /// </summary>
-    public IReadOnlyList<MatchSpan>? MatchSpans { get; init; }
-}

src/common/Common.Search/SemanticSearch/SemanticSearchCapabilities.cs

@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Represents the capabilities of the semantic search index.
-/// </summary>
-public class SemanticSearchCapabilities
-{
-    /// <summary>
-    /// Gets or sets a value indicating whether text lexical (keyword) search is available.
-    /// </summary>
-    public bool TextLexicalAvailable { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether text semantic (AI embedding) search is available.
-    /// </summary>
-    public bool TextSemanticAvailable { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether image semantic search is available.
-    /// </summary>
-    public bool ImageSemanticAvailable { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether image OCR search is available.
-    /// </summary>
-    public bool ImageOcrAvailable { get; set; }
-
-    /// <summary>
-    /// Gets a value indicating whether any search capability is available.
-    /// </summary>
-    public bool AnyAvailable => TextLexicalAvailable || TextSemanticAvailable || ImageSemanticAvailable || ImageOcrAvailable;
-
-    /// <summary>
-    /// Gets a value indicating whether text search (lexical or semantic) is available.
-    /// </summary>
-    public bool TextSearchAvailable => TextLexicalAvailable || TextSemanticAvailable;
-
-    /// <summary>
-    /// Gets a value indicating whether image search (semantic or OCR) is available.
-    /// </summary>
-    public bool ImageSearchAvailable => ImageSemanticAvailable || ImageOcrAvailable;
-}

src/common/Common.Search/SemanticSearch/SemanticSearchContentKind.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Specifies the kind of content in a semantic search result.
-/// </summary>
-public enum SemanticSearchContentKind
-{
-    /// <summary>
-    /// Text content.
-    /// </summary>
-    Text,
-
-    /// <summary>
-    /// Image content.
-    /// </summary>
-    Image,
-}

src/common/Common.Search/SemanticSearch/SemanticSearchEngine`1.cs

@@ -1,406 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using ManagedCommon;
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// A semantic search engine that implements the common search interface.
-/// </summary>
-/// <typeparam name="T">The type of items to search.</typeparam>
-public sealed class SemanticSearchEngine<T> : ISearchEngine<T>
-    where T : ISearchable
-{
-    private readonly SemanticSearchIndex _index;
-    private readonly Dictionary<string, T> _itemsById = new();
-    private readonly object _lockObject = new();
-    private bool _disposed;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SemanticSearchEngine{T}"/> class.
-    /// </summary>
-    /// <param name="indexName">The name of the search index.</param>
-    public SemanticSearchEngine(string indexName)
-    {
-        Logger.LogDebug($"[SemanticSearchEngine] Creating engine. IndexName={indexName}, ItemType={typeof(T).Name}");
-        _index = new SemanticSearchIndex(indexName);
-    }
-
-    /// <inheritdoc/>
-    public bool IsReady => _index.IsInitialized;
-
-    /// <inheritdoc/>
-    public SearchEngineCapabilities Capabilities { get; } = new()
-    {
-        SupportsFuzzyMatch = true,
-        SupportsSemanticSearch = true,
-        PersistsIndex = true,
-        SupportsIncrementalIndex = true,
-        SupportsMatchSpans = false,
-    };
-
-    /// <summary>
-    /// Gets the underlying semantic search capabilities.
-    /// </summary>
-    public SemanticSearchCapabilities? SemanticCapabilities => _index.Capabilities;
-
-    /// <summary>
-    /// Gets the last error that occurred during a search operation, or null if no error occurred.
-    /// </summary>
-    public SearchError? LastError => _index.LastError;
-
-    /// <summary>
-    /// Occurs when the semantic search capabilities change.
-    /// </summary>
-    public event EventHandler<SemanticSearchCapabilities>? CapabilitiesChanged
-    {
-        add => _index.CapabilitiesChanged += value;
-        remove => _index.CapabilitiesChanged -= value;
-    }
-
-    /// <inheritdoc/>
-    public async Task InitializeAsync(CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-        Logger.LogInfo($"[SemanticSearchEngine] InitializeAsync starting. ItemType={typeof(T).Name}");
-        var result = await _index.InitializeAsync().ConfigureAwait(false);
-
-        if (result.IsFailure)
-        {
-            Logger.LogWarning($"[SemanticSearchEngine] InitializeAsync failed. ItemType={typeof(T).Name}, Error={result.Error?.Message}");
-        }
-        else
-        {
-            Logger.LogInfo($"[SemanticSearchEngine] InitializeAsync completed. ItemType={typeof(T).Name}");
-        }
-
-        // Note: We don't throw here to maintain backward compatibility,
-        // but callers can check LastError for details if initialization failed.
-    }
-
-    /// <summary>
-    /// Initializes the search engine and returns the result with error details if any.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public async Task<SearchOperationResult> InitializeWithResultAsync(CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-        return await _index.InitializeAsync().ConfigureAwait(false);
-    }
-
-    /// <inheritdoc/>
-    public Task IndexAsync(T item, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(item);
-        ThrowIfDisposed();
-
-        var text = BuildSearchableText(item);
-        if (string.IsNullOrWhiteSpace(text))
-        {
-            Logger.LogDebug($"[SemanticSearchEngine] IndexAsync skipped (empty text). Id={item.Id}");
-            return Task.CompletedTask;
-        }
-
-        lock (_lockObject)
-        {
-            _itemsById[item.Id] = item;
-        }
-
-        Logger.LogDebug($"[SemanticSearchEngine] IndexAsync. Id={item.Id}, TextLength={text.Length}");
-
-        // Note: Errors are captured in LastError for external logging
-        _ = _index.IndexText(item.Id, text);
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Indexes a single item and returns the result with error details if any.
-    /// </summary>
-    /// <param name="item">The item to index.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public Task<SearchOperationResult> IndexWithResultAsync(T item, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(item);
-        ThrowIfDisposed();
-
-        var text = BuildSearchableText(item);
-        if (string.IsNullOrWhiteSpace(text))
-        {
-            return Task.FromResult(SearchOperationResult.Success());
-        }
-
-        lock (_lockObject)
-        {
-            _itemsById[item.Id] = item;
-        }
-
-        return Task.FromResult(_index.IndexText(item.Id, text));
-    }
-
-    /// <inheritdoc/>
-    public Task IndexBatchAsync(IEnumerable<T> items, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(items);
-        ThrowIfDisposed();
-
-        var batch = new List<(string Id, string Text)>();
-
-        lock (_lockObject)
-        {
-            foreach (var item in items)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    Logger.LogDebug($"[SemanticSearchEngine] IndexBatchAsync cancelled. ItemsProcessed={batch.Count}");
-                    break;
-                }
-
-                var text = BuildSearchableText(item);
-                if (!string.IsNullOrWhiteSpace(text))
-                {
-                    _itemsById[item.Id] = item;
-                    batch.Add((item.Id, text));
-                }
-            }
-        }
-
-        Logger.LogInfo($"[SemanticSearchEngine] IndexBatchAsync. BatchSize={batch.Count}");
-
-        // Note: Errors are captured in LastError for external logging
-        _ = _index.IndexTextBatch(batch);
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Indexes multiple items in batch and returns the result with error details if any.
-    /// </summary>
-    /// <param name="items">The items to index.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public Task<SearchOperationResult> IndexBatchWithResultAsync(IEnumerable<T> items, CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(items);
-        ThrowIfDisposed();
-
-        var batch = new List<(string Id, string Text)>();
-
-        lock (_lockObject)
-        {
-            foreach (var item in items)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    break;
-                }
-
-                var text = BuildSearchableText(item);
-                if (!string.IsNullOrWhiteSpace(text))
-                {
-                    _itemsById[item.Id] = item;
-                    batch.Add((item.Id, text));
-                }
-            }
-        }
-
-        return Task.FromResult(_index.IndexTextBatch(batch));
-    }
-
-    /// <inheritdoc/>
-    public Task RemoveAsync(string id, CancellationToken cancellationToken = default)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-        ThrowIfDisposed();
-
-        lock (_lockObject)
-        {
-            _itemsById.Remove(id);
-        }
-
-        Logger.LogDebug($"[SemanticSearchEngine] RemoveAsync. Id={id}");
-
-        // Note: Errors are captured in LastError for external logging
-        _ = _index.Remove(id);
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task ClearAsync(CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-
-        int count;
-        lock (_lockObject)
-        {
-            count = _itemsById.Count;
-            _itemsById.Clear();
-        }
-
-        Logger.LogInfo($"[SemanticSearchEngine] ClearAsync. ItemsCleared={count}");
-
-        // Note: Errors are captured in LastError for external logging
-        _ = _index.RemoveAll();
-        return Task.CompletedTask;
-    }
-
-    /// <inheritdoc/>
-    public Task<IReadOnlyList<SearchResult<T>>> SearchAsync(
-        string query,
-        SearchOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            Logger.LogDebug($"[SemanticSearchEngine] SearchAsync skipped (empty query).");
-            return Task.FromResult<IReadOnlyList<SearchResult<T>>>(Array.Empty<SearchResult<T>>());
-        }
-
-        options ??= new SearchOptions();
-        Logger.LogDebug($"[SemanticSearchEngine] SearchAsync starting. Query={query}, MaxResults={options.MaxResults}");
-
-        var semanticOptions = new SemanticSearchOptions
-        {
-            MaxResults = options.MaxResults,
-            Language = options.Language,
-            MatchScope = SemanticSearchMatchScope.Unconstrained,
-            TextMatchType = SemanticSearchTextMatchType.Fuzzy,
-        };
-
-        var searchResult = _index.SearchText(query, semanticOptions);
-
-        // Note: Errors are captured in LastError for external logging
-        var matches = searchResult.Value ?? Array.Empty<SemanticSearchResult>();
-        var results = new List<SearchResult<T>>();
-
-        lock (_lockObject)
-        {
-            foreach (var match in matches)
-            {
-                if (_itemsById.TryGetValue(match.ContentId, out var item))
-                {
-                    results.Add(new SearchResult<T>
-                    {
-                        Item = item,
-                        Score = 100.0, // Semantic search doesn't return scores, use fixed value
-                        MatchKind = SearchMatchKind.Semantic,
-                        MatchSpans = null,
-                    });
-                }
-            }
-        }
-
-        Logger.LogDebug($"[SemanticSearchEngine] SearchAsync completed. Query={query}, Matches={matches.Count}, Results={results.Count}");
-        return Task.FromResult<IReadOnlyList<SearchResult<T>>>(results);
-    }
-
-    /// <summary>
-    /// Searches for items matching the query and returns the result with error details if any.
-    /// </summary>
-    /// <param name="query">The search query.</param>
-    /// <param name="options">Optional search options.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>A result containing search results or error details.</returns>
-    public Task<SearchOperationResult<IReadOnlyList<SearchResult<T>>>> SearchWithResultAsync(
-        string query,
-        SearchOptions? options = null,
-        CancellationToken cancellationToken = default)
-    {
-        ThrowIfDisposed();
-
-        if (string.IsNullOrWhiteSpace(query))
-        {
-            return Task.FromResult(SearchOperationResult<IReadOnlyList<SearchResult<T>>>.Success(Array.Empty<SearchResult<T>>()));
-        }
-
-        options ??= new SearchOptions();
-
-        var semanticOptions = new SemanticSearchOptions
-        {
-            MaxResults = options.MaxResults,
-            Language = options.Language,
-            MatchScope = SemanticSearchMatchScope.Unconstrained,
-            TextMatchType = SemanticSearchTextMatchType.Fuzzy,
-        };
-
-        var searchResult = _index.SearchText(query, semanticOptions);
-        var matches = searchResult.Value ?? Array.Empty<SemanticSearchResult>();
-        var results = new List<SearchResult<T>>();
-
-        lock (_lockObject)
-        {
-            foreach (var match in matches)
-            {
-                if (_itemsById.TryGetValue(match.ContentId, out var item))
-                {
-                    results.Add(new SearchResult<T>
-                    {
-                        Item = item,
-                        Score = 100.0,
-                        MatchKind = SearchMatchKind.Semantic,
-                        MatchSpans = null,
-                    });
-                }
-            }
-        }
-
-        if (searchResult.IsFailure)
-        {
-            return Task.FromResult(SearchOperationResult<IReadOnlyList<SearchResult<T>>>.FailureWithFallback(searchResult.Error!, results));
-        }
-
-        return Task.FromResult(SearchOperationResult<IReadOnlyList<SearchResult<T>>>.Success(results));
-    }
-
-    /// <summary>
-    /// Waits for the indexing process to complete.
-    /// </summary>
-    /// <param name="timeout">The maximum time to wait.</param>
-    /// <returns>A task representing the async operation.</returns>
-    public async Task WaitForIndexingCompleteAsync(TimeSpan timeout)
-    {
-        ThrowIfDisposed();
-        await _index.WaitForIndexingCompleteAsync(timeout).ConfigureAwait(false);
-    }
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        Logger.LogDebug($"[SemanticSearchEngine] Disposing. ItemType={typeof(T).Name}");
-        _index.Dispose();
-
-        lock (_lockObject)
-        {
-            _itemsById.Clear();
-        }
-
-        _disposed = true;
-    }
-
-    private static string BuildSearchableText(T item)
-    {
-        var primary = item.SearchableText ?? string.Empty;
-        var secondary = item.SecondarySearchableText;
-
-        if (string.IsNullOrWhiteSpace(secondary))
-        {
-            return primary;
-        }
-
-        return $"{primary} {secondary}";
-    }
-
-    private void ThrowIfDisposed()
-    {
-        ObjectDisposedException.ThrowIf(_disposed, this);
-    }
-}

src/common/Common.Search/SemanticSearch/SemanticSearchIndex.cs

@@ -1,455 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using ManagedCommon;
-using Microsoft.Windows.Search.AppContentIndex;
-using Windows.Graphics.Imaging;
-using SearchOperationResult = Common.Search.SearchOperationResult;
-using SearchOperationResultT = Common.Search.SearchOperationResult<System.Collections.Generic.IReadOnlyList<Common.Search.SemanticSearch.SemanticSearchResult>>;
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// A semantic search engine powered by Windows App SDK AI Search APIs.
-/// Provides text and image indexing with lexical and semantic search capabilities.
-/// </summary>
-public sealed class SemanticSearchIndex : IDisposable
-{
-    private readonly string _indexName;
-    private AppContentIndexer? _indexer;
-    private bool _disposed;
-    private SemanticSearchCapabilities? _capabilities;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SemanticSearchIndex"/> class.
-    /// </summary>
-    /// <param name="indexName">The name of the search index.</param>
-    public SemanticSearchIndex(string indexName)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(indexName);
-        _indexName = indexName;
-    }
-
-    /// <summary>
-    /// Gets the last error that occurred during an operation, or null if no error occurred.
-    /// </summary>
-    public SearchError? LastError { get; private set; }
-
-    /// <summary>
-    /// Occurs when the index capabilities change.
-    /// </summary>
-    public event EventHandler<SemanticSearchCapabilities>? CapabilitiesChanged;
-
-    /// <summary>
-    /// Gets a value indicating whether the search engine is initialized.
-    /// </summary>
-    public bool IsInitialized => _indexer != null;
-
-    /// <summary>
-    /// Gets the current index capabilities, or null if not initialized.
-    /// </summary>
-    public SemanticSearchCapabilities? Capabilities => _capabilities;
-
-    /// <summary>
-    /// Initializes the search engine and creates or opens the index.
-    /// </summary>
-    /// <returns>A task that represents the asynchronous operation. Returns a result indicating success or failure with error details.</returns>
-    public async Task<SearchOperationResult> InitializeAsync()
-    {
-        ThrowIfDisposed();
-        LastError = null;
-
-        if (_indexer != null)
-        {
-            Logger.LogDebug($"[SemanticSearchIndex] Already initialized. IndexName={_indexName}");
-            return SearchOperationResult.Success();
-        }
-
-        Logger.LogInfo($"[SemanticSearchIndex] Initializing. IndexName={_indexName}");
-
-        try
-        {
-            var result = AppContentIndexer.GetOrCreateIndex(_indexName);
-            if (!result.Succeeded)
-            {
-                var errorDetails = $"Succeeded={result.Succeeded}, ExtendedError={result.ExtendedError}";
-                Logger.LogError($"[SemanticSearchIndex] GetOrCreateIndex failed. IndexName={_indexName}, {errorDetails}");
-                LastError = SearchError.InitializationFailed(_indexName, errorDetails);
-                return SearchOperationResult.Failure(LastError);
-            }
-
-            _indexer = result.Indexer;
-
-            // Wait for index capabilities to be ready
-            Logger.LogDebug($"[SemanticSearchIndex] Waiting for index capabilities. IndexName={_indexName}");
-            await _indexer.WaitForIndexCapabilitiesAsync();
-
-            // Load capabilities
-            _capabilities = LoadCapabilities();
-            Logger.LogInfo($"[SemanticSearchIndex] Initialized successfully. IndexName={_indexName}, TextLexical={_capabilities.TextLexicalAvailable}, TextSemantic={_capabilities.TextSemanticAvailable}, ImageSemantic={_capabilities.ImageSemanticAvailable}, ImageOcr={_capabilities.ImageOcrAvailable}");
-
-            // Subscribe to capability changes
-            _indexer.Listener.IndexCapabilitiesChanged += OnIndexCapabilitiesChanged;
-
-            return SearchOperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] Initialization failed with exception. IndexName={_indexName}", ex);
-            LastError = SearchError.InitializationFailed(_indexName, ex.Message, ex);
-            return SearchOperationResult.Failure(LastError);
-        }
-    }
-
-    /// <summary>
-    /// Waits for the indexing process to complete.
-    /// </summary>
-    /// <param name="timeout">The maximum time to wait for indexing to complete.</param>
-    /// <returns>A task that represents the asynchronous operation.</returns>
-    public async Task WaitForIndexingCompleteAsync(TimeSpan timeout)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-
-        await _indexer!.WaitForIndexingIdleAsync(timeout);
-    }
-
-    /// <summary>
-    /// Gets the current index capabilities.
-    /// </summary>
-    /// <returns>The current capabilities of the search index.</returns>
-    public SemanticSearchCapabilities GetCapabilities()
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-
-        return _capabilities ?? LoadCapabilities();
-    }
-
-    /// <summary>
-    /// Adds or updates text content in the index.
-    /// </summary>
-    /// <param name="id">The unique identifier for the content.</param>
-    /// <param name="text">The text content to index.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public SearchOperationResult IndexText(string id, string text)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-        ArgumentException.ThrowIfNullOrWhiteSpace(text);
-
-        try
-        {
-            var content = AppManagedIndexableAppContent.CreateFromString(id, text);
-            _indexer!.AddOrUpdate(content);
-            return SearchOperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] IndexText failed. Id={id}", ex);
-            LastError = SearchError.IndexingFailed(id, ex.Message, ex);
-            return SearchOperationResult.Failure(LastError);
-        }
-    }
-
-    /// <summary>
-    /// Adds or updates multiple text contents in the index.
-    /// </summary>
-    /// <param name="items">A collection of id-text pairs to index.</param>
-    /// <returns>A result indicating success or failure with error details. Contains the first error encountered if any.</returns>
-    public SearchOperationResult IndexTextBatch(IEnumerable<(string Id, string Text)> items)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentNullException.ThrowIfNull(items);
-
-        SearchError? firstError = null;
-
-        foreach (var (id, text) in items)
-        {
-            if (!string.IsNullOrWhiteSpace(id) && !string.IsNullOrWhiteSpace(text))
-            {
-                try
-                {
-                    var content = AppManagedIndexableAppContent.CreateFromString(id, text);
-                    _indexer!.AddOrUpdate(content);
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"[SemanticSearchIndex] IndexTextBatch item failed. Id={id}", ex);
-                    firstError ??= SearchError.IndexingFailed(id, ex.Message, ex);
-                }
-            }
-        }
-
-        if (firstError != null)
-        {
-            LastError = firstError;
-            return SearchOperationResult.Failure(firstError);
-        }
-
-        return SearchOperationResult.Success();
-    }
-
-    /// <summary>
-    /// Adds or updates image content in the index.
-    /// </summary>
-    /// <param name="id">The unique identifier for the image.</param>
-    /// <param name="bitmap">The image bitmap to index.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public SearchOperationResult IndexImage(string id, SoftwareBitmap bitmap)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-        ArgumentNullException.ThrowIfNull(bitmap);
-
-        try
-        {
-            var content = AppManagedIndexableAppContent.CreateFromBitmap(id, bitmap);
-            _indexer!.AddOrUpdate(content);
-            return SearchOperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] IndexImage failed. Id={id}", ex);
-            LastError = SearchError.IndexingFailed(id, ex.Message, ex);
-            return SearchOperationResult.Failure(LastError);
-        }
-    }
-
-    /// <summary>
-    /// Removes content from the index by its identifier.
-    /// </summary>
-    /// <param name="id">The unique identifier of the content to remove.</param>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public SearchOperationResult Remove(string id)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-
-        try
-        {
-            _indexer!.Remove(id);
-            return SearchOperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] Remove failed. Id={id}", ex);
-            LastError = SearchError.Unexpected("Remove", ex);
-            return SearchOperationResult.Failure(LastError);
-        }
-    }
-
-    /// <summary>
-    /// Removes all content from the index.
-    /// </summary>
-    /// <returns>A result indicating success or failure with error details.</returns>
-    public SearchOperationResult RemoveAll()
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-
-        try
-        {
-            _indexer!.RemoveAll();
-            return SearchOperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] RemoveAll failed.", ex);
-            LastError = SearchError.Unexpected("RemoveAll", ex);
-            return SearchOperationResult.Failure(LastError);
-        }
-    }
-
-    /// <summary>
-    /// Searches for text content in the index.
-    /// </summary>
-    /// <param name="searchText">The text to search for.</param>
-    /// <param name="options">Optional search options.</param>
-    /// <returns>A result containing search results or error details.</returns>
-    public SearchOperationResultT SearchText(string searchText, SemanticSearchOptions? options = null)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentException.ThrowIfNullOrWhiteSpace(searchText);
-
-        options ??= new SemanticSearchOptions();
-
-        try
-        {
-            var queryOptions = new TextQueryOptions
-            {
-                MatchScope = ConvertMatchScope(options.MatchScope),
-                TextMatchType = ConvertTextMatchType(options.TextMatchType),
-            };
-
-            if (!string.IsNullOrEmpty(options.Language))
-            {
-                queryOptions.Language = options.Language;
-            }
-
-            var query = _indexer!.CreateTextQuery(searchText, queryOptions);
-            var matches = query.GetNextMatches(options.MaxResults);
-
-            return SearchOperationResultT.Success(ConvertTextMatches(matches));
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] SearchText failed. Query={searchText}", ex);
-            LastError = SearchError.SearchFailed(searchText, ex.Message, ex);
-            return SearchOperationResultT.FailureWithFallback(LastError, Array.Empty<SemanticSearchResult>());
-        }
-    }
-
-    /// <summary>
-    /// Searches for image content in the index using text.
-    /// </summary>
-    /// <param name="searchText">The text to search for in images.</param>
-    /// <param name="options">Optional search options.</param>
-    /// <returns>A result containing search results or error details.</returns>
-    public SearchOperationResultT SearchImages(string searchText, SemanticSearchOptions? options = null)
-    {
-        ThrowIfDisposed();
-        ThrowIfNotInitialized();
-        ArgumentException.ThrowIfNullOrWhiteSpace(searchText);
-
-        options ??= new SemanticSearchOptions();
-
-        try
-        {
-            var queryOptions = new ImageQueryOptions
-            {
-                MatchScope = ConvertMatchScope(options.MatchScope),
-                ImageOcrTextMatchType = ConvertTextMatchType(options.TextMatchType),
-            };
-
-            var query = _indexer!.CreateImageQuery(searchText, queryOptions);
-            var matches = query.GetNextMatches(options.MaxResults);
-
-            return SearchOperationResultT.Success(ConvertImageMatches(matches));
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[SemanticSearchIndex] SearchImages failed. Query={searchText}", ex);
-            LastError = SearchError.SearchFailed(searchText, ex.Message, ex);
-            return SearchOperationResultT.FailureWithFallback(LastError, Array.Empty<SemanticSearchResult>());
-        }
-    }
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        if (_indexer != null)
-        {
-            _indexer.Listener.IndexCapabilitiesChanged -= OnIndexCapabilitiesChanged;
-            _indexer.Dispose();
-            _indexer = null;
-        }
-
-        _disposed = true;
-    }
-
-    private SemanticSearchCapabilities LoadCapabilities()
-    {
-        var capabilities = _indexer!.GetIndexCapabilities();
-
-        return new SemanticSearchCapabilities
-        {
-            TextLexicalAvailable = IsCapabilityInitialized(capabilities, IndexCapability.TextLexical),
-            TextSemanticAvailable = IsCapabilityInitialized(capabilities, IndexCapability.TextSemantic),
-            ImageSemanticAvailable = IsCapabilityInitialized(capabilities, IndexCapability.ImageSemantic),
-            ImageOcrAvailable = IsCapabilityInitialized(capabilities, IndexCapability.ImageOcr),
-        };
-    }
-
-    private static bool IsCapabilityInitialized(IndexCapabilities capabilities, IndexCapability capability)
-    {
-        var state = capabilities.GetCapabilityState(capability);
-        return state.InitializationStatus == IndexCapabilityInitializationStatus.Initialized;
-    }
-
-    private void OnIndexCapabilitiesChanged(AppContentIndexer indexer, IndexCapabilities capabilities)
-    {
-        _capabilities = LoadCapabilities();
-        Logger.LogInfo($"[SemanticSearchIndex] Capabilities changed. IndexName={_indexName}, TextLexical={_capabilities.TextLexicalAvailable}, TextSemantic={_capabilities.TextSemanticAvailable}, ImageSemantic={_capabilities.ImageSemanticAvailable}, ImageOcr={_capabilities.ImageOcrAvailable}");
-        CapabilitiesChanged?.Invoke(this, _capabilities);
-    }
-
-    private static QueryMatchScope ConvertMatchScope(SemanticSearchMatchScope scope)
-    {
-        return scope switch
-        {
-            SemanticSearchMatchScope.Unconstrained => QueryMatchScope.Unconstrained,
-            SemanticSearchMatchScope.Region => QueryMatchScope.Region,
-            SemanticSearchMatchScope.ContentItem => QueryMatchScope.ContentItem,
-            _ => QueryMatchScope.Unconstrained,
-        };
-    }
-
-    private static TextLexicalMatchType ConvertTextMatchType(SemanticSearchTextMatchType matchType)
-    {
-        return matchType switch
-        {
-            SemanticSearchTextMatchType.Fuzzy => TextLexicalMatchType.Fuzzy,
-            SemanticSearchTextMatchType.Exact => TextLexicalMatchType.Exact,
-            _ => TextLexicalMatchType.Fuzzy,
-        };
-    }
-
-    private static IReadOnlyList<SemanticSearchResult> ConvertTextMatches(IReadOnlyList<TextQueryMatch> matches)
-    {
-        var results = new List<SemanticSearchResult>();
-
-        foreach (var match in matches)
-        {
-            var result = new SemanticSearchResult(match.ContentId, SemanticSearchContentKind.Text);
-
-            if (match.ContentKind == QueryMatchContentKind.AppManagedText &&
-                match is AppManagedTextQueryMatch textMatch)
-            {
-                result.TextOffset = textMatch.TextOffset;
-                result.TextLength = textMatch.TextLength;
-            }
-
-            results.Add(result);
-        }
-
-        return results;
-    }
-
-    private static IReadOnlyList<SemanticSearchResult> ConvertImageMatches(IReadOnlyList<ImageQueryMatch> matches)
-    {
-        var results = new List<SemanticSearchResult>();
-
-        foreach (var match in matches)
-        {
-            var result = new SemanticSearchResult(match.ContentId, SemanticSearchContentKind.Image);
-            results.Add(result);
-        }
-
-        return results;
-    }
-
-    private void ThrowIfDisposed()
-    {
-        ObjectDisposedException.ThrowIf(_disposed, this);
-    }
-
-    private void ThrowIfNotInitialized()
-    {
-        if (_indexer == null)
-        {
-            throw new InvalidOperationException("Search engine is not initialized. Call InitializeAsync() first.");
-        }
-    }
-}

src/common/Common.Search/SemanticSearch/SemanticSearchMatchScope.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Specifies the scope for semantic search matching.
-/// </summary>
-public enum SemanticSearchMatchScope
-{
-    /// <summary>
-    /// No constraints, uses both Lexical and Semantic matching.
-    /// </summary>
-    Unconstrained,
-
-    /// <summary>
-    /// Restrict matching to a specific region.
-    /// </summary>
-    Region,
-
-    /// <summary>
-    /// Restrict matching to a single content item.
-    /// </summary>
-    ContentItem,
-}

src/common/Common.Search/SemanticSearch/SemanticSearchOptions.cs

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Options for configuring semantic search queries.
-/// </summary>
-public class SemanticSearchOptions
-{
-    /// <summary>
-    /// Gets or sets the language for the search query (e.g., "en-US").
-    /// </summary>
-    public string? Language { get; set; }
-
-    /// <summary>
-    /// Gets or sets the match scope for the search.
-    /// </summary>
-    public SemanticSearchMatchScope MatchScope { get; set; } = SemanticSearchMatchScope.Unconstrained;
-
-    /// <summary>
-    /// Gets or sets the text match type for lexical matching.
-    /// </summary>
-    public SemanticSearchTextMatchType TextMatchType { get; set; } = SemanticSearchTextMatchType.Fuzzy;
-
-    /// <summary>
-    /// Gets or sets the maximum number of results to return.
-    /// </summary>
-    public int MaxResults { get; set; } = 10;
-}

src/common/Common.Search/SemanticSearch/SemanticSearchResult.cs

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Represents a search result from the semantic search engine.
-/// </summary>
-public class SemanticSearchResult
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SemanticSearchResult"/> class.
-    /// </summary>
-    /// <param name="contentId">The unique identifier of the matched content.</param>
-    /// <param name="contentKind">The kind of content matched (text or image).</param>
-    public SemanticSearchResult(string contentId, SemanticSearchContentKind contentKind)
-    {
-        ContentId = contentId;
-        ContentKind = contentKind;
-    }
-
-    /// <summary>
-    /// Gets the unique identifier of the matched content.
-    /// </summary>
-    public string ContentId { get; }
-
-    /// <summary>
-    /// Gets the kind of content that was matched.
-    /// </summary>
-    public SemanticSearchContentKind ContentKind { get; }
-
-    /// <summary>
-    /// Gets or sets the text offset where the match was found (for text matches only).
-    /// </summary>
-    public int TextOffset { get; set; }
-
-    /// <summary>
-    /// Gets or sets the length of the matched text (for text matches only).
-    /// </summary>
-    public int TextLength { get; set; }
-}

src/common/Common.Search/SemanticSearch/SemanticSearchTextMatchType.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Common.Search.SemanticSearch;
-
-/// <summary>
-/// Specifies the type of text matching for lexical searches.
-/// </summary>
-public enum SemanticSearchTextMatchType
-{
-    /// <summary>
-    /// Fuzzy matching allows spelling errors and approximate words.
-    /// </summary>
-    Fuzzy,
-
-    /// <summary>
-    /// Exact matching requires exact text matches.
-    /// </summary>
-    Exact,
-}

src/common/Common.UI/Common.UI.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <UseWPF>true</UseWPF>

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">
@@ -24,7 +25,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\common;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\;..\..\common;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -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/FilePreviewCommon/FilePreviewCommon.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Monaco.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Monaco.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <Description>PowerToys FilePreviewCommon</Description>

src/common/GPOWrapper/GPOWrapper.vcxproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -16,10 +17,9 @@
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
-  <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>
@@ -116,13 +116,13 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/GPOWrapperProjection/GPOWrapperProjection.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>

src/common/LanguageModelProvider/LanguageModelProvider.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>

src/common/ManagedCommon/ManagedCommon.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <Description>PowerToys ManagedCommon</Description>

src/common/ManagedCsWin32/ManagedCsWin32.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\.\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
 	<PropertyGroup>
 		<Description>PowerToys ManagedCsWin32</Description>

src/common/ManagedTelemetry/Telemetry/ManagedTelemetry.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <Description>PowerToys Telemetry</Description>

src/common/PowerToys.ModuleContracts/PowerToys.ModuleContracts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -9,10 +10,9 @@
     <RootNamespace>SettingsAPI</RootNamespace>
     <ProjectName>SettingsAPI</ProjectName>
   </PropertyGroup>
-  <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">
@@ -22,7 +22,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\;$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -52,17 +52,17 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Telemetry/EtwTrace/EtwTrace.vcxproj

@@ -1,17 +1,17 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{8f021b46-362b-485c-bfba-ccf83e820cbd}</ProjectGuid>
     <RootNamespace>EtwTrace</RootNamespace>
   </PropertyGroup>
-  <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">
@@ -37,15 +37,15 @@
   </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')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/Themes/Themes.vcxproj

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{98537082-0FDB-40DE-ABD8-0DC5A4269BAB}</ProjectGuid>
@@ -8,10 +9,9 @@
     <RootNamespace>Themes</RootNamespace>
     <ProjectName>Themes</ProjectName>
   </PropertyGroup>
-  <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">
@@ -24,7 +24,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
@@ -46,13 +46,13 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/UITestAutomation/UITestAutomation.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <OutputType>Library</OutputType>

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

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{1A066C63-64B3-45F8-92FE-664E1CCE8077}</ProjectGuid>
@@ -9,11 +10,10 @@
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
     <ProjectName>Common.Lib.UnitTests</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <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" />
@@ -58,13 +58,13 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/interop/HotkeyManager.cpp

@@ -14,7 +14,7 @@ namespace winrt::PowerToys::Interop::implementation
     }
 
     // When all Shortcut keys are pressed, fire the HotkeyCallback event.
-    void HotkeyManager::KeyboardEventProc(KeyboardEvent ev)
+    void HotkeyManager::KeyboardEventProc(KeyboardEvent /*ev*/)
     {
         // pressedKeys always stores the latest keyboard state
         auto pressedKeysHandle = GetHotkeyHandle(pressedKeys);

src/common/interop/PowerToys.Interop.vcxproj

@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup>
     <AssemblyTitle>PowerToys.Interop</AssemblyTitle>
   </PropertyGroup>
@@ -38,10 +39,9 @@
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -56,7 +56,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <TargetName>PowerToys.Interop</TargetName>
-    <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(RepoRoot)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup>
     <CopyCppRuntimeToOutputDir>true</CopyCppRuntimeToOutputDir>
@@ -80,7 +80,7 @@
     <ClCompile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
       <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;PowerToysInterop;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\common\interop;../../;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\common\interop;../../;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <OmitDefaultLibName>false</OmitDefaultLibName>
       <AdditionalOptions>%(AdditionalOptions) /bigobj /Zc:twoPhase- </AdditionalOptions>
@@ -172,15 +172,15 @@
   <ImportGroup Label="ExtensionTargets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/interop/interop-tests/Common.Interop.UnitTests.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>

src/common/logger/logger.vcxproj

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -33,14 +34,13 @@
     <ProjectGuid>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</ProjectGuid>
     <RootNamespace>logger</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
-    <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(RepoRoot)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -83,13 +83,13 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -15,10 +16,9 @@
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -96,13 +96,13 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj

@@ -1,16 +1,16 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>BackgroundActivatorDLL</RootNamespace>
   </PropertyGroup>
-  <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">
@@ -64,10 +64,10 @@
   </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')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\common\version\version.vcxproj">
+    <ProjectReference Include="$(RepoRoot)src\common\version\version.vcxproj">
       <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
     </ProjectReference>
     <ProjectReference Include="..\BackgroundActivator\BackgroundActivator.vcxproj">
@@ -81,7 +81,7 @@
     <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'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>

src/common/notifications/notifications.vcxproj

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}</ProjectGuid>
@@ -8,10 +9,9 @@
     <RootNamespace>notifications</RootNamespace>
     <ProjectName>Notifications</ProjectName>
   </PropertyGroup>
-  <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">
@@ -21,7 +21,8 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\;$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -44,15 +45,15 @@
   </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')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

src/common/updating/updating.vcxproj

@@ -1,6 +1,7 @@
 <?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')" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{17DA04DF-E393-4397-9CF0-84DABE11032E}</ProjectGuid>
@@ -8,14 +9,13 @@
     <RootNamespace>updating</RootNamespace>
     <ProjectName>ApplicationUpdate</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\..\deps\expected.props" />
+  <Import Project="$(RepoRoot)deps\expected.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\deps\spdlog.props" />
+  <Import Project="$(RepoRoot)deps\spdlog.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -26,7 +26,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\;$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Lib>
@@ -57,15 +57,15 @@
   </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')" />
-    <Import Project="..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

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">
@@ -57,7 +57,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\;$(RepoRoot)src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>

src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.SelfContained.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>

src/dsc/v3/PowerToys.DSC.UnitTests/PowerToys.DSC.UnitTests.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <OutputPath>..\..\..\..\$(Configuration)\$(Platform)\tests\PowerToys.DSC.Tests\</OutputPath>
+    <OutputPath>$(RepoRoot)$(Configuration)\$(Platform)\tests\PowerToys.DSC.Tests\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.SelfContained.props" />
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
+    <OutputPath>$(RepoRoot)$(Platform)\$(Configuration)</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <AssemblyName>PowerToys.DSC</AssemblyName>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -37,7 +37,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
-    <OutDir>..\..\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir>$(RepoRoot)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">