merging main

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

@@ -94,7 +94,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-Perplexity
 svgl
 
 # KEYS
@@ -320,4 +319,4 @@ MRUINFO
 REGSTR
 
 # Misc Win32 APIs and PInvokes
-INVOKEIDLIST
+INVOKEIDLIST

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

@@ -29,8 +29,6 @@ shortcutguide
 
 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy

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

@@ -159,7 +159,6 @@ BUILDARCH
 BUILDNUMBER
 buildtransitive
 builttoroam
-BUNDLEINFO
 BVal
 BValue
 byapp
@@ -248,7 +247,6 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
-coreclr
 constexpr
 contentdialog
 contentfiles
@@ -270,8 +268,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cpptools
-cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -283,7 +279,6 @@ CRH
 critsec
 cropandlock
 Crossdevice
-csdevkit
 CSearch
 CSettings
 cso
@@ -311,7 +306,6 @@ CXVIRTUALSCREEN
 CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
-Czechia
 cziplib
 Dac
 dacl
@@ -336,7 +330,6 @@ Deact
 debugbreak
 decryptor
 Dedup
-Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -442,7 +435,6 @@ EDITSHORTCUTS
 EDITTEXT
 EFile
 ekus
-emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 ENABLETAB
@@ -807,7 +799,6 @@ KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 keyboardtester
-keycap
 KEYEVENTF
 KEYIMAGE
 keynum
@@ -861,7 +852,6 @@ LOCKTYPE
 LOGFONT
 LOGFONTW
 logon
-LOGMSG
 LOGPIXELSX
 LOGPIXELSY
 LOn
@@ -1035,7 +1025,6 @@ MWBEx
 MYICON
 NAMECHANGE
 namespaceanddescendants
-Namotion
 nao
 NCACTIVATE
 ncc
@@ -1073,7 +1062,6 @@ NEWPLUSSHELLEXTENSIONWIN
 newrow
 nicksnettravels
 NIF
-NJson
 NLog
 NLSTEXT
 NMAKE
@@ -1459,6 +1447,7 @@ rstringalnum
 rstringalpha
 rstringdigit
 rtb
+RTB
 RTLREADING
 rtm
 runas
@@ -1791,13 +1780,10 @@ UACUI
 UAL
 uap
 UBR
-UBreak
-ubrk
 UCallback
 ucrt
 ucrtd
 uefi
-UError
 uesc
 UFlags
 UHash
@@ -1805,7 +1791,6 @@ UIA
 UIEx
 uild
 uitests
-UITo
 ULONGLONG
 ums
 uncompilable
@@ -1868,7 +1853,6 @@ VFT
 vget
 vgetq
 viewmodels
-virama
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
@@ -2020,7 +2004,6 @@ XButton
 xclip
 xcopy
 XDeployment
-xdf
 XDocument
 XElement
 xfd

.github/copilot-instructions.md

@@ -1,43 +0,0 @@
-# PowerToys – Copilot guide (concise)
-
-This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
-
-Repo map (1‑line per area)
-- Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
-- Shared libs: `src/common/**`
-- Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
-- Build tools/docs: `tools/**`, `doc/devdocs/**`
-
-Build and test (defaults)
-- Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
-- Build discipline:
-  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
-  - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
-  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
-  - Don’t start tests or launch Runner until the previous step succeeded.
-- Tests (fast + targeted):
-  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
-
-Pull requests (expectations)
-- Atomic: one logical change; no drive‑by refactors.
-- Describe: problem / approach / risk / test evidence.
-- List: touched paths if not obvious.
-
-When to ask for clarification
-- Ambiguous spec after scanning relevant docs (see below).
-- Cross-module impact (shared enum/struct) not clear.
-- Security / elevation / installer changes.
-
-Logging (use existing stacks)
-- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
-- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
-
-Docs to consult
-- `tools/build/BUILD-GUIDELINES.md`
-- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
-
-Done checklist (self review before finishing)
-- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?

.github/workflows/automatic-issue-deduplication.yml

@@ -1,19 +0,0 @@
-name: Automatic New Issue Deduplication
-on:
-  issues:
-    types: [opened, reopened]
-permissions:
-  models: read
-  issues: write
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-  cancel-in-progress: true
-jobs:
-  deduplicate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Deduplicate Action
-        uses: pelikhan/action-genai-issue-dedup@v0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          label_as_duplicate: true

.github/workflows/manual-batch-issue-deduplication.yml

@@ -1,38 +1,20 @@
 name: Manual Batch Issue Deduplication
 
 on:
-  workflow_dispatch:
-    inputs:
-      issue_numbers:
-        description: "JSON array of issue numbers to deduplicate (e.g. [101,102,103])"
-        required: true
-      since:
-        description: "Only compare against issues created after this date (ISO 8601, e.g. 2019-05-05T00:00:00Z)"
-        required: false
-        default: "2019-05-05T00:00:00Z"
-      label_as_duplicate:
-        description: "Apply duplicate label if duplicates are found (true/false)"
-        required: false
-        default: "true"
-
-permissions:
-  models: read
-  issues: write
+  workflow_dispatch: # Only runs when manually triggered
 
 jobs:
-  deduplicate:
+  batch-deduplicate:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Run GenAI Issue Deduplicator
+      - name: Batch Deduplicate Issues
         uses: pelikhan/action-genai-issue-dedup@v0
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_issue: ${{ matrix.issue }}
-          label_as_duplicate: ${{ github.event.inputs.label_as_duplicate }}
-          
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          label-duplicate: "potential duplicate"
+          comment-duplicate: true
+          close-duplicate: false
+          batch-size: 100 
+          since: '2019-05-05T00:00:00Z' # Process issues dating back to 2019
+          duplicate-comment-template: "This issue appears to be a duplicate of #{duplicate_issue_number}."
+          # Add other action-specific inputs if needed

.gitignore

@@ -350,9 +350,7 @@ src/common/Telemetry/*.etl
 
 # Generated installer file for Monaco source files.
 /installer/PowerToysSetup/MonacoSRC.wxs
-/installer/PowerToysSetup/DscResources.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
-/installer/PowerToysSetupVNext/DscResources.wxs
 
 # MSBuildCache
 /MSBuildCacheLogs/

.pipelines/ESRPSigning_core.json

@@ -55,6 +55,7 @@
             "PowerToys.Awake.exe",
             "PowerToys.Awake.dll",
 
+
             "PowerToys.FancyZonesEditor.exe",
             "PowerToys.FancyZonesEditor.dll",
             "PowerToys.FancyZonesEditorCommon.dll",
@@ -229,10 +230,7 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
-            "*Microsoft.CmdPal.UI_*.msix",
-
-            "PowerToys.DSC.dll",
-            "PowerToys.DSC.exe"
+            "*Microsoft.CmdPal.UI_*.msix"
           ],
             "SigningInfo": {
                 "Operations": [
@@ -299,9 +297,6 @@
                 "msvcp140_1_app.dll",
                 "msvcp140_2_app.dll",
                 "msvcp140_app.dll",
-                "Namotion.Reflection.dll",
-                "NJsonSchema.Annotations.dll",
-                "NJsonSchema.dll",
                 "vcamp140_app.dll",
                 "vccorlib140_app.dll",
                 "vcomp140_app.dll",

.pipelines/generateDscManifests.ps1

@@ -1,88 +0,0 @@
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true)]
-    [string]$BuildPlatform,
-
-    [Parameter(Mandatory = $true)]
-    [string]$BuildConfiguration,
-
-    [Parameter()]
-    [string]$RepoRoot = (Get-Location).Path
-)
-
-$ErrorActionPreference = 'Stop'
-
-function Resolve-PlatformDirectory {
-    param(
-        [string]$Root,
-        [string]$Platform
-    )
-
-    $normalized = $Platform.Trim()
-    $candidates = @()
-    $candidates += Join-Path $Root $normalized
-    $candidates += Join-Path $Root ($normalized.ToUpperInvariant())
-    $candidates += Join-Path $Root ($normalized.ToLowerInvariant())
-    $candidates = $candidates | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique
-
-    foreach ($candidate in $candidates) {
-        if (Test-Path $candidate) {
-            return $candidate
-        }
-    }
-
-    return $candidates[0]
-}
-
-Write-Host "Repo root: $RepoRoot"
-Write-Host "Requested build platform: $BuildPlatform"
-Write-Host "Requested configuration: $BuildConfiguration"
-
-# Always use x64 PowerToys.DSC.exe since CI/CD machines are x64
-$exePlatform = 'x64'
-$exeRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $exePlatform
-$exeOutputDir = Join-Path $exeRoot $BuildConfiguration
-$exePath = Join-Path $exeOutputDir 'PowerToys.DSC.exe'
-
-Write-Host "Using x64 PowerToys.DSC.exe to generate DSC manifests for $BuildPlatform build"
-
-if (-not (Test-Path $exePath)) {
-    throw "PowerToys.DSC.exe not found at '$exePath'. Make sure it has been built first."
-}
-
-Write-Host "Using PowerToys.DSC.exe at '$exePath'."
-
-# Output DSC manifests to the target build platform directory (x64, ARM64, etc.)
-$outputRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $BuildPlatform
-if (-not (Test-Path $outputRoot)) {
-    Write-Host "Creating missing platform output root at '$outputRoot'."
-    New-Item -Path $outputRoot -ItemType Directory -Force | Out-Null
-}
-
-$outputDir = Join-Path $outputRoot $BuildConfiguration
-if (-not (Test-Path $outputDir)) {
-    Write-Host "Creating missing configuration output directory at '$outputDir'."
-    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
-}
-
-Write-Host "DSC manifests will be generated to: '$outputDir'"
-
-Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
-Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
-
-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
-Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
-& $exePath @arguments
-if ($LASTEXITCODE -ne 0) {
-    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
-}
-
-$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
-if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$outputDir'."
-}
-
-Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"
-foreach ($file in $generatedFiles) {
-    Write-Host "  - $($file.FullName)"
-}

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

@@ -263,23 +263,6 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
-  - task: VSBuild@1
-    displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
-    condition: ne(variables['BuildPlatform'], 'x64')
-    inputs:
-      solution: src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
-      msbuildArgs: /t:Build /m /restore
-      platform: x64
-      configuration: $(BuildConfiguration)
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  # Generate DSC manifests using PowerToys.DSC.exe
-  - pwsh: |-
-      & '.pipelines/generateDscManifests.ps1' -BuildPlatform '$(BuildPlatform)' -BuildConfiguration '$(BuildConfiguration)' -RepoRoot '$(Build.SourcesDirectory)'
-    displayName: Generate DSC manifests
-
   - task: CopyFiles@2
     displayName: Stage SDK/build
     inputs:
@@ -428,28 +411,9 @@ jobs:
           !**\obj\**
 
   - pwsh: |-
-      $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix"
-      Write-Host "Found $($Packages.Count) CmdPal MSIX package(s):"
-      foreach ($pkg in $Packages) {
-          Write-Host "  - $($pkg.FullName)"
-      }
-      
-      if ($Packages.Count -gt 0) {
-          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fall back to any
-          $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
-          if ($PlatformPackage) {
-              $Package = $PlatformPackage
-              Write-Host "Using platform-specific package: $($Package.FullName)"
-          } else {
-              $Package = $Packages | Select-Object -First 1
-              Write-Host "Using first available package: $($Package.FullName)"
-          }
-          
-          $PackageFilename = $Package.FullName
-          Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-      } else {
-          Write-Warning "No CmdPal MSIX packages found!"
-      }
+      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
+      $PackageFilename = $Package.FullName
+      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
     displayName: Locate the CmdPal MSIX
 
   - ${{ if eq(parameters.codeSign, true) }}:

.vscode/launch.json

@@ -1,43 +0,0 @@
-{
-    "version": "0.2.0",
-    "inputs": [
-        {
-            "id": "arch",
-            "type": "pickString",
-            "description": "Select target architecture",
-            "options": ["x64", "arm64"],
-            "default": "x64"
-        }
-    ],
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\${input:arch}\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build, ARCH configurable)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}

Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
@@ -57,15 +57,14 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="MSTest" Version="3.8.3" />
-    <PackageVersion Include="NJsonSchema" Version="11.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />

NOTICE.md

@@ -1522,7 +1522,6 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
-- NJsonSchema
 - NLog
 - NLog.Extensions.Logging
 - NLog.Schema

PowerToys.sln

@@ -5,11 +5,13 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner.vcxproj", "{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}"
 	ProjectSection(ProjectDependencies) = postProject
 		{031AC72E-FA28-4AB7-B690-6F7B9C28AA73} = {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {08E71C67-6A7E-4CA1-B04E-2FB336410BAC}
 		{0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {0B43679E-EDFA-4DA0-AD30-F4628B308B1B}
 		{0B593A6C-4143-4337-860E-DB5710FB87DB} = {0B593A6C-4143-4337-860E-DB5710FB87DB}
 		{17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {217DF501-135C-4E38-BFC8-99D4821032EA}
 		{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {38177D56-6AD1-4ADF-88C9-2843A7932166}
 		{48804216-2A0E-4168-A6D8-9CD068D14227} = {48804216-2A0E-4168-A6D8-9CD068D14227}
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}
@@ -262,6 +264,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\EventLocker.h = src\common\utils\EventLocker.h
 		src\common\utils\EventWaiter.h = src\common\utils\EventWaiter.h
 		src\common\utils\excluded_apps.h = src\common\utils\excluded_apps.h
+		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\exec.h = src\common\utils\exec.h
 		src\common\utils\game_mode.h = src\common\utils\game_mode.h
 		src\common\utils\gpo.h = src\common\utils\gpo.h
@@ -281,7 +284,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\registry.h = src\common\utils\registry.h
 		src\common\utils\resources.h = src\common\utils\resources.h
 		src\common\utils\serialized.h = src\common\utils\serialized.h
-		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\string_utils.h = src\common\utils\string_utils.h
 		src\common\utils\timeutil.h = src\common\utils\timeutil.h
 		src\common\utils\UnhandledExceptionHandler.h = src\common\utils\UnhandledExceptionHandler.h
@@ -793,16 +795,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Window
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E11826E1-76DF-42AC-985C-164CC2EE57A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenRuler.UITests", "src\modules\MeasureTool\Tests\ScreenRuler.UITests\ScreenRuler.UITests.csproj", "{66C069F8-C548-4CA6-8CDE-239104D68E88}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v3", "v3", "{9605B84E-FAC4-477B-B9EC-0753177EE6A8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC", "src\dsc\v3\PowerToys.DSC\PowerToys.DSC.csproj", "{94CDC147-6137-45E9-AEDE-17FF809607C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC.UnitTests", "src\dsc\v3\PowerToys.DSC.UnitTests\PowerToys.DSC.UnitTests.csproj", "{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
@@ -811,6 +803,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSea
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Shell.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Shell.UnitTests\Microsoft.CmdPal.Ext.Shell.UnitTests.csproj", "{E816D7B4-4688-4ECB-97CC-3D8E798F3833}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "src\modules\LightSwitch\LightSwitchModuleInterface\LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightModeService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2705,22 +2703,6 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|ARM64.Build.0 = Release|ARM64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.ActiveCfg = Release|x64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.Build.0 = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.ActiveCfg = Debug|x64
@@ -2737,6 +2719,30 @@ Global
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.Build.0 = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2889,30 +2895,6 @@ Global
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.Build.0 = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.ActiveCfg = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.Build.0 = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.ActiveCfg = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.Build.0 = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.ActiveCfg = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.Build.0 = Release|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.ActiveCfg = Debug|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.Build.0 = Debug|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.Build.0 = Release|ARM64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.ActiveCfg = Release|x64
-		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.Build.0 = Release|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.ActiveCfg = Debug|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.Build.0 = Debug|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.Build.0 = Release|ARM64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.ActiveCfg = Release|x64
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.Build.0 = Release|x64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
@@ -2945,6 +2927,22 @@ Global
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.ActiveCfg = Release|x64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.Build.0 = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.Build.0 = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.ActiveCfg = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.Build.0 = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.Build.0 = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.ActiveCfg = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2954,6 +2952,7 @@ Global
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
+		{1AFB6476-670D-4E80-A464-657E01DFF482} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
@@ -3219,10 +3218,10 @@ Global
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}
@@ -3258,15 +3257,13 @@ Global
 		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
-		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
-		{9605B84E-FAC4-477B-B9EC-0753177EE6A8} = {557C4636-D7E1-4838-A504-7D19B725EE95}
-		{94CDC147-6137-45E9-AEDE-17FF809607C0} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
-		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B2-4688-4ECB-97CC-3D8E798F3831} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{5B201255-53C8-490B-A34F-01F05D48A477} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {5B201255-53C8-490B-A34F-01F05D48A477}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {5B201255-53C8-490B-A34F-01F05D48A477}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/devdocs/development/debugging.md

@@ -18,8 +18,8 @@ You can build the entire solution from the command line, which is sometimes fast
 1. Open Developer Command Prompt for VS 2022
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
-   ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
+   ```
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
    ```
 4. This process should complete in approximately 13-14 minutes for a full build
 

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

@@ -1,128 +0,0 @@
-## Developing PowerToys with Visual Studio Code
-
-This guide shows how to build, debug, and contribute to PowerToys using VS Code instead of (or alongside) full Visual Studio. It focuses on common inner‑loop tasks for C++, .NET, and mixed scenarios present in the solution.
-
-> PowerToys is a large mixed C++ / C# / WinAppSDK solution. VS Code works well for incremental development and quick module iterations, but occasionally you may still prefer full Visual Studio for designer tooling or specialized diagnostics.
-
----
-VS Code extensions Needed:
-
-| Area | Extension | Notes |
-|------|-----------|-------|
-| C++ | ms-vscode.cpptools | IntelliSense, debugging (cppvsdbg) |
-| C# | ms-dotnettools.csdevkit (or C#) | Language service / test explorer |
-
----
-
-## Building in VS Code
-### Configure developer powershell for vs2022 for more convenient dev in vscode.
-1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
-2. Add below config as entry:
-```json
-    "Developer PowerShell for VS 2022": {
-		// 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;",
-            // Configure based on your environment
-            "& '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
-Or reach out to "tools\build\BUILD-GUIDELINES.md"
-
-### Sample plain msbuild command
-```powershell
-# Restore:
-msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
-
-# Build powertoys sln
-msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
-
-# dotnet project
-msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
-
-# native project
-msbuild "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj" -p:Configuration=Debug -p:Platform=x64 -m
-```
-
----
-
-## Debugging
-
-### Existing launch configuration
-
-The repo provides `.vscode/launch.json` with:
-
-- `Run PowerToys.exe (no build)`: Launches the already-built executable at `x64/Debug/PowerToys.exe` using `cppvsdbg`.
-
-Build first, then press F5. To switch configuration (Release / ARM64) either edit the path or create additional launch entries.
-
-### Attaching to a running instance
-
-If PowerToys is already running, you can attach to that process:
-
-2. VS Code command palette: “C/C++: (Windows) Attach to Process”.
-3. Filter for `PowerToys.exe` / module-specific processes.
-
-### Debugging managed components
-
-Many modules have a managed component loaded into the PowerToys process. `cppvsdbg` can debug mixed mode, but if you need richer .NET inspection you can create a second configuration using `type: coreclr` and `processId` attachment after the native launch, or just attach separately:
-
-Similar for attach to managed code.
-> Note: In arm64 machine, can only debug arm64 code.
-
-```jsonc
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\x64\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\x64\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\arm64\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
-```
----
-
-## 6. Common tasks & tips
-
-| Task | Command / Action | Notes |
-|------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
-| Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
-| Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |

doc/dsc/Settings.md

@@ -1,83 +0,0 @@
-# Settings resource
-Manage the settings for PowerToys modules
-
-## Commands
-
-### ✨ Modules
-List all the modules supported by the settings resource.
-```shell
-PS C:\> PowerToys.DSC.exe modules --resource 'settings'
-AdvancedPaste
-AlwaysOnTop
-App
-Awake
-ColorPicker
-CropAndLock
-EnvironmentVariables
-FancyZones
-FileLocksmith
-FindMyMouse
-Hosts
-ImageResizer
-KeyboardManager
-MeasureTool
-MouseHighlighter
-MouseJump
-MousePointerCrosshairs
-Peek
-PowerAccent
-PowerOCR
-PowerRename
-RegistryPreview
-ShortcutGuide
-Workspaces
-ZoomIt
-```
-
-### 📄 Get
-Get the settings for a specific module.
-```shell
-PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
-{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
-```
-
-### 🖨️ Export
-Export the settings for a specific module.
-
-ℹ️ Settings resource Get and Export operation output states are identical.
-```shell
-PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
-{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
-```
-
-### 📝 Set
-Set the settings for a specific module. This command will update the settings to the specified values.
-```shell
-PS C:\> PowerToys.DSC.exe set --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
-{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}
-["settings"]
-```
-
-### 🧪 Test
-Test the settings for a specific module. This command will check if the current settings match the desired state.
-```shell
-PS C:\> PowerToys.DSC.exe test --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000002-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
-{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"},"_inDesiredState":false}
-["settings"]
-```
-
-### 🛠️ Schema
-Generates the JSON schema for the settings resource of a specific module.
-```shell
-PS C:\> PowerToys.DSC.exe schema --resource 'settings' --module Awake
-{"$schema":"http://json-schema.org/draft-04/schema#","title":"SettingsResourceObjectOfAwakeSettings","type":"object","additionalProperties":false,"required":["settings"],"properties":{"_inDesiredState":{"type":["boolean","null"],"description":"Indicates whether an instance is in the desired state"},"settings":{"description":"The settings content for the module."}}}
-PS E:\src\powertoys> PowerToys.DSC.exe schema --resource 'settings' --module Awake | Format-Json
-```
-
-### 📦 Manifest
-Generates a manifest dsc resource JSON file for the specified module.
-- If the module is not specified, it will generate a manifest for all modules.
-- If the output directory is not specified, it will print the manifest to the console.
-```shell
-PS C:\> PowerToys.DSC.exe manifest --resource settings --module 'Awake' --outputDir "C:\manifests"
-```

doc/thirdPartyRunPlugins.md

@@ -73,5 +73,4 @@ Below are community created plugins that target a website or software.  They are
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
 | [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [PerplexitySearchShortcut](https://github.com/0x6f677548/PowerToys-Run-PerplexitySearchShortcut) | [0x6f677548](https://github.com/0x6f677548) | Search Perplexity |
 | [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |

installer/PowerToysSetup/CmdPal.wxs

@@ -9,6 +9,13 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
       <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else ?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif ?>
+        </Directory>
       </Directory>
     </DirectoryRef>
 
@@ -26,14 +33,41 @@
       </Component>
     </DirectoryRef>
 
+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else ?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif ?>
+
     <ComponentGroup Id="CmdPalComponentGroup">
       <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
         </RegistryKey>
         <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
+    <?else ?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
+    <?endif ?>
       </Component>
       <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -16,7 +16,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -27,7 +26,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -123,7 +121,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
     <Compile Include="KeyboardManager.wxs" />
-    <Compile Include="DscResources.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
     <Compile Include="RegistryPreview.wxs" />

installer/PowerToysSetup/Product.wxs

@@ -75,7 +75,6 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
-      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -325,6 +324,7 @@
                   BinaryKey="PTCustomActions"
                   DllEntry="UninstallDSCModuleCA"
                    />
+
       <CustomAction Id="UninstallServicesTask"
                     Return="ignore"
                     Impersonate="yes"

installer/PowerToysSetup/generateDscResourcesWxs.ps1

@@ -1,87 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True)]
-    [string]$dscWxsFile,
-    [Parameter(Mandatory = $True)]
-    [string]$Platform,
-    [Parameter(Mandatory = $True)]
-    [string]$Configuration
-)
-
-$ErrorActionPreference = 'Stop'
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
-
-if (-not (Test-Path $buildOutputDir)) {
-    Write-Error "Build output directory not found: '$buildOutputDir'"
-    exit 1
-}
-
-$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
-
-if (-not $dscFiles) {
-    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
-    $wxsContent = @"
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-    Set-Content -Path $dscWxsFile -Value $wxsContent
-    exit 0
-}
-
-Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
-
-$wxsContent = @"
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-"@
-
-$componentRefs = @()
-foreach ($file in $dscFiles) {
-    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
-    $fileId = $componentId + "_File"
-    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
-    $componentRefs += $componentId
-    
-    $wxsContent += @"
-
-      <Component Id="$componentId" Guid="{$guid}">
-        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
-      </Component>
-"@
-}
-
-$wxsContent += @"
-
-    </DirectoryRef>
-  </Fragment>
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-"@
-
-foreach ($componentId in $componentRefs) {
-    $wxsContent += @"
-
-      <ComponentRef Id="$componentId"/>
-"@
-}
-
-$wxsContent += @"
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-
-Set-Content -Path $dscWxsFile -Value $wxsContent
-Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -3,7 +3,6 @@
 #include "RcResource.h"
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
-#include <filesystem>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -233,9 +232,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
 
         auto action = [&commandLine](HANDLE userToken)
         {
-            STARTUPINFO startupInfo = { 0 };
-            startupInfo.cb = sizeof(STARTUPINFO);
-            startupInfo.wShowWindow = SW_SHOWNORMAL;
+            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
             PROCESS_INFORMATION processInformation;
 
             PVOID lpEnvironment = NULL;
@@ -274,9 +271,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
     }
     else
     {
-        STARTUPINFO startupInfo = { 0 };
-        startupInfo.cb = sizeof(STARTUPINFO);
-        startupInfo.wShowWindow = SW_SHOWNORMAL;
+        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
 
         PROCESS_INFORMATION processInformation;
 
@@ -429,7 +424,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
         const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
-        std::filesystem::create_directories(modulesPath, errorCode);
+        fs::create_directories(modulesPath, errorCode);
         if (errorCode)
         {
             hr = E_FAIL;
@@ -438,7 +433,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            std::filesystem::copy_file(std::filesystem::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, std::filesystem::copy_options::overwrite_existing, errorCode);
+            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
 
             if (errorCode)
             {
@@ -486,7 +481,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            std::filesystem::remove(versionedModulePath / filename, errorCode);
+            fs::remove(versionedModulePath / filename, errorCode);
 
             if (errorCode)
             {
@@ -497,7 +492,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
         {
-            std::filesystem::remove(*modulePath, errorCode);
+            fs::remove(*modulePath, errorCode);
 
             if (errorCode)
             {
@@ -1380,120 +1375,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
-UINT __stdcall SetBundleInstallLocationCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    
-    // Declare all variables at the beginning to avoid goto issues
-    std::wstring customActionData;
-    std::wstring installationFolder;
-    std::wstring bundleUpgradeCode;
-    std::wstring installScope;
-    bool isPerUser = false;
-    size_t pos1 = std::wstring::npos;
-    size_t pos2 = std::wstring::npos;
-    std::vector<HKEY> keysToTry;
-
-    hr = WcaInitialize(hInstall, "SetBundleInstallLocationCA");
-    ExitOnFailure(hr, "Failed to initialize");
-    
-    // Parse CustomActionData: "installFolder;upgradeCode;installScope"
-    hr = getInstallFolder(hInstall, customActionData);
-    ExitOnFailure(hr, "Failed to get CustomActionData.");
-    
-    pos1 = customActionData.find(L';');
-    if (pos1 == std::wstring::npos) 
-    {
-        hr = E_INVALIDARG;
-        ExitOnFailure(hr, "Invalid CustomActionData format - missing first semicolon");
-    }
-    
-    pos2 = customActionData.find(L';', pos1 + 1);
-    if (pos2 == std::wstring::npos) 
-    {
-        hr = E_INVALIDARG;
-        ExitOnFailure(hr, "Invalid CustomActionData format - missing second semicolon");
-    }
-    
-    installationFolder = customActionData.substr(0, pos1);
-    bundleUpgradeCode = customActionData.substr(pos1 + 1, pos2 - pos1 - 1);
-    installScope = customActionData.substr(pos2 + 1);
-    
-    isPerUser = (installScope == L"perUser");
-    
-    // Use the appropriate registry based on install scope
-    HKEY targetKey = isPerUser ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
-    const wchar_t* keyName = isPerUser ? L"HKCU" : L"HKLM";
-    
-    WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Searching for Bundle in %ls registry", keyName);
-    
-    HKEY uninstallKey;
-    LONG openResult = RegOpenKeyExW(targetKey, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &uninstallKey);
-    if (openResult != ERROR_SUCCESS)
-    {
-        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to open uninstall key, error: %ld", openResult);
-        goto LExit;
-    }
-    
-    DWORD index = 0;
-    wchar_t subKeyName[256];
-    DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
-    
-    while (RegEnumKeyExW(uninstallKey, index, subKeyName, &subKeyNameSize, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
-    {
-        HKEY productKey;
-        if (RegOpenKeyExW(uninstallKey, subKeyName, 0, KEY_READ | KEY_WRITE, &productKey) == ERROR_SUCCESS)
-        {
-            wchar_t upgradeCode[256];
-            DWORD upgradeCodeSize = sizeof(upgradeCode);
-            DWORD valueType;
-            
-            if (RegQueryValueExW(productKey, L"BundleUpgradeCode", nullptr, &valueType, 
-                               reinterpret_cast<LPBYTE>(upgradeCode), &upgradeCodeSize) == ERROR_SUCCESS)
-            {
-                // Remove brackets from registry upgradeCode for comparison (bundleUpgradeCode doesn't have brackets)
-                std::wstring regUpgradeCode = upgradeCode;
-                if (!regUpgradeCode.empty() && regUpgradeCode.front() == L'{' && regUpgradeCode.back() == L'}')
-                {
-                    regUpgradeCode = regUpgradeCode.substr(1, regUpgradeCode.length() - 2);
-                }
-                
-                if (_wcsicmp(regUpgradeCode.c_str(), bundleUpgradeCode.c_str()) == 0)
-                {
-                    // Found matching Bundle, set InstallLocation
-                    LONG setResult = RegSetValueExW(productKey, L"InstallLocation", 0, REG_SZ,
-                                 reinterpret_cast<const BYTE*>(installationFolder.c_str()),
-                                 static_cast<DWORD>((installationFolder.length() + 1) * sizeof(wchar_t)));
-                    
-                    if (setResult == ERROR_SUCCESS)
-                    {
-                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set successfully");
-                    }
-                    else
-                    {
-                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to set InstallLocation, error: %ld", setResult);
-                    }
-                    
-                    RegCloseKey(productKey);
-                    RegCloseKey(uninstallKey);
-                    goto LExit;
-                }
-            }
-            RegCloseKey(productKey);
-        }
-        
-        index++;
-        subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
-    }
-    
-    RegCloseKey(uninstallKey);
-    
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
 void initSystemLogger()
 {
     static std::once_flag initLoggerFlag;

installer/PowerToysSetupCustomActionsVNext/CustomAction.def

@@ -32,4 +32,4 @@ EXPORTS
 	CleanFileLocksmithRuntimeRegistryCA
 	CleanPowerRenameRuntimeRegistryCA
 	CleanNewPlusRuntimeRegistryCA
-	SetBundleInstallLocationCA
+	

installer/PowerToysSetupVNext/CmdPal.wxs

@@ -4,6 +4,13 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
       <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif?>
+        </Directory>
       </Directory>
     </DirectoryRef>
     <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
@@ -18,14 +25,40 @@
         <?endif?>
       </Component>
     </DirectoryRef>
+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.x64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.ARM64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif?>
     <ComponentGroup Id="CmdPalComponentGroup">
       <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall" />
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall" />
+    <?else?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall" />
+    <?endif?>
       </Component>
       <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
     </ComponentGroup>
   </Fragment>
 </Wix>

installer/PowerToysSetupVNext/Core.wxs

@@ -9,25 +9,6 @@
           <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
         </RegistryKey>
       </Component>
-      <?if $(var.PerUser) = "true" ?>
-      <Component Id="powertoys_env_path_user" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to current user's PATH -->
-        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?else?>
-      <Component Id="powertoys_env_path_machine" Bitness="always64">
-        <!-- Anchor registry for component key path -->
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <!-- Append install folder to machine PATH -->
-        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLFOLDER]" />
-      </Component>
-      <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
         <RemoveFolder Id="Remove_powertoys_toast_clsid" On="uninstall" />
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
@@ -128,11 +109,6 @@
       <ComponentRef Id="powertoys_exe" />
       <ComponentRef Id="PowerToysStartMenuShortcut" />
       <ComponentRef Id="powertoys_per_machine_comp" />
-  <?if $(var.PerUser) = "true" ?>
-  <ComponentRef Id="powertoys_env_path_user" />
-  <?else?>
-  <ComponentRef Id="powertoys_env_path_machine" />
-  <?endif?>
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />

installer/PowerToysSetupVNext/PowerToys.wxs

@@ -28,9 +28,6 @@
 
         <Log Disable="no" Prefix="powertoys-bootstrapper-msi-$(var.Version)" Extension=".log" />
 
-        <!-- Store Bundle UpgradeCode for CustomAction -->
-        <Variable Name="BundleUpgradeCode" Type="string" Value="$(var.UpgradeCode)" />
-
       <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
       <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
       <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0" />
@@ -61,7 +58,6 @@
             <MsiPackage DisplayName="PowerToys MSI" SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)" Compressed="yes" bal:DisplayInternalUICondition="false">
                 <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
                 <MsiProperty Name="MSIRESTARTMANAGERCONTROL" Value="Disable" />
-                <MsiProperty Name="BUNDLEINFO" Value="[BundleUpgradeCode]" />
             </MsiPackage>
         </Chain>
     </Bundle>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -14,7 +14,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -25,7 +24,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -117,7 +115,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
-    <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />
     <Compile Include="Settings.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -62,7 +62,6 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
-      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -70,8 +69,8 @@
       <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" Sequence="execute" />
-    
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
 
     <UI>
@@ -118,8 +117,6 @@
 
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
-      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed" />
-      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
@@ -163,9 +160,6 @@
 
     <CustomAction Id="SetInstallCmdPalPackageParam" Property="InstallCmdPalPackage" Value="[INSTALLFOLDER]" />
 
-    <!-- Set InstallLocation for Bundle entry as well -->
-    <CustomAction Id="SetBundleInstallLocationData" Property="SetBundleInstallLocation" Value="[INSTALLFOLDER];[BUNDLEINFO];[InstallScope]" />
-
     <CustomAction Id="LaunchPowerToys" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="LaunchPowerToysCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="TerminateProcesses" Return="ignore" Execute="immediate" DllEntry="TerminateProcessesCA" BinaryRef="PTCustomActions" />
@@ -250,8 +244,6 @@
 
     <CustomAction Id="InstallCmdPalPackage" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallCmdPalPackageCA" BinaryRef="PTCustomActions" />
 
-    <CustomAction Id="SetBundleInstallLocation" Return="ignore" Impersonate="no" Execute="deferred" DllEntry="SetBundleInstallLocationCA" BinaryRef="PTCustomActions" />
-
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />

installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1

@@ -1,102 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True)]
-    [string]$dscWxsFile,
-    [Parameter(Mandatory = $True)]
-    [string]$Platform,
-    [Parameter(Mandatory = $True)]
-    [string]$Configuration
-)
-
-$ErrorActionPreference = 'Stop'
-
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-# Find build output directory
-$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
-
-if (-not (Test-Path $buildOutputDir)) {
-    Write-Error "Build output directory not found: '$buildOutputDir'"
-    exit 1
-}
-
-# Find all DSC manifest JSON files
-$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
-
-if (-not $dscFiles) {
-    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
-    # Create empty component group
-    $wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-    Set-Content -Path $dscWxsFile -Value $wxsContent
-    exit 0
-}
-
-Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
-
-# Generate WiX fragment
-$wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-"@
-
-$componentRefs = @()
-
-foreach ($file in $dscFiles) {
-    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
-    $fileId = $componentId + "_File"
-    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
-    
-    $componentRefs += $componentId
-    
-    $wxsContent += @"
-
-      <Component Id="$componentId" Guid="{$guid}" Directory="DSCModulesReferenceFolder">
-        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
-      </Component>
-"@
-}
-
-$wxsContent += @"
-
-    </DirectoryRef>
-  </Fragment>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-"@
-
-foreach ($componentId in $componentRefs) {
-    $wxsContent += @"
-
-      <ComponentRef Id="$componentId"/>
-"@
-}
-
-$wxsContent += @"
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-
-# Write the WiX file
-Set-Content -Path $dscWxsFile -Value $wxsContent
-
-Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

nuget.config

@@ -2,11 +2,11 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
+		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies%40Local/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>

src/common/Common.UI/SettingsDeepLink.cs

@@ -17,6 +17,7 @@ namespace Common.UI
             Awake,
             ColorPicker,
             CmdNotFound,
+            LightSwitch,
             FancyZones,
             FileLocksmith,
             Run,
@@ -60,6 +61,8 @@ namespace Common.UI
                     return "ColorPicker";
                 case SettingsWindow.CmdNotFound:
                     return "CmdNotFound";
+                case SettingsWindow.LightSwitch:
+                    return "LightSwitch";
                 case SettingsWindow.FancyZones:
                     return "FancyZones";
                 case SettingsWindow.FileLocksmith:

src/common/GPOWrapper/GPOWrapper.cpp

@@ -28,6 +28,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCropAndLockEnabledValue());
     }
+    GpoRuleConfigured GPOWrapper::GetConfiguredLightSwitchEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredLightSwitchEnabledValue());
+    }
     GpoRuleConfigured GPOWrapper::GetConfiguredFancyZonesEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredFancyZonesEnabledValue());

src/common/GPOWrapper/GPOWrapper.h

@@ -13,6 +13,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
         static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
         static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+        static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
         static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
         static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
         static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();

src/common/GPOWrapper/GPOWrapper.idl

@@ -17,6 +17,7 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
             static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
             static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+            static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
             static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
             static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
             static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();

src/common/ManagedCommon/ModuleType.cs

@@ -12,6 +12,7 @@ namespace ManagedCommon
         ColorPicker,
         CmdPal,
         CropAndLock,
+        LightSwitch,
         EnvironmentVariables,
         FancyZones,
         FileLocksmith,

src/common/UITestAutomation/ModuleConfigData.cs

@@ -33,7 +33,6 @@ namespace Microsoft.PowerToys.UITest
         Workspaces,
         PowerRename,
         CommandPalette,
-        ScreenRuler,
     }
 
     /// <summary>
@@ -105,7 +104,6 @@ namespace Microsoft.PowerToys.UITest
                 [PowerToysModule.Workspaces] = new ModuleInfo("PowerToys.WorkspacesEditor.exe", "Workspaces Editor"),
                 [PowerToysModule.PowerRename] = new ModuleInfo("PowerToys.PowerRename.exe", "PowerRename", "WinUI3Apps"),
                 [PowerToysModule.CommandPalette] = new ModuleInfo("Microsoft.CmdPal.UI.exe", "PowerToys Command Palette", "WinUI3Apps\\CmdPal"),
-                [PowerToysModule.ScreenRuler] = new ModuleInfo("PowerToys.MeasureToolUI.exe", "PowerToys.ScreenRuler", "WinUI3Apps"),
             };
         }
 

src/common/UITestAutomation/UITestBase.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -95,7 +94,6 @@ namespace Microsoft.PowerToys.UITest
                 {
                     Task.Delay(1000).Wait();
                     AddScreenShotsToTestResultsDirectory();
-                    AddLogFilesToTestResultsDirectory();
                 }
             }
 
@@ -600,92 +598,6 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
-        /// <summary>
-        /// Copies PowerToys log files to test results directory when test fails.
-        /// Renames files to include the directory structure after \PowerToys.
-        /// </summary>
-        protected void AddLogFilesToTestResultsDirectory()
-        {
-            try
-            {
-                var localAppDataLow = Path.Combine(
-                    Environment.GetEnvironmentVariable("USERPROFILE") ?? string.Empty,
-                    "AppData",
-                    "LocalLow",
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppDataLow))
-                {
-                    CopyLogFilesFromDirectory(localAppDataLow, string.Empty);
-                }
-
-                var localAppData = Path.Combine(
-                    Environment.GetEnvironmentVariable("LOCALAPPDATA") ?? string.Empty,
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppData))
-                {
-                    CopyLogFilesFromDirectory(localAppData, string.Empty);
-                }
-            }
-            catch (Exception ex)
-            {
-                // Don't fail the test if log file copying fails
-                Console.WriteLine($"Failed to copy log files: {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Recursively copies log files from a directory and renames them with directory structure.
-        /// </summary>
-        /// <param name="sourceDir">Source directory to copy from</param>
-        /// <param name="relativePath">Relative path from PowerToys folder</param>
-        private void CopyLogFilesFromDirectory(string sourceDir, string relativePath)
-        {
-            if (!Directory.Exists(sourceDir))
-            {
-                return;
-            }
-
-            // Process log files in current directory
-            var logFiles = Directory.GetFiles(sourceDir, "*.log");
-            foreach (var logFile in logFiles)
-            {
-                try
-                {
-                    var fileName = Path.GetFileName(logFile);
-                    var fileNameWithoutExt = Path.GetFileNameWithoutExtension(fileName);
-                    var extension = Path.GetExtension(fileName);
-
-                    // Create new filename with directory structure
-                    var directoryPart = string.IsNullOrEmpty(relativePath) ? string.Empty : relativePath.Replace("\\", "-") + "-";
-                    var newFileName = $"{directoryPart}{fileNameWithoutExt}{extension}";
-
-                    // Copy file to test results directory with new name
-                    var testResultsDir = TestContext.TestResultsDirectory ?? Path.GetTempPath();
-                    var destinationPath = Path.Combine(testResultsDir, newFileName);
-
-                    File.Copy(logFile, destinationPath, true);
-                    TestContext.AddResultFile(destinationPath);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Failed to copy log file {logFile}: {ex.Message}");
-                }
-            }
-
-            // Recursively process subdirectories
-            var subdirectories = Directory.GetDirectories(sourceDir);
-            foreach (var subdir in subdirectories)
-            {
-                var dirName = Path.GetFileName(subdir);
-                var newRelativePath = string.IsNullOrEmpty(relativePath) ? dirName : Path.Combine(relativePath, dirName);
-                CopyLogFilesFromDirectory(subdir, newRelativePath);
-            }
-        }
-
         /// <summary>
         /// Restart scope exe.
         /// </summary>

src/common/common.instructions.md

@@ -1,16 +0,0 @@
----
-applyTo: "**/*.cs,**/*.cpp,**/*.c,**/*.h,**/*.hpp"
----
-# Common – shared libraries guidance (concise)
-
-Scope
-- Logging, IPC, settings, DPI, telemetry, utilities consumed by multiple modules.
-
-Guidelines
-- Avoid breaking public headers/APIs; if changed, search & update all callers.
-- Coordinate ABI-impacting struct/class layout changes; keep binary compatibility.
-- Watch perf in hot paths (hooks, timers, serialization); avoid avoidable allocations.
-- Ask before adding third‑party deps or changing serialization formats.
-
-Acceptance
-- No unintended ABI breaks, no noisy logs, new non-obvious symbols briefly commented.

src/common/logger/logger_settings.h

@@ -81,6 +81,7 @@ struct LogSettings
     inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
     inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.log";
     inline const static std::string zoomItLoggerName = "zoom-it";
+    inline const static std::string lightSwitchLoggerName = "light-switch";
     inline const static int retention = 30;
     std::wstring logLevel;
     LogSettings();

src/common/utils/elevation.h

@@ -257,7 +257,10 @@ inline HANDLE run_elevated(const std::wstring& file, const std::wstring& params,
         exec_info.nShow = SW_HIDE;
     }
 
-    return ShellExecuteExW(&exec_info) ? exec_info.hProcess : nullptr;
+    // failing bc using "runas" with PowerToys.exe already running?
+    BOOL result = ShellExecuteExW(&exec_info);
+
+    return result  ? exec_info.hProcess : nullptr;
 }
 
 // Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL

src/common/utils/gpo.h

@@ -30,6 +30,7 @@ namespace powertoys_gpo
     const std::wstring POLICY_CONFIGURE_ENABLED_CMD_NOT_FOUND = L"ConfigureEnabledUtilityCmdNotFound";
     const std::wstring POLICY_CONFIGURE_ENABLED_COLOR_PICKER = L"ConfigureEnabledUtilityColorPicker";
     const std::wstring POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK = L"ConfigureEnabledUtilityCropAndLock";
+    const std::wstring POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH = L"ConfigureEnabledUtilityLightSwitch";
     const std::wstring POLICY_CONFIGURE_ENABLED_FANCYZONES = L"ConfigureEnabledUtilityFancyZones";
     const std::wstring POLICY_CONFIGURE_ENABLED_FILE_LOCKSMITH = L"ConfigureEnabledUtilityFileLocksmith";
     const std::wstring POLICY_CONFIGURE_ENABLED_SVG_PREVIEW = L"ConfigureEnabledUtilityFileExplorerSVGPreview";
@@ -295,6 +296,11 @@ namespace powertoys_gpo
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK);
     }
 
+    inline gpo_rule_configured_t getConfiguredLightSwitchEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH);
+    }
+
     inline gpo_rule_configured_t getConfiguredFancyZonesEnabledValue()
     {
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_FANCYZONES);

src/common/utils/logger_helper.h

@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <common/version/version.h>
 #include <common/SettingsAPI/settings_helpers.h>
+#include <common/logger/logger_settings.h>
 
 namespace LoggerHelpers
 {

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

@@ -31,11 +31,11 @@
     <!-- The following sections assume that the machine we're building on is always x64. That means we won't be able to run/inspect arm64 executables, therefore we must always execute x64 generator. -->
 
     <Target Name="PostBuildAction" AfterTargets="Build" Outputs="$(GeneratedDSCModule)" Condition="'$(Platform)'!='ARM64'">
-        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;..\..\..\x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
+        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;$(SolutionDir)x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
     </Target>
 
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(Platform)'=='ARM64'">
-      <Exec Command="&quot;$(MSBuildToolsPath)\msbuild.exe&quot; PowerToys.sln -p:Configuration=&quot;$(Configuration)&quot; -p:Platform=&quot;x64&quot; -verbosity:m -t:DSC\PowerToys_Settings_DSC_Schema_Generator" WorkingDirectory="..\..\..\" />
+      <Exec Command="&quot;$(MSBuildToolsPath)\msbuild.exe&quot; PowerToys.sln -p:Configuration=&quot;$(Configuration)&quot; -p:Platform=&quot;x64&quot; -verbosity:m -t:DSC\PowerToys_Settings_DSC_Schema_Generator" WorkingDirectory="$(SolutionDir)" />
     </Target>
 
 </Project>

src/dsc/v3/PowerToys.DSC.UnitTests/BaseDscTest.cs

@@ -1,68 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.CommandLine;
-using System.CommandLine.Parsing;
-using System.Globalization;
-using System.IO;
-using System.Resources;
-using PowerToys.DSC.UnitTests.Models;
-
-namespace PowerToys.DSC.UnitTests;
-
-public class BaseDscTest
-{
-    private readonly ResourceManager _resourceManager;
-
-    public BaseDscTest()
-    {
-        _resourceManager = new ResourceManager("PowerToys.DSC.Properties.Resources", typeof(PowerToys.DSC.Program).Assembly);
-    }
-
-    /// <summary>
-    /// Returns the string resource for the given name, formatted with the provided arguments.
-    /// </summary>
-    /// <param name="name">The name of the resource string.</param>
-    /// <param name="args">The arguments to format the resource string with.</param>
-    /// <returns></returns>
-    public string GetResourceString(string name, params string[] args)
-    {
-        return string.Format(CultureInfo.InvariantCulture, _resourceManager.GetString(name, CultureInfo.InvariantCulture), args);
-    }
-
-    /// <summary>
-    /// Execute a dsc command with the provided arguments.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="args"></param>
-    /// <returns></returns>
-    protected DscExecuteResult ExecuteDscCommand<T>(params string[] args)
-        where T : Command, new()
-    {
-        var originalOut = Console.Out;
-        var originalErr = Console.Error;
-
-        var outSw = new StringWriter();
-        var errSw = new StringWriter();
-
-        try
-        {
-            Console.SetOut(outSw);
-            Console.SetError(errSw);
-
-            var executeResult = new T().Invoke(args);
-            var output = outSw.ToString();
-            var errorOutput = errSw.ToString();
-            return new(executeResult == 0, output, errorOutput);
-        }
-        finally
-        {
-            Console.SetOut(originalOut);
-            Console.SetError(originalErr);
-            outSw.Dispose();
-            errSw.Dispose();
-        }
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/CommandTest.cs

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerToys.DSC.Commands;
-using PowerToys.DSC.DSCResources;
-
-namespace PowerToys.DSC.UnitTests;
-
-[TestClass]
-public sealed class CommandTest : BaseDscTest
-{
-    [TestMethod]
-    public void GetResource_Found_Success()
-    {
-        // Act
-        var result = ExecuteDscCommand<GetCommand>("--resource", SettingsResource.ResourceName);
-
-        // Assert
-        Assert.IsTrue(result.Success);
-    }
-
-    [TestMethod]
-    public void GetResource_NotFound_Fail()
-    {
-        // Arrange
-        var availableResources = string.Join(", ", BaseCommand.AvailableResources);
-
-        // Act
-        var result = ExecuteDscCommand<GetCommand>("--resource", "ResourceNotFound");
-
-        // Assert
-        Assert.IsFalse(result.Success);
-        Assert.Contains(GetResourceString("InvalidResourceNameError", availableResources), result.Error);
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/Models/DscExecuteResult.cs

@@ -1,103 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text.Json;
-using PowerToys.DSC.Models;
-
-namespace PowerToys.DSC.UnitTests.Models;
-
-/// <summary>
-/// Result of executing a DSC command.
-/// </summary>
-public class DscExecuteResult
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DscExecuteResult"/> class.
-    /// </summary>
-    /// <param name="success">Value indicating whether the command execution was successful.</param>
-    /// <param name="output">Output stream content.</param>
-    /// <param name="error">Error stream content.</param>
-    public DscExecuteResult(bool success, string output, string error)
-    {
-        Success = success;
-        Output = output;
-        Error = error;
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the command execution was successful.
-    /// </summary>
-    public bool Success { get; }
-
-    /// <summary>
-    /// Gets the output stream content of the operation.
-    /// </summary>
-    public string Output { get; }
-
-    /// <summary>
-    /// Gets the error stream content of the operation.
-    /// </summary>
-    public string Error { get; }
-
-    /// <summary>
-    /// Gets the messages from the error stream.
-    /// </summary>
-    /// <returns>List of messages with their levels.</returns>
-    public List<(DscMessageLevel Level, string Message)> Messages()
-    {
-        var lines = Error.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
-        return lines.SelectMany(line =>
-        {
-            var map = JsonSerializer.Deserialize<Dictionary<string, string>>(line);
-            return map.Select(v => (GetMessageLevel(v.Key), v.Value)).ToList();
-        }).ToList();
-    }
-
-    /// <summary>
-    /// Gets the output as state.
-    /// </summary>
-    /// <returns>State.</returns>
-    public T OutputState<T>()
-    {
-        var lines = Output.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
-        Debug.Assert(lines.Length == 1, "Output should contain exactly one line.");
-        return JsonSerializer.Deserialize<T>(lines[0]);
-    }
-
-    /// <summary>
-    /// Gets the output as state and diff.
-    /// </summary>
-    /// <returns>State and diff.</returns>
-    public (T State, List<string> Diff) OutputStateAndDiff<T>()
-    {
-        var lines = Output.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
-        Debug.Assert(lines.Length == 2, "Output should contain exactly two lines.");
-        var obj = JsonSerializer.Deserialize<T>(lines[0]);
-        var diff = JsonSerializer.Deserialize<List<string>>(lines[1]);
-        return (obj, diff);
-    }
-
-    /// <summary>
-    /// Gets the message level from a string representation.
-    /// </summary>
-    /// <param name="level">The string representation of the message level.</param>
-    /// <returns>The level as <see cref="DscMessageLevel"/>.</returns>
-    /// <exception cref="ArgumentOutOfRangeException">Thrown when the level is unknown.</exception>
-    private DscMessageLevel GetMessageLevel(string level)
-    {
-        return level switch
-        {
-            "error" => DscMessageLevel.Error,
-            "warn" => DscMessageLevel.Warning,
-            "info" => DscMessageLevel.Info,
-            "debug" => DscMessageLevel.Debug,
-            "trace" => DscMessageLevel.Trace,
-            _ => throw new ArgumentOutOfRangeException(nameof(level), level, "Unknown message level"),
-        };
-    }
-}

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

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

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs

@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceAdvancedPasteModuleTest : SettingsResourceModuleTest<AdvancedPasteSettings>
-{
-    public SettingsResourceAdvancedPasteModuleTest()
-        : base(nameof(ModuleType.AdvancedPaste))
-    {
-    }
-
-    protected override Action<AdvancedPasteSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Properties.ShowCustomPreview = !s.Properties.ShowCustomPreview;
-            s.Properties.CloseAfterLosingFocus = !s.Properties.CloseAfterLosingFocus;
-            s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
-            s.Properties.AdvancedPasteUIShortcut = new HotkeySettings
-            {
-                Key = "mock",
-                Alt = true,
-            };
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAlwaysOnTopModuleTest.cs

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceAlwaysOnTopModuleTest : SettingsResourceModuleTest<AlwaysOnTopSettings>
-{
-    public SettingsResourceAlwaysOnTopModuleTest()
-        : base(nameof(ModuleType.AlwaysOnTop))
-    {
-    }
-
-    protected override Action<AlwaysOnTopSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Properties.RoundCornersEnabled.Value = !s.Properties.RoundCornersEnabled.Value;
-            s.Properties.FrameEnabled.Value = !s.Properties.FrameEnabled.Value;
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAppModuleTest.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerToys.DSC.DSCResources;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceAppModuleTest : SettingsResourceModuleTest<GeneralSettings>
-{
-    public SettingsResourceAppModuleTest()
-        : base(SettingsResource.AppModule)
-    {
-    }
-
-    protected override Action<GeneralSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Startup = !s.Startup;
-            s.ShowSysTrayIcon = !s.ShowSysTrayIcon;
-            s.Enabled.Awake = !s.Enabled.Awake;
-            s.Enabled.ColorPicker = !s.Enabled.ColorPicker;
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAwakeModuleTest.cs

@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceAwakeModuleTest : SettingsResourceModuleTest<AwakeSettings>
-{
-    public SettingsResourceAwakeModuleTest()
-        : base(nameof(ModuleType.Awake))
-    {
-    }
-
-    protected override Action<AwakeSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Properties.ExpirationDateTime = DateTimeOffset.MinValue;
-            s.Properties.IntervalHours = DefaultSettings.Properties.IntervalHours + 1;
-            s.Properties.IntervalMinutes = DefaultSettings.Properties.IntervalMinutes + 1;
-            s.Properties.Mode = s.Properties.Mode == AwakeMode.PASSIVE ? AwakeMode.TIMED : AwakeMode.PASSIVE;
-            s.Properties.KeepDisplayOn = !s.Properties.KeepDisplayOn;
-            s.Properties.CustomTrayTimes = new Dictionary<string, uint>
-            {
-                { "08:00", 1 },
-                { "12:00", 2 },
-                { "16:00", 3 },
-            };
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceColorPickerModuleTest.cs

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceColorPickerModuleTest : SettingsResourceModuleTest<ColorPickerSettings>
-{
-    public SettingsResourceColorPickerModuleTest()
-        : base(nameof(ModuleType.ColorPicker))
-    {
-    }
-
-    protected override Action<ColorPickerSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Properties.ShowColorName = !s.Properties.ShowColorName;
-            s.Properties.ColorHistoryLimit = s.Properties.ColorHistoryLimit == 0 ? 10 : 0;
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCommandTest.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;
-using System.Collections.Generic;
-using System.Linq;
-using ManagedCommon;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerToys.DSC.Commands;
-using PowerToys.DSC.DSCResources;
-using PowerToys.DSC.Models;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceCommandTest : BaseDscTest
-{
-    [TestMethod]
-    public void Modules_ListAllSupportedModules()
-    {
-        // Arrange
-        var expectedModules = new List<string>()
-        {
-            SettingsResource.AppModule,
-            nameof(ModuleType.AdvancedPaste),
-            nameof(ModuleType.AlwaysOnTop),
-            nameof(ModuleType.Awake),
-            nameof(ModuleType.ColorPicker),
-            nameof(ModuleType.CropAndLock),
-            nameof(ModuleType.EnvironmentVariables),
-            nameof(ModuleType.FancyZones),
-            nameof(ModuleType.FileLocksmith),
-            nameof(ModuleType.FindMyMouse),
-            nameof(ModuleType.Hosts),
-            nameof(ModuleType.ImageResizer),
-            nameof(ModuleType.KeyboardManager),
-            nameof(ModuleType.MouseHighlighter),
-            nameof(ModuleType.MouseJump),
-            nameof(ModuleType.MousePointerCrosshairs),
-            nameof(ModuleType.Peek),
-            nameof(ModuleType.PowerRename),
-            nameof(ModuleType.PowerAccent),
-            nameof(ModuleType.RegistryPreview),
-            nameof(ModuleType.MeasureTool),
-            nameof(ModuleType.ShortcutGuide),
-            nameof(ModuleType.PowerOCR),
-            nameof(ModuleType.Workspaces),
-            nameof(ModuleType.ZoomIt),
-        };
-
-        // Act
-        var result = ExecuteDscCommand<ModulesCommand>("--resource", SettingsResource.ResourceName);
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        Assert.AreEqual(string.Join(Environment.NewLine, expectedModules.Order()), result.Output.Trim());
-    }
-
-    [TestMethod]
-    public void Set_EmptyInput_Fail()
-    {
-        // Act
-        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", "Awake");
-        var messages = result.Messages();
-
-        // Assert
-        Assert.IsFalse(result.Success);
-        Assert.AreEqual(1, messages.Count);
-        Assert.AreEqual(DscMessageLevel.Error, messages[0].Level);
-        Assert.AreEqual(GetResourceString("InputEmptyOrNullError"), messages[0].Message);
-    }
-
-    [TestMethod]
-    public void Test_EmptyInput_Fail()
-    {
-        // Act
-        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", "Awake");
-        var messages = result.Messages();
-
-        // Assert
-        Assert.IsFalse(result.Success);
-        Assert.AreEqual(1, messages.Count);
-        Assert.AreEqual(DscMessageLevel.Error, messages[0].Level);
-        Assert.AreEqual(GetResourceString("InputEmptyOrNullError"), messages[0].Message);
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCropAndLockModuleTest.cs

@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-[TestClass]
-public sealed class SettingsResourceCropAndLockModuleTest : SettingsResourceModuleTest<CropAndLockSettings>
-{
-    public SettingsResourceCropAndLockModuleTest()
-        : base(nameof(ModuleType.CropAndLock))
-    {
-    }
-
-    protected override Action<CropAndLockSettings> GetSettingsModifier()
-    {
-        return s =>
-        {
-            s.Properties.ThumbnailHotkey = new KeyboardKeysProperty()
-            {
-                Value = new HotkeySettings
-                {
-                    Key = "mock",
-                    Alt = true,
-                },
-            };
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceModuleTest`1.cs

@@ -1,267 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PowerToys.DSC.Commands;
-using PowerToys.DSC.DSCResources;
-using PowerToys.DSC.Models.ResourceObjects;
-
-namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
-
-public abstract class SettingsResourceModuleTest<TSettingsConfig> : BaseDscTest
-    where TSettingsConfig : ISettingsConfig, new()
-{
-    private readonly SettingsUtils _settingsUtils = new();
-    private TSettingsConfig _originalSettings;
-
-    protected TSettingsConfig DefaultSettings => new();
-
-    protected string Module { get; }
-
-    protected List<string> DiffSettings { get; } = [SettingsResourceObject<AwakeSettings>.SettingsJsonPropertyName];
-
-    protected List<string> DiffEmpty { get; } = [];
-
-    public SettingsResourceModuleTest(string module)
-    {
-        Module = module;
-    }
-
-    [TestInitialize]
-    public void TestInitialize()
-    {
-        _originalSettings = GetSettings();
-        ResetSettingsToDefaultValues();
-    }
-
-    [TestCleanup]
-    public void TestCleanup()
-    {
-        SaveSettings(_originalSettings);
-    }
-
-    [TestMethod]
-    public void Get_Success()
-    {
-        // Arrange
-        var settingsBeforeExecute = GetSettings();
-
-        // Act
-        var result = ExecuteDscCommand<GetCommand>("--resource", SettingsResource.ResourceName, "--module", Module);
-        var state = result.OutputState<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
-        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
-    }
-
-    [TestMethod]
-    public void Export_Success()
-    {
-        // Arrange
-        var settingsBeforeExecute = GetSettings();
-
-        // Act
-        var result = ExecuteDscCommand<ExportCommand>("--resource", SettingsResource.ResourceName, "--module", Module);
-        var state = result.OutputState<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
-        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
-    }
-
-    [TestMethod]
-    public void SetWithDiff_Success()
-    {
-        // Arrange
-        var settingsModifier = GetSettingsModifier();
-        var input = CreateInputResourceObject(settingsModifier);
-
-        // Act
-        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
-        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsHasChanged(settingsModifier);
-        AssertStateAndSettingsAreEqual(GetSettings(), state);
-        CollectionAssert.AreEqual(DiffSettings, diff);
-    }
-
-    [TestMethod]
-    public void SetWithoutDiff_Success()
-    {
-        // Arrange
-        var settingsModifier = GetSettingsModifier();
-        UpdateSettings(settingsModifier);
-        var settingsBeforeExecute = GetSettings();
-        var input = CreateInputResourceObject(settingsModifier);
-
-        // Act
-        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
-        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
-        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
-        CollectionAssert.AreEqual(DiffEmpty, diff);
-    }
-
-    [TestMethod]
-    public void TestWithDiff_Success()
-    {
-        // Arrange
-        var settingsModifier = GetSettingsModifier();
-        var settingsBeforeExecute = GetSettings();
-        var input = CreateInputResourceObject(settingsModifier);
-
-        // Act
-        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
-        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
-        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
-        CollectionAssert.AreEqual(DiffSettings, diff);
-        Assert.IsFalse(state.InDesiredState);
-    }
-
-    [TestMethod]
-    public void TestWithoutDiff_Success()
-    {
-        // Arrange
-        var settingsModifier = GetSettingsModifier();
-        UpdateSettings(settingsModifier);
-        var settingsBeforeExecute = GetSettings();
-        var input = CreateInputResourceObject(settingsModifier);
-
-        // Act
-        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
-        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
-
-        // Assert
-        Assert.IsTrue(result.Success);
-        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
-        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
-        CollectionAssert.AreEqual(DiffEmpty, diff);
-        Assert.IsTrue(state.InDesiredState);
-    }
-
-    /// <summary>
-    /// Gets the settings modifier action for the specific settings configuration.
-    /// </summary>
-    /// <returns>An action that modifies the settings configuration.</returns>
-    protected abstract Action<TSettingsConfig> GetSettingsModifier();
-
-    /// <summary>
-    /// Resets the settings to default values.
-    /// </summary>
-    private void ResetSettingsToDefaultValues()
-    {
-        SaveSettings(DefaultSettings);
-    }
-
-    /// <summary>
-    /// Get the settings for the specified module.
-    /// </summary>
-    /// <returns>An instance of the settings type with the current configuration.</returns>
-    private TSettingsConfig GetSettings()
-    {
-        return _settingsUtils.GetSettingsOrDefault<TSettingsConfig>(DefaultSettings.GetModuleName());
-    }
-
-    /// <summary>
-    /// Saves the settings for the specified module.
-    /// </summary>
-    /// <param name="settings">Settings to save.</param>
-    private void SaveSettings(TSettingsConfig settings)
-    {
-        _settingsUtils.SaveSettings(JsonSerializer.Serialize(settings), DefaultSettings.GetModuleName());
-    }
-
-    /// <summary>
-    /// Create the resource object for the operation.
-    /// </summary>
-    /// <param name="settings">Settings to include in the resource object.</param>
-    /// <returns>A JSON string representing the resource object.</returns>
-    private string CreateResourceObject(TSettingsConfig settings)
-    {
-        var resourceObject = new SettingsResourceObject<TSettingsConfig>
-        {
-            Settings = settings,
-        };
-        return JsonSerializer.Serialize(resourceObject);
-    }
-
-    private string CreateInputResourceObject(Action<TSettingsConfig> settingsModifier)
-    {
-        var settings = DefaultSettings;
-        settingsModifier(settings);
-        return CreateResourceObject(settings);
-    }
-
-    /// <summary>
-    /// Create the response for the Get operation.
-    /// </summary>
-    /// <returns>A JSON string representing the response.</returns>
-    private string CreateGetResponse()
-    {
-        return CreateResourceObject(GetSettings());
-    }
-
-    /// <summary>
-    /// Asserts that the state and settings are equal.
-    /// </summary>
-    /// <param name="settings">Settings manifest to compare against.</param>
-    /// <param name="state">Output state to compare.</param>
-    private void AssertStateAndSettingsAreEqual(TSettingsConfig settings, SettingsResourceObject<TSettingsConfig> state)
-    {
-        AssertSettingsAreEqual(settings, state.Settings);
-    }
-
-    /// <summary>
-    /// Asserts that two settings manifests are equal.
-    /// </summary>
-    /// <param name="expected">Expected settings.</param>
-    /// <param name="actual">Actual settings.</param>
-    private void AssertSettingsAreEqual(TSettingsConfig expected, TSettingsConfig actual)
-    {
-        var expectedJson = JsonSerializer.SerializeToNode(expected) as JsonObject;
-        var actualJson = JsonSerializer.SerializeToNode(actual) as JsonObject;
-        Assert.IsTrue(JsonNode.DeepEquals(expectedJson, actualJson));
-    }
-
-    /// <summary>
-    /// Asserts that the current settings have changed.
-    /// </summary>
-    /// <param name="action">Action to prepare the default settings.</param>
-    private void AssertSettingsHasChanged(Action<TSettingsConfig> action)
-    {
-        var currentSettings = GetSettings();
-        var defaultSettings = DefaultSettings;
-        action(defaultSettings);
-        AssertSettingsAreEqual(defaultSettings, currentSettings);
-    }
-
-    /// <summary>
-    /// Updates the settings.
-    /// </summary>
-    /// <param name="action">Action to modify the settings.</param>
-    private void UpdateSettings(Action<TSettingsConfig> action)
-    {
-        var settings = GetSettings();
-        action(settings);
-        SaveSettings(settings);
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/BaseCommand.cs

@@ -1,120 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.IO;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using PowerToys.DSC.DSCResources;
-using PowerToys.DSC.Options;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Base class for all DSC commands.
-/// </summary>
-public abstract class BaseCommand : Command
-{
-    private static readonly CompositeFormat ModuleNotSupportedByResource = CompositeFormat.Parse(Resources.ModuleNotSupportedByResource);
-
-    // Shared options for all commands
-    private readonly ModuleOption _moduleOption;
-    private readonly ResourceOption _resourceOption;
-    private readonly InputOption _inputOption;
-
-    // The dictionary of available resources and their factories.
-    private static readonly Dictionary<string, Func<string?, BaseResource>> _resourceFactories = new()
-    {
-        { SettingsResource.ResourceName, module => new SettingsResource(module) },
-
-        // Add other resources here
-    };
-
-    /// <summary>
-    /// Gets the list of available DSC resources that can be used with the command.
-    /// </summary>
-    public static List<string> AvailableResources => [.._resourceFactories.Keys];
-
-    /// <summary>
-    /// Gets the DSC resource to be used by the command.
-    /// </summary>
-    protected BaseResource? Resource { get; private set; }
-
-    /// <summary>
-    /// Gets the input JSON provided by the user.
-    /// </summary>
-    protected string? Input { get; private set; }
-
-    /// <summary>
-    /// Gets the PowerToys module to be used by the command.
-    /// </summary>
-    protected string? Module { get; private set; }
-
-    public BaseCommand(string name, string description)
-        : base(name, description)
-    {
-        // Register the common options for all commands
-        _moduleOption = new ModuleOption();
-        AddOption(_moduleOption);
-
-        _resourceOption = new ResourceOption(AvailableResources);
-        AddOption(_resourceOption);
-
-        _inputOption = new InputOption();
-        AddOption(_inputOption);
-
-        // Register the command handler
-        this.SetHandler(CommandHandler);
-    }
-
-    /// <summary>
-    /// Handles the command invocation.
-    /// </summary>
-    /// <param name="context">The invocation context containing the parsed command options.</param>
-    public void CommandHandler(InvocationContext context)
-    {
-        Input = context.ParseResult.GetValueForOption(_inputOption);
-        Module = context.ParseResult.GetValueForOption(_moduleOption);
-        Resource = ResolvedResource(context);
-
-        // Validate the module against the resource's supported modules
-        var supportedModules = Resource.GetSupportedModules();
-        if (!string.IsNullOrEmpty(Module) && !supportedModules.Contains(Module))
-        {
-            var errorMessage = string.Format(CultureInfo.InvariantCulture, ModuleNotSupportedByResource, Module, Resource.Name);
-            context.Console.Error.WriteLine(errorMessage);
-            context.ExitCode = 1;
-            return;
-        }
-
-        // Continue with the command handler logic
-        CommandHandlerInternal(context);
-    }
-
-    /// <summary>
-    /// Handles the command logic internally.
-    /// </summary>
-    /// <param name="context">Invocation context containing the parsed command options.</param>
-    public abstract void CommandHandlerInternal(InvocationContext context);
-
-    /// <summary>
-    /// Resolves the resource from the provided resource name in the context.
-    /// </summary>
-    /// <param name="context">Invocation context containing the parsed command options.</param>
-    /// <returns>The resolved <see cref="BaseResource"/> instance.</returns>
-    private BaseResource ResolvedResource(InvocationContext context)
-    {
-        // Resource option has already been validated before the command
-        // handler is invoked.
-        var resourceName = context.ParseResult.GetValueForOption(_resourceOption);
-        Debug.Assert(!string.IsNullOrEmpty(resourceName), "Resource name must not be null or empty.");
-        Debug.Assert(_resourceFactories.ContainsKey(resourceName), $"Resource '{resourceName}' is not registered.");
-        return _resourceFactories[resourceName](Module);
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/ExportCommand.cs

@@ -1,25 +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.CommandLine.Invocation;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to export all state instances.
-/// </summary>
-public sealed class ExportCommand : BaseCommand
-{
-    public ExportCommand()
-        : base("export", Resources.ExportCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        context.ExitCode = Resource!.ExportState(Input) ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/GetCommand.cs

@@ -1,25 +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.CommandLine.Invocation;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to get the resource state.
-/// </summary>
-public sealed class GetCommand : BaseCommand
-{
-    public GetCommand()
-        : base("get", Resources.GetCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        context.ExitCode = Resource!.GetState(Input) ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/ManifestCommand.cs

@@ -1,34 +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.CommandLine.Invocation;
-using PowerToys.DSC.Options;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to get the manifest of the DSC resource.
-/// </summary>
-public sealed class ManifestCommand : BaseCommand
-{
-    /// <summary>
-    /// Option to specify the output directory for the manifest.
-    /// </summary>
-    private readonly OutputDirectoryOption _outputDirectoryOption;
-
-    public ManifestCommand()
-        : base("manifest", Resources.ManifestCommandDescription)
-    {
-        _outputDirectoryOption = new OutputDirectoryOption();
-        AddOption(_outputDirectoryOption);
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        var outputDir = context.ParseResult.GetValueForOption(_outputDirectoryOption);
-        context.ExitCode = Resource!.Manifest(outputDir) ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/ModulesCommand.cs

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Diagnostics;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to get all supported modules for a specific resource.
-/// </summary>
-/// <remarks>
-/// This class is primarily used for debugging purposes and for build scripts.
-/// </remarks>
-public sealed class ModulesCommand : BaseCommand
-{
-    public ModulesCommand()
-        : base("modules", Resources.ModulesCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        // Module is optional, if not provided, all supported modules for the
-        // resource will be printed. If provided, it must be one of the
-        // supported modules since it has been validated before this command is
-        // executed.
-        if (!string.IsNullOrEmpty(Module))
-        {
-            Debug.Assert(Resource!.GetSupportedModules().Contains(Module), "Module must be present in the list of supported modules.");
-            context.Console.WriteLine(Module);
-        }
-        else
-        {
-            // Print the supported modules for the specified resource
-            foreach (var module in Resource!.GetSupportedModules())
-            {
-                context.Console.WriteLine(module);
-            }
-        }
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/SchemaCommand.cs

@@ -1,25 +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.CommandLine.Invocation;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to output the schema of the resource.
-/// </summary>
-public sealed class SchemaCommand : BaseCommand
-{
-    public SchemaCommand()
-        : base("schema", Resources.SchemaCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        context.ExitCode = Resource!.Schema() ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/SetCommand.cs

@@ -1,25 +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.CommandLine.Invocation;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to set the resource state.
-/// </summary>
-public sealed class SetCommand : BaseCommand
-{
-    public SetCommand()
-        : base("set", Resources.SetCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        context.ExitCode = Resource!.SetState(Input) ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/Commands/TestCommand.cs

@@ -1,25 +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.CommandLine.Invocation;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Commands;
-
-/// <summary>
-/// Command to test the resource state.
-/// </summary>
-public sealed class TestCommand : BaseCommand
-{
-    public TestCommand()
-        : base("test", Resources.TestCommandDescription)
-    {
-    }
-
-    /// <inheritdoc/>
-    public override void CommandHandlerInternal(InvocationContext context)
-    {
-        context.ExitCode = Resource!.TestState(Input) ? 0 : 1;
-    }
-}

src/dsc/v3/PowerToys.DSC/DSCResources/BaseResource.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.
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Nodes;
-using PowerToys.DSC.Models;
-
-namespace PowerToys.DSC.DSCResources;
-
-/// <summary>
-/// Base class for all DSC resources.
-/// </summary>
-public abstract class BaseResource
-{
-    /// <summary>
-    /// Gets the name of the resource.
-    /// </summary>
-    public string Name { get; }
-
-    /// <summary>
-    /// Gets the module being used by the resource, if provided.
-    /// </summary>
-    public string? Module { get; }
-
-    public BaseResource(string name, string? module)
-    {
-        Name = name;
-        Module = module;
-    }
-
-    /// <summary>
-    /// Calls the get method on the resource.
-    /// </summary>
-    /// <param name="input">The input string, if any.</param>
-    /// <returns>True if the operation was successful; otherwise false.</returns>
-    public abstract bool GetState(string? input);
-
-    /// <summary>
-    /// Calls the set method on the resource.
-    /// </summary>
-    /// <param name="input">The input string, if any.</param>
-    /// <returns>True if the operation was successful; otherwise false.</returns>
-    public abstract bool SetState(string? input);
-
-    /// <summary>
-    /// Calls the test method on the resource.
-    /// </summary>
-    /// <param name="input">The input string, if any.</param>
-    /// <returns>True if the operation was successful; otherwise false.</returns>
-    public abstract bool TestState(string? input);
-
-    /// <summary>
-    /// Calls the export method on the resource.
-    /// </summary>
-    /// <param name="input"> The input string, if any.</param>
-    /// <returns>True if the operation was successful; otherwise false.</returns>
-    public abstract bool ExportState(string? input);
-
-    /// <summary>
-    /// Calls the schema method on the resource.
-    /// </summary>
-    /// <returns>True if the operation was successful; otherwise false.</returns>
-    public abstract bool Schema();
-
-    /// <summary>
-    /// Generates a DSC resource JSON manifest for the resource. If the
-    /// outputDir is not provided, the manifest will be printed to the console.
-    /// </summary>
-    /// <param name="outputDir"> The directory where the manifest should be
-    /// saved. If null, the manifest will be printed to the console.</param>
-    /// <returns>True if the manifest was successfully generated and saved,otherwise false.</returns>
-    public abstract bool Manifest(string? outputDir);
-
-    /// <summary>
-    /// Gets the list of supported modules for the resource.
-    /// </summary>
-    /// <returns>Gets a list of supported modules.</returns>
-    public abstract IList<string> GetSupportedModules();
-
-    /// <summary>
-    /// Writes a JSON output line to the console.
-    /// </summary>
-    /// <param name="output">The JSON output to write.</param>
-    protected void WriteJsonOutputLine(JsonNode output)
-    {
-        var json = output.ToJsonString(new() { WriteIndented = false });
-        WriteJsonOutputLine(json);
-    }
-
-    /// <summary>
-    /// Writes a JSON output line to the console.
-    /// </summary>
-    /// <param name="output">The JSON output to write.</param>
-    protected void WriteJsonOutputLine(string output)
-    {
-        Console.WriteLine(output);
-    }
-
-    /// <summary>
-    /// Writes a message output line to the console with the specified message level.
-    /// </summary>
-    /// <param name="level">The level of the message.</param>
-    /// <param name="message">The message to write.</param>
-    protected void WriteMessageOutputLine(DscMessageLevel level, string message)
-    {
-        var messageObj = new Dictionary<string, string>
-        {
-            [GetMessageLevel(level)] = message,
-        };
-        var messageJson = System.Text.Json.JsonSerializer.Serialize(messageObj);
-        Console.Error.WriteLine(messageJson);
-    }
-
-    /// <summary>
-    /// Gets the message level as a string based on the provided dsc message level enum value.
-    /// </summary>
-    /// <param name="level">The dsc message level.</param>
-    /// <returns>A string representation of the message level.</returns>
-    /// <exception cref="ArgumentOutOfRangeException">Thrown when the provided message level is not recognized.</exception>
-    private static string GetMessageLevel(DscMessageLevel level)
-    {
-        return level switch
-        {
-            DscMessageLevel.Error => "error",
-            DscMessageLevel.Warning => "warn",
-            DscMessageLevel.Info => "info",
-            DscMessageLevel.Debug => "debug",
-            DscMessageLevel.Trace => "trace",
-            _ => throw new ArgumentOutOfRangeException(nameof(level), level, null),
-        };
-    }
-}

src/dsc/v3/PowerToys.DSC/DSCResources/SettingsResource.cs

@@ -1,248 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using PowerToys.DSC.Models;
-using PowerToys.DSC.Models.FunctionData;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.DSCResources;
-
-/// <summary>
-/// Represents the DSC resource for managing PowerToys settings.
-/// </summary>
-public sealed class SettingsResource : BaseResource
-{
-    private static readonly CompositeFormat FailedToWriteManifests = CompositeFormat.Parse(Resources.FailedToWriteManifests);
-
-    public const string AppModule = "App";
-    public const string ResourceName = "settings";
-
-    private readonly Dictionary<string, Func<string?, ISettingsFunctionData>> _moduleFunctionData;
-
-    public string ModuleOrDefault => string.IsNullOrEmpty(Module) ? AppModule : Module;
-
-    public SettingsResource(string? module)
-        : base(ResourceName, module)
-    {
-        _moduleFunctionData = new()
-        {
-            { AppModule,                                    CreateModuleFunctionData<GeneralSettings> },
-            { nameof(ModuleType.AdvancedPaste),             CreateModuleFunctionData<AdvancedPasteSettings> },
-            { nameof(ModuleType.AlwaysOnTop),               CreateModuleFunctionData<AlwaysOnTopSettings> },
-            { nameof(ModuleType.Awake),                     CreateModuleFunctionData<AwakeSettings> },
-            { nameof(ModuleType.ColorPicker),               CreateModuleFunctionData<ColorPickerSettings> },
-            { nameof(ModuleType.CropAndLock),               CreateModuleFunctionData<CropAndLockSettings> },
-            { nameof(ModuleType.EnvironmentVariables),      CreateModuleFunctionData<EnvironmentVariablesSettings> },
-            { nameof(ModuleType.FancyZones),                CreateModuleFunctionData<FancyZonesSettings> },
-            { nameof(ModuleType.FileLocksmith),             CreateModuleFunctionData<FileLocksmithSettings> },
-            { nameof(ModuleType.FindMyMouse),               CreateModuleFunctionData<FindMyMouseSettings> },
-            { nameof(ModuleType.Hosts),                     CreateModuleFunctionData<HostsSettings> },
-            { nameof(ModuleType.ImageResizer),              CreateModuleFunctionData<ImageResizerSettings> },
-            { nameof(ModuleType.KeyboardManager),           CreateModuleFunctionData<KeyboardManagerSettings> },
-            { nameof(ModuleType.MouseHighlighter),          CreateModuleFunctionData<MouseHighlighterSettings> },
-            { nameof(ModuleType.MouseJump),                 CreateModuleFunctionData<MouseJumpSettings> },
-            { nameof(ModuleType.MousePointerCrosshairs),    CreateModuleFunctionData<MousePointerCrosshairsSettings> },
-            { nameof(ModuleType.Peek),                      CreateModuleFunctionData<PeekSettings> },
-            { nameof(ModuleType.PowerRename),               CreateModuleFunctionData<PowerRenameSettings> },
-            { nameof(ModuleType.PowerAccent),               CreateModuleFunctionData<PowerAccentSettings> },
-            { nameof(ModuleType.RegistryPreview),           CreateModuleFunctionData<RegistryPreviewSettings> },
-            { nameof(ModuleType.MeasureTool),               CreateModuleFunctionData<MeasureToolSettings> },
-            { nameof(ModuleType.ShortcutGuide),             CreateModuleFunctionData<ShortcutGuideSettings> },
-            { nameof(ModuleType.PowerOCR),                  CreateModuleFunctionData<PowerOcrSettings> },
-            { nameof(ModuleType.Workspaces),                CreateModuleFunctionData<WorkspacesSettings> },
-            { nameof(ModuleType.ZoomIt),                    CreateModuleFunctionData<ZoomItSettings> },
-
-            // The following modules are not currently supported:
-            // - MouseWithoutBorders    Contains sensitive configuration values, making export/import potentially insecure.
-            // - PowerLauncher          Uses absolute file paths in its settings, which are not portable across systems.
-            // - NewPlus                Uses absolute file paths in its settings, which are not portable across systems.
-        };
-    }
-
-    /// <inheritdoc/>
-    public override bool ExportState(string? input)
-    {
-        var data = CreateFunctionData();
-        data.GetState();
-        WriteJsonOutputLine(data.Output.ToJson());
-        return true;
-    }
-
-    /// <inheritdoc/>
-    public override bool GetState(string? input)
-    {
-        return ExportState(input);
-    }
-
-    /// <inheritdoc/>
-    public override bool SetState(string? input)
-    {
-        if (string.IsNullOrEmpty(input))
-        {
-            WriteMessageOutputLine(DscMessageLevel.Error, Resources.InputEmptyOrNullError);
-            return false;
-        }
-
-        var data = CreateFunctionData(input);
-        data.GetState();
-
-        // Capture the diff before updating the output
-        var diff = data.GetDiffJson();
-
-        // Only call Set if the desired state is different from the current state
-        if (!data.TestState())
-        {
-            var inputSettings = data.Input.SettingsInternal;
-            data.Output.SettingsInternal = inputSettings;
-            data.SetState();
-        }
-
-        WriteJsonOutputLine(data.Output.ToJson());
-        WriteJsonOutputLine(diff);
-        return true;
-    }
-
-    /// <inheritdoc/>
-    public override bool TestState(string? input)
-    {
-        if (string.IsNullOrEmpty(input))
-        {
-            WriteMessageOutputLine(DscMessageLevel.Error, Resources.InputEmptyOrNullError);
-            return false;
-        }
-
-        var data = CreateFunctionData(input);
-        data.GetState();
-        data.Output.InDesiredState = data.TestState();
-
-        WriteJsonOutputLine(data.Output.ToJson());
-        WriteJsonOutputLine(data.GetDiffJson());
-        return true;
-    }
-
-    /// <inheritdoc/>
-    public override bool Schema()
-    {
-        var data = CreateFunctionData();
-        WriteJsonOutputLine(data.Schema());
-        return true;
-    }
-
-    /// <inheritdoc/>
-    /// <remarks>
-    /// If an output directory is specified, write the manifests to files,
-    /// otherwise output them to the console.
-    /// </remarks>
-    public override bool Manifest(string? outputDir)
-    {
-        var manifests = GenerateManifests();
-
-        if (!string.IsNullOrEmpty(outputDir))
-        {
-            try
-            {
-                foreach (var (name, manifest) in manifests)
-                {
-                    File.WriteAllText(Path.Combine(outputDir, $"microsoft.powertoys.{name}.settings.dsc.resource.json"), manifest);
-                }
-            }
-            catch (Exception ex)
-            {
-                var errorMessage = string.Format(CultureInfo.InvariantCulture, FailedToWriteManifests, outputDir, ex.Message);
-                WriteMessageOutputLine(DscMessageLevel.Error, errorMessage);
-                return false;
-            }
-        }
-        else
-        {
-            foreach (var (_, manifest) in manifests)
-            {
-                WriteJsonOutputLine(manifest);
-            }
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    /// Generates manifests for the specified module or all supported modules
-    /// if no module is specified.
-    /// </summary>
-    /// <returns>A list of tuples containing the module name and its corresponding manifest JSON.</returns>
-    private List<(string Name, string Manifest)> GenerateManifests()
-    {
-        List<(string Name, string Manifest)> manifests = [];
-        if (!string.IsNullOrEmpty(Module))
-        {
-            manifests.Add((Module, GenerateManifest(Module)));
-        }
-        else
-        {
-            foreach (var module in GetSupportedModules())
-            {
-                manifests.Add((module, GenerateManifest(module)));
-            }
-        }
-
-        return manifests;
-    }
-
-    /// <summary>
-    /// Generate a DSC resource JSON manifest for the specified module.
-    /// </summary>
-    /// <param name="module">The name of the module for which to generate the manifest.</param>
-    /// <returns>A JSON string representing the DSC resource manifest.</returns>
-    private string GenerateManifest(string module)
-    {
-        // Note: The description is not localized because the generated
-        // manifest file will be part of the package
-        return new DscManifest($"{module}Settings", "0.1.0")
-            .AddDescription($"Allows management of {module} settings state via the DSC v3 command line interface protocol.")
-            .AddStdinMethod("export", ["export", "--module", module, "--resource", "settings"])
-            .AddStdinMethod("get", ["get", "--module", module, "--resource", "settings"])
-            .AddJsonInputMethod("set", "--input", ["set", "--module", module, "--resource", "settings"], implementsPretest: true, stateAndDiff: true)
-            .AddJsonInputMethod("test", "--input", ["test", "--module", module, "--resource", "settings"], stateAndDiff: true)
-            .AddCommandMethod("schema", ["schema", "--module", module, "--resource", "settings"])
-            .ToJson();
-    }
-
-    /// <inheritdoc/>
-    public override IList<string> GetSupportedModules()
-    {
-        return [.. _moduleFunctionData.Keys.Order()];
-    }
-
-    /// <summary>
-    /// Creates the function data for the specified module or the default module if none is specified.
-    /// </summary>
-    /// <param name="input">The input string, if any.</param>
-    /// <returns>An instance of <see cref="ISettingsFunctionData"/> for the specified module.</returns>
-    public ISettingsFunctionData CreateFunctionData(string? input = null)
-    {
-        Debug.Assert(_moduleFunctionData.ContainsKey(ModuleOrDefault), "Module should be supported by the resource.");
-        return _moduleFunctionData[ModuleOrDefault](input);
-    }
-
-    /// <summary>
-    /// Creates the function data for a specific settings configuration type.
-    /// </summary>
-    /// <typeparam name="TSettingsConfig">The type of settings configuration to create function data for.</typeparam>
-    /// <param name="input">The input string, if any.</param>
-    /// <returns>An instance of <see cref="ISettingsFunctionData"/> for the specified settings configuration type.</returns>
-    private ISettingsFunctionData CreateModuleFunctionData<TSettingsConfig>(string? input)
-    where TSettingsConfig : ISettingsConfig, new()
-    {
-        return new SettingsFunctionData<TSettingsConfig>(input);
-    }
-}

src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs

@@ -1,152 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json.Nodes;
-
-namespace PowerToys.DSC.Models;
-
-/// <summary>
-/// Class for building a DSC manifest for PowerToys resources.
-/// </summary>
-public sealed class DscManifest
-{
-    private const string Schema = "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.vscode.json";
-    private const string Executable = @"PowerToys.DSC.exe";
-
-    private readonly string _type;
-    private readonly string _version;
-    private readonly JsonObject _manifest;
-
-    public DscManifest(string type, string version)
-    {
-        _type = type;
-        _version = version;
-        _manifest = new JsonObject
-        {
-            ["$schema"] = Schema,
-            ["type"] = $"Microsoft.PowerToys/{_type}",
-            ["version"] = _version,
-            ["tags"] = new JsonArray("PowerToys"),
-        };
-    }
-
-    /// <summary>
-    /// Adds a description to the manifest.
-    /// </summary>
-    /// <param name="description">The description to add.</param>
-    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
-    public DscManifest AddDescription(string description)
-    {
-        _manifest["description"] = description;
-        return this;
-    }
-
-    /// <summary>
-    /// Adds a method to the manifest with the specified executable and arguments.
-    /// </summary>
-    /// <param name="method">The name of the method to add.</param>
-    /// <param name="inputArg">The input argument for the method</param>
-    /// <param name="args">The list of arguments for the method.</param>
-    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
-    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
-    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
-    public DscManifest AddJsonInputMethod(string method, string inputArg, List<string> args, bool? implementsPretest = null, bool? stateAndDiff = null)
-    {
-        var argsJson = CreateJsonArray(args);
-        argsJson.Add(new JsonObject
-        {
-            ["jsonInputArg"] = inputArg,
-            ["mandatory"] = true,
-        });
-        var methodObject = AddMethod(argsJson, implementsPretest, stateAndDiff);
-        _manifest[method] = methodObject;
-        return this;
-    }
-
-    /// <summary>
-    /// Adds a method to the manifest that reads from standard input (stdin).
-    /// </summary>
-    /// <param name="method">The name of the method to add.</param>
-    /// <param name="args">The list of arguments for the method.</param>
-    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
-    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
-    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
-    public DscManifest AddStdinMethod(string method, List<string> args, bool? implementsPretest = null, bool? stateAndDiff = null)
-    {
-        var argsJson = CreateJsonArray(args);
-        var methodObject = AddMethod(argsJson, implementsPretest, stateAndDiff);
-        methodObject["input"] = "stdin";
-        _manifest[method] = methodObject;
-        return this;
-    }
-
-    /// <summary>
-    /// Adds a command method to the manifest.
-    /// </summary>
-    /// <param name="method">The name of the method to add.</param>
-    /// <param name="args">The list of arguments for the method.</param>
-    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
-    public DscManifest AddCommandMethod(string method, List<string> args)
-    {
-        _manifest[method] = new JsonObject
-        {
-            ["command"] = AddMethod(CreateJsonArray(args)),
-        };
-        return this;
-    }
-
-    /// <summary>
-    /// Gets the JSON representation of the manifest.
-    /// </summary>
-    /// <returns>Returns the JSON string of the manifest.</returns>
-    public string ToJson()
-    {
-        return _manifest.ToJsonString(new() { WriteIndented = true });
-    }
-
-    /// <summary>
-    /// Add a method to the manifest with the specified arguments.
-    /// </summary>
-    /// <param name="args">The list of arguments for the method.</param>
-    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
-    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
-    /// <returns>Returns the method object.</returns>
-    private JsonObject AddMethod(JsonArray args, bool? implementsPretest = null, bool? stateAndDiff = null)
-    {
-        var methodObject = new JsonObject
-        {
-            ["executable"] = Executable,
-            ["args"] = args,
-        };
-
-        if (implementsPretest.HasValue)
-        {
-            methodObject["implementsPretest"] = implementsPretest.Value;
-        }
-
-        if (stateAndDiff.HasValue)
-        {
-            methodObject["return"] = stateAndDiff.Value ? "stateAndDiff" : "state";
-        }
-
-        return methodObject;
-    }
-
-    /// <summary>
-    /// Creates a JSON array from a list of strings.
-    /// </summary>
-    /// <param name="args">The list of strings to convert.</param>
-    /// <returns>Returns the JSON array.</returns>
-    private JsonArray CreateJsonArray(List<string> args)
-    {
-        var jsonArray = new JsonArray();
-        foreach (var arg in args)
-        {
-            jsonArray.Add(arg);
-        }
-
-        return jsonArray;
-    }
-}

src/dsc/v3/PowerToys.DSC/Models/DscMessageLevel.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 PowerToys.DSC.Models;
-
-/// <summary>
-/// Specifies the severity level of a message.
-/// </summary>
-public enum DscMessageLevel
-{
-    /// <summary>
-    /// Represents an error message.
-    /// </summary>
-    Error,
-
-    /// <summary>
-    /// Represents a warning message.
-    /// </summary>
-    Warning,
-
-    /// <summary>
-    /// Represents an informational message.
-    /// </summary>
-    Info,
-
-    /// <summary>
-    /// Represents a debug message.
-    /// </summary>
-    Debug,
-
-    /// <summary>
-    /// Represents a trace message.
-    /// </summary>
-    Trace,
-}

src/dsc/v3/PowerToys.DSC/Models/FunctionData/BaseFunctionData.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.
-
-using Newtonsoft.Json;
-using NJsonSchema.Generation;
-using PowerToys.DSC.Models.ResourceObjects;
-
-namespace PowerToys.DSC.Models.FunctionData;
-
-/// <summary>
-/// Base class for function data objects.
-/// </summary>
-public class BaseFunctionData
-{
-    /// <summary>
-    /// Generates a JSON schema for the specified resource object type.
-    /// </summary>
-    /// <typeparam name="T">The type of the resource object.</typeparam>
-    /// <returns>A JSON schema string.</returns>
-    protected static string GenerateSchema<T>()
-        where T : BaseResourceObject
-    {
-        var settings = new SystemTextJsonSchemaGeneratorSettings()
-        {
-            FlattenInheritanceHierarchy = true,
-            SerializerOptions =
-            {
-                IgnoreReadOnlyFields = true,
-            },
-        };
-        var generator = new JsonSchemaGenerator(settings);
-        var schema = generator.Generate(typeof(T));
-        return schema.ToJson(Formatting.None);
-    }
-}

src/dsc/v3/PowerToys.DSC/Models/FunctionData/ISettingsFunctionData.cs

@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Text.Json.Nodes;
-using PowerToys.DSC.Models.ResourceObjects;
-
-namespace PowerToys.DSC.Models.FunctionData;
-
-/// <summary>
-/// Interface for function data related to settings.
-/// </summary>
-public interface ISettingsFunctionData
-{
-    /// <summary>
-    /// Gets the input settings resource object.
-    /// </summary>
-    public ISettingsResourceObject Input { get; }
-
-    /// <summary>
-    /// Gets the output settings resource object.
-    /// </summary>
-    public ISettingsResourceObject Output { get; }
-
-    /// <summary>
-    /// Gets the current settings.
-    /// </summary>
-    public void GetState();
-
-    /// <summary>
-    /// Sets the current settings.
-    /// </summary>
-    public void SetState();
-
-    /// <summary>
-    /// Tests if the current settings and the desired state are valid.
-    /// </summary>
-    /// <returns>True if the current settings match the desired state; otherwise false.</returns>
-    public bool TestState();
-
-    /// <summary>
-    /// Gets the difference between the current settings and the desired state in JSON format.
-    /// </summary>
-    /// <returns>A JSON array representing the differences.</returns>
-    public JsonArray GetDiffJson();
-
-    /// <summary>
-    /// Gets the schema for the settings resource object.
-    /// </summary>
-    /// <returns></returns>
-    public string Schema();
-}

src/dsc/v3/PowerToys.DSC/Models/FunctionData/SettingsFunctionData`1.cs

@@ -1,96 +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;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using PowerToys.DSC.Models.ResourceObjects;
-
-namespace PowerToys.DSC.Models.FunctionData;
-
-/// <summary>
-/// Represents function data for the settings DSC resource.
-/// </summary>
-/// <typeparam name="TSettingsConfig">The module settings configuration type.</typeparam>
-public sealed class SettingsFunctionData<TSettingsConfig> : BaseFunctionData, ISettingsFunctionData
-    where TSettingsConfig : ISettingsConfig, new()
-{
-    private static readonly SettingsUtils _settingsUtils = new();
-    private static readonly TSettingsConfig _settingsConfig = new();
-
-    private readonly SettingsResourceObject<TSettingsConfig> _input;
-    private readonly SettingsResourceObject<TSettingsConfig> _output;
-
-    /// <inheritdoc/>
-    public ISettingsResourceObject Input => _input;
-
-    /// <inheritdoc/>
-    public ISettingsResourceObject Output => _output;
-
-    public SettingsFunctionData(string? input = null)
-    {
-        _output = new();
-        _input = string.IsNullOrEmpty(input) ? new() : JsonSerializer.Deserialize<SettingsResourceObject<TSettingsConfig>>(input) ?? new();
-    }
-
-    /// <inheritdoc/>
-    public void GetState()
-    {
-        _output.Settings = GetSettings();
-    }
-
-    /// <inheritdoc/>
-    public void SetState()
-    {
-        Debug.Assert(_output.Settings != null, "Output settings should not be null");
-        SaveSettings(_output.Settings);
-    }
-
-    /// <inheritdoc/>
-    public bool TestState()
-    {
-        var input = JsonSerializer.SerializeToNode(_input.Settings);
-        var output = JsonSerializer.SerializeToNode(_output.Settings);
-        return JsonNode.DeepEquals(input, output);
-    }
-
-    /// <inheritdoc/>
-    public JsonArray GetDiffJson()
-    {
-        var diff = new JsonArray();
-        if (!TestState())
-        {
-            diff.Add(SettingsResourceObject<TSettingsConfig>.SettingsJsonPropertyName);
-        }
-
-        return diff;
-    }
-
-    /// <inheritdoc/>
-    public string Schema()
-    {
-        return GenerateSchema<SettingsResourceObject<TSettingsConfig>>();
-    }
-
-    /// <summary>
-    /// Gets the settings configuration from the settings utils for a specific module.
-    /// </summary>
-    /// <returns>The settings configuration for the module.</returns>
-    private static TSettingsConfig GetSettings()
-    {
-        return _settingsUtils.GetSettingsOrDefault<TSettingsConfig>(_settingsConfig.GetModuleName());
-    }
-
-    /// <summary>
-    /// Saves the settings configuration to the settings utils for a specific module.
-    /// </summary>
-    /// <param name="settings">Settings of a specific module</param>
-    private static void SaveSettings(TSettingsConfig settings)
-    {
-        var inputJson = JsonSerializer.Serialize(settings);
-        _settingsUtils.SaveSettings(inputJson, _settingsConfig.GetModuleName());
-    }
-}

src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/BaseResourceObject.cs

@@ -1,45 +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.ComponentModel;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
-
-namespace PowerToys.DSC.Models.ResourceObjects;
-
-/// <summary>
-/// Base class for all resource objects.
-/// </summary>
-public class BaseResourceObject
-{
-    private readonly JsonSerializerOptions _options;
-
-    public BaseResourceObject()
-    {
-        _options = new()
-        {
-            WriteIndented = false,
-            TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
-        };
-    }
-
-    /// <summary>
-    /// Gets or sets whether an instance is in the desired state.
-    /// </summary>
-    [JsonPropertyName("_inDesiredState")]
-    [Description("Indicates whether an instance is in the desired state")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public bool? InDesiredState { get; set; }
-
-    /// <summary>
-    /// Generates a JSON representation of the resource object.
-    /// </summary>
-    /// <returns></returns>
-    public JsonNode ToJson()
-    {
-        return JsonSerializer.SerializeToNode(this, GetType(), _options) ?? new JsonObject();
-    }
-}

src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/ISettingsResourceObject.cs

@@ -1,30 +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.Text.Json.Nodes;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-
-namespace PowerToys.DSC.Models.ResourceObjects;
-
-/// <summary>
-/// Interface for settings resource objects.
-/// </summary>
-public interface ISettingsResourceObject
-{
-    /// <summary>
-    /// Gets or sets the settings configuration.
-    /// </summary>
-    public ISettingsConfig SettingsInternal { get; set; }
-
-    /// <summary>
-    /// Gets or sets whether an instance is in the desired state.
-    /// </summary>
-    public bool? InDesiredState { get; set; }
-
-    /// <summary>
-    /// Generates a JSON representation of the resource object.
-    /// </summary>
-    /// <returns>String representation of the resource object in JSON format.</returns>
-    public JsonNode ToJson();
-}

src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/SettingsResourceObject`1.cs

@@ -1,34 +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.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using NJsonSchema.Annotations;
-
-namespace PowerToys.DSC.Models.ResourceObjects;
-
-/// <summary>
-/// Represents a settings resource object for a module's settings configuration.
-/// </summary>
-/// <typeparam name="TSettingsConfig">The type of the settings configuration.</typeparam>
-public sealed class SettingsResourceObject<TSettingsConfig> : BaseResourceObject, ISettingsResourceObject
-    where TSettingsConfig : ISettingsConfig, new()
-{
-    public const string SettingsJsonPropertyName = "settings";
-
-    /// <summary>
-    /// Gets or sets the settings content for the module.
-    /// </summary>
-    [JsonPropertyName(SettingsJsonPropertyName)]
-    [Required]
-    [Description("The settings content for the module.")]
-    [JsonSchemaType(typeof(object))]
-    public TSettingsConfig Settings { get; set; } = new();
-
-    /// <inheritdoc/>
-    [JsonIgnore]
-    public ISettingsConfig SettingsInternal { get => Settings; set => Settings = (TSettingsConfig)value; }
-}

src/dsc/v3/PowerToys.DSC/Options/InputOption.cs

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.CommandLine;
-using System.CommandLine.Parsing;
-using System.Globalization;
-using System.Text;
-using System.Text.Json;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Options;
-
-/// <summary>
-/// Represents an option for specifying JSON input for the dsc command.
-/// </summary>
-public sealed class InputOption : Option<string>
-{
-    private static readonly CompositeFormat InvalidJsonInputError = CompositeFormat.Parse(Resources.InvalidJsonInputError);
-
-    public InputOption()
-        : base("--input", Resources.InputOptionDescription)
-    {
-        AddValidator(OptionValidator);
-    }
-
-    /// <summary>
-    /// Validates the JSON input provided to the option.
-    /// </summary>
-    /// <param name="result">The option result to validate.</param>
-    private void OptionValidator(OptionResult result)
-    {
-        var value = result.GetValueOrDefault<string>() ?? string.Empty;
-        if (string.IsNullOrEmpty(value))
-        {
-            result.ErrorMessage = Resources.InputEmptyOrNullError;
-        }
-        else
-        {
-            try
-            {
-                JsonDocument.Parse(value);
-            }
-            catch (Exception e)
-            {
-                result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidJsonInputError, e.Message);
-            }
-        }
-    }
-}

src/dsc/v3/PowerToys.DSC/Options/ModuleOption.cs

@@ -1,19 +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.CommandLine;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Options;
-
-/// <summary>
-/// Represents an option for specifying the module name for the dsc command.
-/// </summary>
-public sealed class ModuleOption : Option<string?>
-{
-    public ModuleOption()
-        : base("--module", Resources.ModuleOptionDescription)
-    {
-    }
-}

src/dsc/v3/PowerToys.DSC/Options/OutputDirectoryOption.cs

@@ -1,43 +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.CommandLine;
-using System.CommandLine.Parsing;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Options;
-
-/// <summary>
-/// Represents an option for specifying the output directory for the dsc command.
-/// </summary>
-public sealed class OutputDirectoryOption : Option<string>
-{
-    private static readonly CompositeFormat InvalidOutputDirectoryError = CompositeFormat.Parse(Resources.InvalidOutputDirectoryError);
-
-    public OutputDirectoryOption()
-        : base("--outputDir", Resources.OutputDirectoryOptionDescription)
-    {
-        AddValidator(OptionValidator);
-    }
-
-    /// <summary>
-    /// Validates the output directory option.
-    /// </summary>
-    /// <param name="result">The option result to validate.</param>
-    private void OptionValidator(OptionResult result)
-    {
-        var value = result.GetValueOrDefault<string>() ?? string.Empty;
-        if (string.IsNullOrEmpty(value))
-        {
-            result.ErrorMessage = Resources.OutputDirectoryEmptyOrNullError;
-        }
-        else if (!Directory.Exists(value))
-        {
-            result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidOutputDirectoryError, value);
-        }
-    }
-}

src/dsc/v3/PowerToys.DSC/Options/ResourceOption.cs

@@ -1,43 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Parsing;
-using System.Globalization;
-using System.Text;
-using PowerToys.DSC.Properties;
-
-namespace PowerToys.DSC.Options;
-
-/// <summary>
-/// Represents an option for specifying the resource name for the dsc command.
-/// </summary>
-public sealed class ResourceOption : Option<string>
-{
-    private static readonly CompositeFormat InvalidResourceNameError = CompositeFormat.Parse(Resources.InvalidResourceNameError);
-
-    private readonly IList<string> _resources = [];
-
-    public ResourceOption(IList<string> resources)
-        : base("--resource", Resources.ResourceOptionDescription)
-    {
-        _resources = resources;
-        IsRequired = true;
-        AddValidator(OptionValidator);
-    }
-
-    /// <summary>
-    /// Validates the resource option to ensure that the specified resource name is valid.
-    /// </summary>
-    /// <param name="result">The option result to validate.</param>
-    private void OptionValidator(OptionResult result)
-    {
-        var value = result.GetValueOrDefault<string>() ?? string.Empty;
-        if (!_resources.Contains(value))
-        {
-            result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidResourceNameError, string.Join(", ", _resources));
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-<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" />
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <AssemblyName>PowerToys.DSC</AssemblyName>
-    <AssemblyDescription>PowerToys DSC</AssemblyDescription>
-    <RootNamespace>PowerToys.DSC</RootNamespace>
-    <Nullable>enable</Nullable>
-    <!-- Ensure WindowsDesktop runtime pack is included for consistent WindowsBase.dll version -->
-    <UseWPF>true</UseWPF>
-    </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NJsonSchema" />
-    <PackageReference Include="System.CommandLine" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <!-- In debug mode, generate the DSC resource JSON files -->
-    <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
-    <Message Text="Generating DSC resource JSON files inside ..." Importance="high" />
-    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)\&quot;" />
-  </Target>
-</Project>

src/dsc/v3/PowerToys.DSC/Program.cs

@@ -1,29 +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.CommandLine;
-using System.CommandLine.Parsing;
-using System.Threading.Tasks;
-using PowerToys.DSC.Commands;
-
-namespace PowerToys.DSC;
-
-/// <summary>
-/// Main entry point for the PowerToys Desired State Configuration CLI application.
-/// </summary>
-public class Program
-{
-    public static async Task<int> Main(string[] args)
-    {
-        var rootCommand = new RootCommand(Properties.Resources.PowerToysDSC);
-        rootCommand.AddCommand(new GetCommand());
-        rootCommand.AddCommand(new SetCommand());
-        rootCommand.AddCommand(new ExportCommand());
-        rootCommand.AddCommand(new TestCommand());
-        rootCommand.AddCommand(new SchemaCommand());
-        rootCommand.AddCommand(new ManifestCommand());
-        rootCommand.AddCommand(new ModulesCommand());
-        return await rootCommand.InvokeAsync(args);
-    }
-}

src/dsc/v3/PowerToys.DSC/Properties/Resources.Designer.cs

@@ -1,234 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace PowerToys.DSC.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PowerToys.DSC.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get all state instances.
-        /// </summary>
-        internal static string ExportCommandDescription {
-            get {
-                return ResourceManager.GetString("ExportCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to write manifests to directory &apos;{0}&apos;: {1}.
-        /// </summary>
-        internal static string FailedToWriteManifests {
-            get {
-                return ResourceManager.GetString("FailedToWriteManifests", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get the resource state.
-        /// </summary>
-        internal static string GetCommandDescription {
-            get {
-                return ResourceManager.GetString("GetCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Input cannot be empty or null.
-        /// </summary>
-        internal static string InputEmptyOrNullError {
-            get {
-                return ResourceManager.GetString("InputEmptyOrNullError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The JSON input.
-        /// </summary>
-        internal static string InputOptionDescription {
-            get {
-                return ResourceManager.GetString("InputOptionDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid JSON input: {0}.
-        /// </summary>
-        internal static string InvalidJsonInputError {
-            get {
-                return ResourceManager.GetString("InvalidJsonInputError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid output directory: {0}.
-        /// </summary>
-        internal static string InvalidOutputDirectoryError {
-            get {
-                return ResourceManager.GetString("InvalidOutputDirectoryError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid resource name. Valid resource names are: {0}.
-        /// </summary>
-        internal static string InvalidResourceNameError {
-            get {
-                return ResourceManager.GetString("InvalidResourceNameError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get the manifest of the dsc resource.
-        /// </summary>
-        internal static string ManifestCommandDescription {
-            get {
-                return ResourceManager.GetString("ManifestCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Module &apos;{0}&apos; is not supported for the resource {1}. Use the &apos;module&apos; command to list available modules..
-        /// </summary>
-        internal static string ModuleNotSupportedByResource {
-            get {
-                return ResourceManager.GetString("ModuleNotSupportedByResource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The module name.
-        /// </summary>
-        internal static string ModuleOptionDescription {
-            get {
-                return ResourceManager.GetString("ModuleOptionDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get all supported modules for a specific resource.
-        /// </summary>
-        internal static string ModulesCommandDescription {
-            get {
-                return ResourceManager.GetString("ModulesCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Output directory cannot be empty or null.
-        /// </summary>
-        internal static string OutputDirectoryEmptyOrNullError {
-            get {
-                return ResourceManager.GetString("OutputDirectoryEmptyOrNullError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The output directory.
-        /// </summary>
-        internal static string OutputDirectoryOptionDescription {
-            get {
-                return ResourceManager.GetString("OutputDirectoryOptionDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to PowerToys Desired State Configuration commands.
-        /// </summary>
-        internal static string PowerToysDSC {
-            get {
-                return ResourceManager.GetString("PowerToysDSC", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The resource name.
-        /// </summary>
-        internal static string ResourceOptionDescription {
-            get {
-                return ResourceManager.GetString("ResourceOptionDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Outputs schema of the resource.
-        /// </summary>
-        internal static string SchemaCommandDescription {
-            get {
-                return ResourceManager.GetString("SchemaCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Set the resource state.
-        /// </summary>
-        internal static string SetCommandDescription {
-            get {
-                return ResourceManager.GetString("SetCommandDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Test the resource state.
-        /// </summary>
-        internal static string TestCommandDescription {
-            get {
-                return ResourceManager.GetString("TestCommandDescription", resourceCulture);
-            }
-        }
-    }
-}

src/dsc/v3/PowerToys.DSC/Properties/Resources.resx

@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="PowerToysDSC" xml:space="preserve">
-    <value>PowerToys Desired State Configuration commands</value>
-    <comment>{Locked="PowerToys Desired State Configuration"}</comment>
-  </data>
-  <data name="ModuleNotSupportedByResource" xml:space="preserve">
-    <value>Module '{0}' is not supported for the resource {1}. Use the 'module' command to list available modules.</value>
-    <comment>{Locked="'module'","{0}","{1}"}</comment>
-  </data>
-  <data name="ExportCommandDescription" xml:space="preserve">
-    <value>Get all state instances</value>
-  </data>
-  <data name="GetCommandDescription" xml:space="preserve">
-    <value>Get the resource state</value>
-  </data>
-  <data name="ManifestCommandDescription" xml:space="preserve">
-    <value>Get the manifest of the dsc resource</value>
-  </data>
-  <data name="ModulesCommandDescription" xml:space="preserve">
-    <value>Get all supported modules for a specific resource</value>
-  </data>
-  <data name="SchemaCommandDescription" xml:space="preserve">
-    <value>Outputs schema of the resource</value>
-  </data>
-  <data name="SetCommandDescription" xml:space="preserve">
-    <value>Set the resource state</value>
-  </data>
-  <data name="TestCommandDescription" xml:space="preserve">
-    <value>Test the resource state</value>
-  </data>
-  <data name="InputEmptyOrNullError" xml:space="preserve">
-    <value>Input cannot be empty or null</value>
-  </data>
-  <data name="FailedToWriteManifests" xml:space="preserve">
-    <value>Failed to write manifests to directory '{0}': {1}</value>
-    <comment>{Locked="{0}","{1}"}</comment>
-  </data>
-  <data name="InputOptionDescription" xml:space="preserve">
-    <value>The JSON input</value>
-  </data>
-  <data name="ModuleOptionDescription" xml:space="preserve">
-    <value>The module name</value>
-  </data>
-  <data name="OutputDirectoryOptionDescription" xml:space="preserve">
-    <value>The output directory</value>
-  </data>
-  <data name="ResourceOptionDescription" xml:space="preserve">
-    <value>The resource name</value>
-  </data>
-  <data name="InvalidJsonInputError" xml:space="preserve">
-    <value>Invalid JSON input: {0}</value>
-    <comment>{Locked="{0}"}</comment>
-  </data>
-  <data name="OutputDirectoryEmptyOrNullError" xml:space="preserve">
-    <value>Output directory cannot be empty or null</value>
-  </data>
-  <data name="InvalidOutputDirectoryError" xml:space="preserve">
-    <value>Invalid output directory: {0}</value>
-    <comment>{Locked="{0}"}</comment>
-  </data>
-  <data name="InvalidResourceNameError" xml:space="preserve">
-    <value>Invalid resource name. Valid resource names are: {0}</value>
-    <comment>{Locked="{0}"}</comment>
-  </data>
-</root>

src/gpo/assets/PowerToys.admx

@@ -137,6 +137,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="ConfigureEnabledUtilityLightSwitch" class="Both" displayName="$(string.ConfigureEnabledUtilityLightSwitch)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityLightSwitch">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />

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

@@ -245,6 +245,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc

@@ -0,0 +1,32 @@
+1 VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Company Name"
+            VALUE "FileDescription", "Light Switch Module"
+            VALUE "FileVersion", "0.1.0.0"
+            VALUE "InternalName", "Light Switch"
+            VALUE "LegalCopyright", "Copyright (C) 2019 Company Name"
+            VALUE "OriginalFilename", "PowerToys.LightSwitchModuleInterface.dll"
+            VALUE "ProductName", "Light Switch"
+            VALUE "ProductVersion", "0.1.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36127.28 d17.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FAF634A3-0D98-4A45-B082-D93B59782572}
+	EndGlobalSection
+EndGlobal

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj

@@ -0,0 +1,229 @@
+<?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')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{38177d56-6ad1-4adf-88c9-2843a7932166}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>LightSwitchModuleInterface</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchModuleInterface</ProjectName>
+    <TargetName>PowerToys.LightSwitchModuleInterface</TargetName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(SolutionDir)src\;
+        $(SolutionDir)src\modules;
+        $(SolutionDir)src\common\Telemetry;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="trace.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp" />
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
+      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bbf22ac8-46f8-4206-b44b-9c3897e99ce5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{530ed784-9a70-46a0-8fb6-20d5dee4f7d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{da1cb871-86d3-414c-adf5-a7e9f2077d2f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp

@@ -0,0 +1,81 @@
+#include "pch.h"
+#include <windows.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+
+void SetAppsTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"AppsUseLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetSystemTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+bool GetCurrentSystemTheme()
+{
+    HKEY hKey;
+    DWORD value = 1; // default = light
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}
+
+bool GetCurrentAppsTheme()
+{
+    HKEY hKey;
+    DWORD value = 1;
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"AppsUseLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h

@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();

src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -0,0 +1,546 @@
+#include "pch.h"
+#include <interface/powertoy_module_interface.h>
+#include "trace.h"
+#include <common/logger/logger.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include <locale>
+#include <codecvt>
+#include <common/utils/logger_helper.h>
+#include "ThemeHelper.h"
+
+extern "C" IMAGE_DOS_HEADER __ImageBase;
+
+namespace
+{
+    const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
+    const wchar_t JSON_KEY_WIN[] = L"win";
+    const wchar_t JSON_KEY_ALT[] = L"alt";
+    const wchar_t JSON_KEY_CTRL[] = L"ctrl";
+    const wchar_t JSON_KEY_SHIFT[] = L"shift";
+    const wchar_t JSON_KEY_CODE[] = L"code";
+    const wchar_t JSON_KEY_TOGGLE_THEME_HOTKEY[] = L"toggle-theme-hotkey";
+    const wchar_t JSON_KEY_VALUE[] = L"value";
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        Trace::RegisterProvider();
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+// The PowerToy name that will be shown in the settings.
+const static wchar_t* MODULE_NAME = L"LightSwitch";
+// Add a description that will we shown in the module settings page.
+const static wchar_t* MODULE_DESC = L"This is a module that allows you to control light/dark theming via set times, sun rise, or directly invoking the change.";
+
+enum class ScheduleMode
+{
+    FixedHours,
+    SunsetToSunriseGeo,
+    SunsetToSunriseUser
+    // add more later
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::SunsetToSunriseGeo:
+        return L"SunsetToSunriseGeo";
+    case ScheduleMode::SunsetToSunriseUser:
+        return L"SunsetToSunriseUser";
+    case ScheduleMode::FixedHours:
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunriseGeo")
+        return ScheduleMode::SunsetToSunriseGeo;
+    if (str == L"SunsetToSunriseUser")
+        return ScheduleMode::SunsetToSunriseUser;
+    return ScheduleMode::FixedHours;
+}
+
+// These are the properties shown in the Settings page.
+struct ModuleSettings
+{
+    bool m_changeSystem = true;
+    bool m_changeApps = true;
+    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
+    int m_lightTime = 480;
+    int m_darkTime = 1200;
+    int m_offset = 0;
+    std::wstring m_latitude = L"0.0";
+    std::wstring m_longitude = L"0.0";
+} g_settings;
+
+class LightSwitchInterface : public PowertoyModuleIface
+{
+private:
+    bool m_enabled = false;
+
+    HANDLE m_process{ nullptr };
+    HANDLE m_force_light_event_handle;
+    HANDLE m_force_dark_event_handle;
+
+    static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
+
+    Hotkey m_toggle_theme_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'D' };
+
+    void init_settings();
+
+public:
+    LightSwitchInterface()
+    {
+        LoggerHelpers::init_logger(L"LightSwitch", L"ModuleInterface", LogSettings::lightSwitchLoggerName);
+
+        m_force_light_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_LIGHT");
+        m_force_dark_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_DARK");
+
+        init_settings();
+    };
+
+    virtual const wchar_t* get_key() override
+    {
+        return L"LightSwitch";
+    }
+
+    // Destroy the powertoy and free memory
+    virtual void destroy() override
+    {
+        delete this;
+    }
+
+    // Return the display name of the powertoy, this will be cached by the runner
+    virtual const wchar_t* get_name() override
+    {
+        return MODULE_NAME;
+    }
+
+    // Return the configured status for the gpo policy for the module
+    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
+    {
+        return powertoys_gpo::getConfiguredLightSwitchEnabledValue();
+    }
+
+    // Return JSON with the configuration options.
+    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
+    {
+        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+
+        // Create a Settings object with your module name
+        PowerToysSettings::Settings settings(hinstance, get_name());
+        settings.set_description(MODULE_DESC);
+        settings.set_overview_link(L"https://aka.ms/powertoys");
+
+        // Boolean toggles
+        settings.add_bool_toggle(
+            L"changeSystem",
+            L"Change System Theme",
+            g_settings.m_changeSystem);
+
+        settings.add_bool_toggle(
+            L"changeApps",
+            L"Change Apps Theme",
+            g_settings.m_changeApps);
+
+        settings.add_choice_group(
+            L"scheduleMode",
+            L"Theme schedule mode",
+            ToString(g_settings.m_scheduleMode),
+            { { L"FixedHours", L"Set hours manually" },
+              { L"SunsetToSunriseGeo", L"Use sunrise/sunset times (Geolocation)" },
+              { L"SunsetToSunriseUser", L"Use sunrise/sunset times (User selected)" } });
+
+        // Integer spinners
+        settings.add_int_spinner(
+            L"lightTime",
+            L"Time to switch to light theme (minutes after midnight).",
+            g_settings.m_lightTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"darkTime",
+            L"Time to switch to dark theme (minutes after midnight).",
+            g_settings.m_darkTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"offset",
+            L"Time to offset turning on your light/dark themes.",
+            g_settings.m_offset,
+            0,
+            1439,
+            1);
+
+        // Strings for latitude and longitude
+        settings.add_string(
+            L"latitude",
+            L"Your latitude in decimal degrees (e.g. 39.95).",
+            g_settings.m_latitude);
+
+        settings.add_string(
+            L"longitude",
+            L"Your longitude in decimal degrees (e.g. -75.16).",
+            g_settings.m_longitude);
+
+        // One-shot actions (buttons)
+        settings.add_custom_action(
+            L"forceLight",
+            L"Switch immediately to light theme",
+            L"Force Light",
+            L"{}");
+
+        settings.add_custom_action(
+            L"forceDark",
+            L"Switch immediately to dark theme",
+            L"Force Dark",
+            L"{}");
+
+        // Hotkeys
+        PowerToysSettings::HotkeyObject dm_hk = PowerToysSettings::HotkeyObject::from_settings(
+            m_toggle_theme_hotkey.win,
+            m_toggle_theme_hotkey.ctrl,
+            m_toggle_theme_hotkey.alt,
+            m_toggle_theme_hotkey.shift,
+            m_toggle_theme_hotkey.key);
+
+        settings.add_hotkey(
+            L"toggle-theme-hotkey",
+            L"Shortcut to toggle theme immediately",
+            dm_hk);
+
+        // Serialize to buffer for the PowerToys runner
+        return settings.serialize_to_buffer(buffer, buffer_size);
+    }
+
+    // Signal from the Settings editor to call a custom action.
+    // This can be used to spawn more complex editors.
+    void call_custom_action(const wchar_t* action) override
+    {
+        try
+        {
+            auto action_object = PowerToysSettings::CustomActionObject::from_json_string(action);
+
+            if (action_object.get_name() == L"forceLight")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Light");
+                SetSystemTheme(true);
+                SetAppsTheme(true);
+            }
+            else if (action_object.get_name() == L"forceDark")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Dark");
+                SetSystemTheme(false);
+                SetAppsTheme(false);
+            }
+        }
+        catch (...)
+        {
+            Logger::error(L"[Light Switch] Invalid custom action JSON");
+        }
+    }
+
+    // Called by the runner to pass the updated settings values as a serialized JSON.
+    virtual void set_config(const wchar_t* config) override
+    {
+        try
+        {
+            auto values = PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
+
+            parse_hotkey(values);
+
+            if (auto v = values.get_bool_value(L"changeSystem"))
+            {
+                g_settings.m_changeSystem = *v;
+            }
+
+            if (auto v = values.get_bool_value(L"changeApps"))
+            {
+                g_settings.m_changeApps = *v;
+            }
+
+            if (auto v = values.get_string_value(L"scheduleMode"))
+            {
+                g_settings.m_scheduleMode = FromString(*v);
+            }
+
+            if (auto v = values.get_int_value(L"lightTime"))
+            {
+                g_settings.m_lightTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"darkTime"))
+            {
+                g_settings.m_darkTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"offset"))
+            {
+                g_settings.m_offset = *v;
+            }
+
+            if (auto v = values.get_string_value(L"latitude"))
+            {
+                g_settings.m_latitude = *v;
+            }
+            if (auto v = values.get_string_value(L"longitude"))
+            {
+                g_settings.m_longitude = *v;
+            }
+
+            values.save_to_settings_file();
+        }
+        catch (const std::exception&)
+        {
+            Logger::error("[Light Switch] set_config: Failed to parse or apply config.");
+        }
+    }
+
+    virtual void enable()
+    {
+        m_enabled = true;
+        Logger::info(L"Enabling Light Switch module...");
+
+        unsigned long powertoys_pid = GetCurrentProcessId();
+        std::wstring args = L"--pid " + std::to_wstring(powertoys_pid);
+        std::wstring exe_name = L"LightSwitchService\\PowerToys.LightSwitchService.exe";
+
+        std::wstring resolved_path(MAX_PATH, L'\0');
+        DWORD result = SearchPathW(
+            nullptr,
+            exe_name.c_str(),
+            nullptr,
+            static_cast<DWORD>(resolved_path.size()),
+            resolved_path.data(),
+            nullptr);
+
+        if (result == 0 || result >= resolved_path.size())
+        {
+            Logger::error(L"Failed to locate Light Switch executable: '{}'", exe_name);
+            return;
+        }
+
+        resolved_path.resize(result);
+        Logger::debug(L"Resolved executable path: {}", resolved_path);
+
+        std::wstring command_line = L"\"" + resolved_path + L"\" " + args;
+
+        STARTUPINFO si = { sizeof(si) };
+        PROCESS_INFORMATION pi;
+
+        if (!CreateProcessW(
+                resolved_path.c_str(),
+                command_line.data(),
+                nullptr,
+                nullptr,
+                TRUE,
+                0,
+                nullptr,
+                nullptr,
+                &si,
+                &pi))
+        {
+            Logger::error(L"Failed to launch Light Switch process. {}", get_last_error_or_default(GetLastError()));
+            return;
+        }
+
+        Logger::info(L"Light Switch process launched successfully (PID: {}).", pi.dwProcessId);
+        m_process = pi.hProcess;
+        CloseHandle(pi.hThread);
+    }
+
+    // Disable the powertoy
+    virtual void disable()
+    {
+        Logger::info("Light Switch disabling");
+        m_enabled = false;
+
+        if (m_process)
+        {
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }
+
+    // Returns if the powertoys is enabled
+    virtual bool is_enabled() override
+    {
+        return m_enabled;
+    }
+
+    void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
+    {
+        auto settingsObject = settings.get_raw_json();
+        if (settingsObject.GetView().Size())
+        {
+            try
+            {
+                Hotkey _temp_toggle_theme;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_TOGGLE_THEME_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_toggle_theme.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_toggle_theme.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_toggle_theme.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_toggle_theme.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_toggle_theme.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_toggle_theme_hotkey = _temp_toggle_theme;
+            }
+            catch (...)
+            {
+                Logger::error("Failed to initialize Light Switch force dark mode shortcut from settings. Value will keep unchanged.");
+            }
+        }
+        else
+        {
+            Logger::info("Light Switch settings are empty");
+        }
+    }
+
+    virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
+    {
+        if (hotkeys && buffer_size >= 1)
+        {
+            hotkeys[0] = m_toggle_theme_hotkey;
+        }
+        return 1;
+    }
+
+    virtual bool on_hotkey(size_t hotkeyId) override
+    {
+        if (m_enabled)
+        {
+            Logger::trace(L"Light Switch hotkey pressed");
+            if (!is_process_running())
+            {
+                enable();
+            }
+            else if (hotkeyId == 0)
+            {
+                // get current will return true if in light mode, otherwise false
+                Logger::info(L"[Light Switch] Hotkey triggered: Toggle Theme");
+                if (g_settings.m_changeSystem)
+                {
+                    SetSystemTheme(!GetCurrentSystemTheme());
+                }
+                if (g_settings.m_changeApps)
+                {
+                    SetAppsTheme(!GetCurrentAppsTheme());
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool is_process_running()
+    {
+        return WaitForSingleObject(m_process, 0) == WAIT_TIMEOUT;
+    }
+};
+
+std::wstring utf8_to_wstring(const std::string& str)
+{
+    if (str.empty())
+        return std::wstring();
+
+    int size_needed = MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        nullptr,
+        0);
+
+    std::wstring wstr(size_needed, 0);
+
+    MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        &wstr[0],
+        size_needed);
+
+    return wstr;
+}
+
+// Load the settings file.
+void LightSwitchInterface::init_settings()
+{
+    Logger::info(L"[Light Switch] init_settings: starting to load settings for module");
+
+    try
+    {
+        PowerToysSettings::PowerToyValues settings =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
+
+        parse_hotkey(settings);
+
+        if (auto v = settings.get_bool_value(L"changeSystem"))
+            g_settings.m_changeSystem = *v;
+        if (auto v = settings.get_bool_value(L"changeApps"))
+            g_settings.m_changeApps = *v;
+        if (auto v = settings.get_string_value(L"scheduleMode"))
+            g_settings.m_scheduleMode = FromString(*v);
+        if (auto v = settings.get_int_value(L"lightTime"))
+            g_settings.m_lightTime = *v;
+        if (auto v = settings.get_int_value(L"darkTime"))
+            g_settings.m_darkTime = *v;
+        if (auto v = settings.get_int_value(L"offset"))
+            g_settings.m_offset = *v;
+        if (auto v = settings.get_string_value(L"latitude"))
+            g_settings.m_latitude = *v;
+        if (auto v = settings.get_string_value(L"longitude"))
+            g_settings.m_longitude = *v;
+
+        Logger::info(L"[Light Switch] init_settings: loaded successfully");
+    }
+    catch (const winrt::hresult_error& e)
+    {
+        Logger::error(L"[Light Switch] init_settings: hresult_error 0x{:08X} - {}", e.code(), e.message().c_str());
+    }
+    catch (const std::exception& e)
+    {
+        std::wstring whatStr = utf8_to_wstring(e.what());
+        Logger::error(L"[Light Switch] init_settings: std::exception - {}", whatStr);
+    }
+    catch (...)
+    {
+        Logger::error(L"[Light Switch] init_settings: unknown exception while loading settings");
+    }
+}
+
+extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
+{
+    return new LightSwitchInterface();
+}

src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp

@@ -0,0 +1,2 @@
+#include "pch.h"
+#pragma comment(lib, "windowsapp")

src/modules/LightSwitch/LightSwitchModuleInterface/pch.h

@@ -0,0 +1,14 @@
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <common/SettingsAPI/settings_helpers.h>
+#include <common/utils/gpo.h>
+#include <common/utils/winapi_error.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.System.h>
+#include <winrt/Windows.Globalization.h>
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Core.h>

src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp

@@ -0,0 +1,30 @@
+#include "pch.h"
+#include "trace.h"
+#include <TraceLoggingProvider.h>
+
+TRACELOGGING_DEFINE_PROVIDER(
+    g_hProvider,
+    "Microsoft.PowerToys",
+    // {38e8889b-9731-53f5-e901-e8a7c1753074}
+    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
+    TraceLoggingOptionProjectTelemetry());
+
+void Trace::RegisterProvider()
+{
+    TraceLoggingRegister(g_hProvider);
+}
+
+void Trace::UnregisterProvider()
+{
+    TraceLoggingUnregister(g_hProvider);
+}
+
+void Trace::MyEvent()
+{
+    TraceLoggingWrite(
+        g_hProvider,
+        "PowerToyName_MyEvent",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}

src/modules/LightSwitch/LightSwitchModuleInterface/trace.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <windows.h>
+#include <TraceLoggingActivity.h>
+#include <common/telemetry/ProjectTelemetry.h>
+
+TRACELOGGING_DECLARE_PROVIDER(g_hProvider);
+
+class Trace
+{
+public:
+    static void RegisterProvider();
+    static void UnregisterProvider();
+    static void MyEvent();
+};

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -0,0 +1,251 @@
+#include <windows.h>
+#include <tchar.h>
+#include "ThemeScheduler.h"
+#include "ThemeHelper.h"
+#include <stdio.h>
+#include <string>
+#include <LightSwitchSettings.h>
+#include <common/utils/gpo.h>
+
+SERVICE_STATUS g_ServiceStatus = {};
+SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
+HANDLE g_ServiceStopEvent = nullptr;
+
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam);
+
+// Entry point for the executable
+int _tmain(int argc, TCHAR* argv[])
+{
+    DWORD parentPid = 0;
+    bool debug = false;
+    for (int i = 1; i < argc; ++i)
+    {
+        if (_tcscmp(argv[i], _T("--debug")) == 0)
+            debug = true;
+        else if (_tcscmp(argv[i], _T("--pid")) == 0 && i + 1 < argc)
+            parentPid = _tstoi(argv[++i]);
+    }
+
+    if (debug)
+    {
+        // Create a console window for debug output
+        AllocConsole();
+        FILE* f;
+        freopen_s(&f, "CONOUT$", "w", stdout);
+        freopen_s(&f, "CONOUT$", "w", stderr);
+
+        SetConsoleTitle(L"LightSwitchService Debug");
+
+        // Console mode (debug)
+        g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+        ServiceWorkerThread(reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)));
+        CloseHandle(g_ServiceStopEvent);
+
+        FreeConsole();
+        return 0;
+    }
+
+    // Try to connect to SCM
+    wchar_t serviceName[] = L"LightSwitchService";
+    SERVICE_TABLE_ENTRYW table[] = { { serviceName, ServiceMain }, { nullptr, nullptr } };
+
+    if (!StartServiceCtrlDispatcherW(table))
+    {
+        DWORD err = GetLastError();
+        if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // not launched by SCM
+        {
+            g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+            HANDLE hThread = CreateThread(
+                nullptr, 0, ServiceWorkerThread, reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)), 0, nullptr);
+
+            // Wait so the process stays alive
+            WaitForSingleObject(hThread, INFINITE);
+            CloseHandle(hThread);
+            CloseHandle(g_ServiceStopEvent);
+            return 0;
+        }
+        return static_cast<int>(err);
+    }
+
+    return 0;
+}
+
+// Called when the service is launched by Windows
+VOID WINAPI ServiceMain(DWORD, LPTSTR*)
+{
+    g_StatusHandle = RegisterServiceCtrlHandler(_T("LightSwitchService"), ServiceCtrlHandler);
+    if (!g_StatusHandle)
+        return;
+
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+    if (!g_ServiceStopEvent)
+    {
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwWin32ExitCode = GetLastError();
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+        return;
+    }
+
+    SECURITY_ATTRIBUTES sa{ sizeof(sa) };
+    sa.bInheritHandle = FALSE;
+    sa.lpSecurityDescriptor = nullptr;
+
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    HANDLE hThread = CreateThread(nullptr, 0, ServiceWorkerThread, nullptr, 0, nullptr);
+    WaitForSingleObject(hThread, INFINITE);
+    CloseHandle(hThread);
+
+    CloseHandle(g_ServiceStopEvent);
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+}
+
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl)
+{
+    switch (dwCtrl)
+    {
+    case SERVICE_CONTROL_STOP:
+        if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+            break;
+
+        g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+        // Signal the service to stop
+        SetEvent(g_ServiceStopEvent);
+        break;
+
+    default:
+        break;
+    }
+}
+
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
+{
+    DWORD parentPid = static_cast<DWORD>(reinterpret_cast<ULONG_PTR>(lpParam));
+    HANDLE hParent = nullptr;
+    if (parentPid)
+        hParent = OpenProcess(SYNCHRONIZE, FALSE, parentPid);
+
+    OutputDebugString(L"[LightSwitchService] Worker thread starting...\n");
+
+    // Initialize settings system
+    LightSwitchSettings::instance().InitFileWatcher();
+
+    auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
+        bool isLightActive = false;
+
+        if (lightMinutes < darkMinutes)
+        {
+            // Normal case: sunrise < sunset
+            isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
+        }
+        else
+        {
+            // Wraparound case: e.g. light at 21:00, dark at 06:00
+            isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
+        }
+
+        if (isLightActive)
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(true);
+            if (settings.changeApps)
+                SetAppsTheme(true);
+        }
+        else
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(false);
+            if (settings.changeApps)
+                SetAppsTheme(false);
+        }
+    };
+
+    // --- At service start: immediately honor the schedule ---
+    {
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+    }
+
+    // --- Main loop: wakes once per minute or stop/parent death ---
+    for (;;)
+    {
+        HANDLE waits[2] = { g_ServiceStopEvent, hParent };
+        DWORD count = hParent ? 2 : 1;
+
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        // Debug print
+        wchar_t msg[160];
+        swprintf_s(msg,
+                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d\n",
+                   st.wHour,
+                   st.wMinute,
+                   settings.lightTime / 60,
+                   settings.lightTime % 60,
+                   settings.darkTime / 60,
+                   settings.darkTime % 60);
+        OutputDebugString(msg);
+
+        // Apply theme logic
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+
+        // Sleep until next minute, wake early if stop/parent dies
+        GetLocalTime(&st);
+        int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
+        if (msToNextMinute < 50)
+            msToNextMinute = 50;
+
+        DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
+        if (wait == WAIT_OBJECT_0) // stop event
+            break;
+        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent exited
+            break;
+    }
+
+    if (hParent)
+        CloseHandle(hParent);
+
+    return 0;
+}
+
+int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
+{
+    if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        wchar_t msg[160];
+        swprintf_s(
+            msg,
+            L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.\n");
+        OutputDebugString(msg);
+        return 0;
+    }
+
+    int argc = 0;
+    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    int rc = _tmain(argc, argv); // reuse your existing logic
+    LocalFree(argv);
+    return rc;
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -0,0 +1,254 @@
+<?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')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{08e71c67-6a7e-4ca1-b04e-2fb336410bac}</ProjectGuid>
+    <RootNamespace>LightSwitchService</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchService</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>PowerToys.LightSwitchService</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>
+        ./../;
+        $(SolutionDir)src\common\Telemetry;
+        $(SolutionDir)src\common;
+        $(SolutionDir)src\;
+        $(SolutionDir)deps\spdlog\include;
+        ./;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp" />
+    <ClCompile Include="LightSwitchService.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp" />
+    <ClCompile Include="SettingsConstants.cpp" />
+    <ClCompile Include="ThemeHelper.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="LightSwitchSettings.h" />
+    <ClInclude Include="SettingsConstants.h" />
+    <ClInclude Include="SettingsObserver.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="ThemeScheduler.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <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')" />
+  </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'))" />
+  </Target>
+</Project>

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="LightSwitchService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SettingsConstants.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ThemeScheduler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LightSwitchSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsConstants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsObserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
+</Project>

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -0,0 +1,157 @@
+#include "LightSwitchSettings.h"
+#include <common/utils/json.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include "SettingsObserver.h"
+
+#include <filesystem>
+#include <fstream>
+#include <WinHookEventIDs.h>
+
+using namespace std;
+
+LightSwitchSettings& LightSwitchSettings::instance()
+{
+    static LightSwitchSettings inst;
+    return inst;
+}
+
+LightSwitchSettings::LightSwitchSettings()
+{
+    LoadSettings();
+}
+
+std::wstring LightSwitchSettings::GetSettingsFileName()
+{
+    return PTSettingsHelper::get_module_save_file_location(L"LightSwitch");
+}
+
+void LightSwitchSettings::InitFileWatcher()
+{
+    const std::wstring& settingsFileName = GetSettingsFileName();
+    m_settingsFileWatcher = std::make_unique<FileWatcher>(settingsFileName, [&]() {
+        PostMessageW(HWND_BROADCAST, WM_PRIV_SETTINGS_CHANGED, NULL, NULL);
+    });
+}
+
+void LightSwitchSettings::AddObserver(SettingsObserver& observer)
+{
+    m_observers.insert(&observer);
+}
+
+void LightSwitchSettings::RemoveObserver(SettingsObserver& observer)
+{
+    m_observers.erase(&observer);
+}
+
+void LightSwitchSettings::NotifyObservers(SettingId id) const
+{
+    for (auto observer : m_observers)
+    {
+        if (observer->WantsToBeNotified(id))
+        {
+            observer->SettingsUpdate(id);
+        }
+    }
+}
+
+void LightSwitchSettings::LoadSettings()
+{
+    try
+    {
+        PowerToysSettings::PowerToyValues values =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+
+
+        if (const auto jsonVal = values.get_string_value(L"scheduleMode"))
+        {
+            auto val = *jsonVal;
+            auto newMode = FromString(val);
+            if (m_settings.scheduleMode != newMode)
+            {
+                m_settings.scheduleMode = newMode;
+                NotifyObservers(SettingId::ScheduleMode);
+            }
+        }
+
+        // Latitude
+        if (const auto jsonVal = values.get_string_value(L"latitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.latitude != val)
+            {
+                m_settings.latitude = val;
+                NotifyObservers(SettingId::Latitude);
+            }
+        }
+
+        // Longitude
+        if (const auto jsonVal = values.get_string_value(L"longitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.longitude != val)
+            {
+                m_settings.longitude = val;
+                NotifyObservers(SettingId::Longitude);
+            }
+        }
+
+        // LightTime
+        if (const auto jsonVal = values.get_int_value(L"lightTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.lightTime != val)
+            {
+                m_settings.lightTime = val;
+                NotifyObservers(SettingId::LightTime);
+            }
+        }
+
+        // DarkTime
+        if (const auto jsonVal = values.get_int_value(L"darkTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.darkTime != val)
+            {
+                m_settings.darkTime = val;
+                NotifyObservers(SettingId::DarkTime);
+            }
+        }
+
+        // Offset
+        if (const auto jsonVal = values.get_int_value(L"offset")) 
+        {
+            auto val = *jsonVal;
+            if (m_settings.offset != val)
+            {
+                m_settings.offset = val;
+                NotifyObservers(SettingId::Offset);
+            }
+        }
+
+        // ChangeSystem
+        if (const auto jsonVal = values.get_bool_value(L"changeSystem"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeSystem != val)
+            {
+                m_settings.changeSystem = val;
+                NotifyObservers(SettingId::ChangeSystem);
+            }
+        }
+
+        // ChangeApps
+        if (const auto jsonVal = values.get_bool_value(L"changeApps"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeApps != val)
+            {
+                m_settings.changeApps = val;
+                NotifyObservers(SettingId::ChangeApps);
+            }
+        }
+    }
+    catch (...)
+    {
+        // Keeps defaults if load fails
+    }
+}