Bump WPF-UI package version (#30411)

* Bump WPF-UI package version

* Update notice.md

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

@@ -94,7 +94,6 @@ peteblois
 phoboslab
 Ponten
 Pooja
-Quriz
 randyrants
 ricardosantos
 robmikh

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

@@ -34,7 +34,6 @@ ALPHATYPE
 AModifier
 AMPROPERTY
 AMPROPSETID
-animatedvisuals
 ANDSCANS
 ansicolor
 ANull
@@ -161,6 +160,7 @@ CHANGECBCHAIN
 changecursor
 CHILDACTIVATE
 CHILDWINDOW
+CHT
 cidl
 cim
 CImage
@@ -181,7 +181,6 @@ clrcall
 CLSCTX
 Clusion
 cmder
-CMDNOTFOUNDMODULEINTERFACE
 Cmds
 CMIC
 CMINVOKECOMMANDINFO
@@ -219,6 +218,7 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+constexpr
 consts
 contentdialog
 contentfiles
@@ -318,6 +318,7 @@ DESKTOPABSOLUTEEDITING
 DESKTOPABSOLUTEPARSING
 desktopshorcutinstalled
 desktopwindowxamlsource
+DEU
 devblogs
 devdocs
 devenum
@@ -506,7 +507,6 @@ GETCLIENTAREAANIMATION
 GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
-getfilesiginforedist
 GETICON
 GETMINMAXINFO
 GETPROPERTYSTOREFLAGS
@@ -537,6 +537,7 @@ Hanzi
 Hardlines
 hardlinks
 HARDWAREINPUT
+hashcode
 Hashset
 hashtag
 HASHVAL
@@ -555,6 +556,7 @@ hcwhite
 hdc
 hdrop
 hdwwiz
+HEB
 Helpline
 helptext
 HGFE
@@ -717,6 +719,7 @@ jif
 jjw
 jobject
 jpe
+JPN
 jpnime
 Jsons
 jsonval
@@ -742,10 +745,8 @@ killrunner
 Knownfolders
 KSPROPERTY
 Kybd
-languagesjson
 lastcodeanalysissucceeded
 Lastdevice
-LASTEXITCODE
 LAYOUTRTL
 LCIDTo
 lcl
@@ -901,8 +902,6 @@ MOUSEHWHEEL
 MOUSEINPUT
 MOVESIZEEND
 MOVESIZESTART
-MOZILLAPL
-MOZPL
 mpmc
 MRM
 MRT
@@ -918,7 +917,6 @@ MSIFASTINSTALL
 MSIHANDLE
 msiquery
 MSIRESTARTMANAGERCONTROL
-msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
 Mso
@@ -969,7 +967,6 @@ newdev
 newitem
 newpath
 newrow
-newsgroups
 NIF
 NLD
 NLog
@@ -982,6 +979,7 @@ NOCLOSEPROCESS
 NOCOALESCE
 NOCOPYBITS
 nodeca
+nodiscard
 nodoc
 NODRAWCAPTION
 NODRAWICON
@@ -1018,7 +1016,6 @@ NOTSRCCOPY
 NOTSRCERASE
 NOZORDER
 NPH
-npmjs
 NResize
 nrw
 nsunt
@@ -1090,6 +1087,7 @@ pcch
 pcelt
 pch
 PCIDLIST
+pcs
 PCWSTR
 pdisp
 pdo
@@ -1214,7 +1212,6 @@ QITAB
 QITABENT
 qoi
 qps
-Quarternary
 QUERYENDSESSION
 QUERYOPEN
 QUEUESYNC
@@ -1300,6 +1297,7 @@ RKey
 RNumber
 roadmap
 rop
+roundf
 ROUNDSMALL
 rpcrt
 RRF
@@ -1315,11 +1313,12 @@ rundll
 rungameid
 RUNLEVEL
 runsettings
-runspace
 runtimeclass
 runtimeobject
 runtimepack
 runtimes
+RUS
+RValue
 rvm
 rwin
 rwl
@@ -1500,6 +1499,7 @@ subquery
 Superbar
 sut
 svchost
+SVE
 SVGIn
 SVGIO
 svgz
@@ -1572,6 +1572,7 @@ tlbimp
 TMPVAR
 TNP
 toggleswitch
+tonos
 toolkitcontrols
 toolkitconverters
 Toolset
@@ -1602,7 +1603,6 @@ UAL
 uap
 udit
 uefi
-uesc
 UHash
 UIA
 UIEx
@@ -1611,7 +1611,6 @@ ums
 uncompilable
 UNCPRIORITY
 UNDNAME
-unescape
 UNICODETEXT
 uninstantiated
 uniquifier
@@ -1630,7 +1629,6 @@ UOI
 Updatelayout
 UPGRADINGPRODUCTCODE
 Uptool
-urld
 Usb
 USEDEFAULT
 USEFILEATTRIBUTES
@@ -1710,7 +1708,6 @@ wcsnicmp
 WDA
 wdp
 wdupenv
-webbrowsers
 webcam
 webpage
 websites
@@ -1718,6 +1715,7 @@ wekyb
 Wevtapi
 wgpocpl
 WIC
+wifi
 wil
 winapi
 winappdriver
@@ -1845,6 +1843,9 @@ zonable
 zoneset
 Zoneszonabletester
 zzz
+newsgroups
+MOZILLAPL
+MOZPL
 
 # FALSE POSITIVES
 

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

@@ -118,9 +118,6 @@ aka\.ms/[a-zA-Z0-9]+
 # YouTube url
 \b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
 
-# power shell gallery website
-\bpowershellgallery.com/[-_a-zA-Z0-9()=./%]*
-
 # uuid: (or CompGUIDPrefix)
 L?(["']|[-<({>]|\b)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{10,12}(?:\g{-1}|[<})>])
 

.pipelines/ESRPSigning_core.json

@@ -28,10 +28,7 @@
 
                 "PowerToys.AlwaysOnTop.exe",
                 "PowerToys.AlwaysOnTopModuleInterface.dll",
-
-                "PowerToys.CmdNotFoundModuleInterface.dll",
-                "PowerToys.CmdNotFound.dll",
-
+                
                 "PowerToys.ColorPicker.dll",
                 "PowerToys.ColorPickerUI.dll",
                 "PowerToys.ColorPickerUI.exe",
@@ -254,7 +251,6 @@
                 "Mages.Core.dll",
                 "JetBrains.Annotations.dll",
                 "NLog.Extensions.Logging.dll",
-                "getfilesiginforedist.dll",
                 "concrt140_app.dll",
                 "msvcp140_1_app.dll",
                 "msvcp140_2_app.dll",

.pipelines/applyXamlStyling.ps1

@@ -107,7 +107,7 @@ if (-not $Passive)
 else 
 {
     Write-Output "Checking all files (passively)"
-    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\colorPicker\\ColorPickerUI\\)" }
+    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)" }
 
     if ($files.count -gt 0)
     {

.pipelines/versionAndSignCheck.ps1

@@ -24,7 +24,6 @@ $versionExceptions = @(
 $nullVersionExceptions = @(
     "codicon.ttf",
     "e_sqlite3.dll",
-    "getfilesiginforedist.dll",
     "vcamp140_app.dll",
     "vcruntime140_app.dll",
     "vcruntime140_1_app.dll",

Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <Copyright>Copyright (C) 2024 Microsoft Corporation</Copyright>
+    <Copyright>Copyright (C) 2023 Microsoft Corporation</Copyright>
     <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <AssemblyCopyright>Copyright (C) 2024 Microsoft Corporation</AssemblyCopyright>
+    <AssemblyCopyright>Copyright (C) 2023 Microsoft Corporation</AssemblyCopyright>
     <AssemblyProduct>PowerToys</AssemblyProduct>
     <Company>Microsoft Corporation</Company>
     <NeutralLanguage>en-US</NeutralLanguage>

Directory.Packages.props

@@ -18,8 +18,8 @@
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="coverlet.collector" Version="1.3.0" />
     <PackageVersion Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
-    <PackageVersion Include="HelixToolkit" Version="2.24.0" />
-    <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
+    <PackageVersion Include="HelixToolkit" Version="2.20.2" />
+    <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.20.2" />
     <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
     <PackageVersion Include="LazyCache" Version="2.4.0" />
@@ -30,10 +30,8 @@
     <PackageVersion Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="5.0.17" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
@@ -47,7 +45,6 @@
     <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.TestAdapter" Version="3.1.1" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
@@ -67,7 +64,6 @@
     <PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
-    <PackageVersion Include="System.Management.Automation" Version="7.4.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0-preview.9" />
     <PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
     <PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
@@ -85,4 +81,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -788,34 +788,6 @@ SOFTWARE.
 
 ## Utility: Peek
 
-### The Quite OK Image Format reference decoder
-
-**Source**: https://github.com/phoboslab/qoi
-
-**Note**: [@pedrolamas](https://github.com/pedrolamas) translated and adapted the reference decoder code to C# that is in PowerToys from the original C++ implementation.
-
-MIT License
-
-Copyright (c) 2022 Dominic Szablewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ### UTF Unknown
 
 We use the UTF.Unknown NuGet package for detecting encoding in text/code files.
@@ -1307,8 +1279,8 @@ EXHIBIT A -Mozilla Public License.
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
-- HelixToolkit 2.24.0
-- HelixToolkit.Core.Wpf 2.24.0
+- HelixToolkit 2.20.2
+- HelixToolkit.Core.Wpf 2.20.2
 - hyjiacan.pinyin4net 4.1.1
 - Interop.Microsoft.Office.Interop.OneNote 1.1.0.2
 - LazyCache 2.4.0
@@ -1320,8 +1292,6 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.Extensions.Hosting 8.0.0
 - Microsoft.Extensions.Hosting.WindowsServices 8.0.0
 - Microsoft.Extensions.Logging 8.0.0
-- Microsoft.Extensions.Logging.Abstractions 8.0.0
-- Microsoft.Extensions.ObjectPool 5.0.17
 - Microsoft.NET.Test.Sdk 17.6.3
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2088.41
@@ -1351,7 +1321,6 @@ EXHIBIT A -Mozilla Public License.
 - System.IO.Abstractions 17.2.3
 - System.IO.Abstractions.TestingHelpers 17.2.3
 - System.Management 8.0.0
-- System.Management.Automation 7.4.0
 - System.Reactive 6.0.0-preview.9
 - System.Runtime.Caching 8.0.0
 - System.ServiceProcess.ServiceController 8.0.0

PowerToys.sln

@@ -538,10 +538,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLock", "src\modules\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLockModuleInterface", "src\modules\CropAndLock\CropAndLockModuleInterface\CropAndLockModuleInterface.vcxproj", "{3157FA75-86CF-4EE2-8F62-C43F776493C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmdNotFound", "src\modules\cmdNotFound\CmdNotFound\CmdNotFound.csproj", "{A37865FE-2881-449F-8ADB-B8CD373D6D79}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmdNotFound", "cmdNotFound", "{4C0D0746-BE5B-49EE-BD5D-A7811628AE8B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-FancyZonesEditor", "src\modules\fancyzones\UnitTests-FancyZonesEditor\UnitTests-FancyZonesEditor.csproj", "{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EnvironmentVariables", "EnvironmentVariables", "{538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}"
@@ -562,8 +558,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-QoiPreviewHandler
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-QoiThumbnailProvider", "src\modules\previewpane\UnitTests-QoiThumbnailProvider\UnitTests-QoiThumbnailProvider.csproj", "{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdNotFoundModuleInterface", "src\modules\cmdNotFound\CmdNotFoundModuleInterface\CmdNotFoundModuleInterface.vcxproj", "{0014D652-901F-4456-8D65-06FC5F997FB0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2334,18 +2328,6 @@ Global
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.Build.0 = Release|x64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x86.ActiveCfg = Release|x64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x86.Build.0 = Release|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|x64.ActiveCfg = Debug|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|x64.Build.0 = Debug|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|x86.ActiveCfg = Debug|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Debug|x86.Build.0 = Debug|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|ARM64.Build.0 = Release|ARM64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|x64.ActiveCfg = Release|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|x64.Build.0 = Release|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|x86.ActiveCfg = Release|x64
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79}.Release|x86.Build.0 = Release|x64
 		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|x64.ActiveCfg = Debug|x64
@@ -2454,18 +2436,6 @@ Global
 		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}.Release|x64.Build.0 = Release|x64
 		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}.Release|x86.ActiveCfg = Release|x64
 		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}.Release|x86.Build.0 = Release|x64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|x64.ActiveCfg = Debug|x64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|x64.Build.0 = Debug|x64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|x86.ActiveCfg = Debug|Win32
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Debug|x86.Build.0 = Debug|Win32
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|ARM64.Build.0 = Release|ARM64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|x64.ActiveCfg = Release|x64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|x64.Build.0 = Release|x64
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|x86.ActiveCfg = Release|Win32
-		{0014D652-901F-4456-8D65-06FC5F997FB0}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2660,8 +2630,6 @@ Global
 		{3B227528-4BA6-4CAF-B44A-A10C78A64849} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F5E1146E-B7B3-4E11-85FD-270A500BD78C} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6} = {3B227528-4BA6-4CAF-B44A-A10C78A64849}
-		{A37865FE-2881-449F-8ADB-B8CD373D6D79} = {4C0D0746-BE5B-49EE-BD5D-A7811628AE8B}
-		{4C0D0746-BE5B-49EE-BD5D-A7811628AE8B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{538ED0BB-B863-4B20-98CC-BCDF7FA0B68A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
@@ -2672,7 +2640,6 @@ Global
 		{6B04803D-B418-4833-A67E-B0FC966636A5} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{3940AD4D-F748-4BE4-9083-85769CD553EF} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{0014D652-901F-4456-8D65-06FC5F997FB0} = {4C0D0746-BE5B-49EE-BD5D-A7811628AE8B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -17,21 +17,20 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 |              | Current utilities: |              |
 |--------------|--------------------|--------------|
-| [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) |
-| [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) |
-| [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) |
-| [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) |
-| [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [Peek](https://aka.ms/PowerToysOverview_Peek) |
-| [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
-| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
-| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
+| [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) |
+| [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
+| [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
+| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
+| [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) |
+| [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
+| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
 
 ## Installing and running Microsoft PowerToys
 
 ### Requirements
 
 - Windows 11 or Windows 10 version 2004 (code name 20H1 / build number 19041) or newer.
-- x64 or ARM64 processor
 - Our installer will install the following items:
    - [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) bootstrapper. This will install the latest version.
 
@@ -42,17 +41,17 @@ Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and cl
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F50
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F49
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-arm64.exe
- 
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.0/PowerToysUserSetup-0.76.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.0/PowerToysUserSetup-0.76.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.0/PowerToysSetup-0.76.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.0/PowerToysSetup-0.76.0-arm64.exe
+
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.76.2-x64.exe][ptUserX64] | 73D734FC34B3F9D7484081EC0F0B6ACD4789A55203A185904CC5C62ABD02AF16 |
-| Per user - ARM64     | [PowerToysUserSetup-0.76.2-arm64.exe][ptUserArm64] | 5284CC5DA399DC37858A2FD260C30F20C484BA1B5616D0EB67CD90A8A286CB8B |
-| Machine wide - x64   | [PowerToysSetup-0.76.2-x64.exe][ptMachineX64] | 72B87381C9E5C7447FB59D7CE478B3102C9CEE3C6EB3A6BC7EC7EC7D9EFAB2A0 |
-| Machine wide - ARM64 | [PowerToysSetup-0.76.2-arm64.exe][ptMachineArm64] | F28C7DA377C25309775AB052B2B19A299C26C41582D05B95C3492A4A8C952BFE |
+| Per user - x64       | [PowerToysUserSetup-0.76.0-x64.exe][ptUserX64] | 627F60BF3F04583A2ECE7ACE7E6F09ABDE92493E1FFFAC5705CC83009781CD8D |
+| Per user - ARM64     | [PowerToysUserSetup-0.76.0-arm64.exe][ptUserArm64] | 79D11CDDBDD87DF8A69A5B2FC28869B3085392E5F45FEE6560D278E48F8B0673 |
+| Machine wide - x64   | [PowerToysSetup-0.76.0-x64.exe][ptMachineX64] | 4F24A288AC92DD0AB74EF52CFE3D66FA744BDC6889CB4E3ED088763D9134C06D |
+| Machine wide - ARM64 | [PowerToysSetup-0.76.0-arm64.exe][ptMachineArm64] | 1BD9CD9C696D8898AAEE5A6D6A7122F053202CF1865C511BFC91FCFD0D767864 |
 
 This is our preferred method.
 

doc/devdocs/common.md

@@ -1,7 +1,5 @@
 # Classes and structures
 
-> This document is outdated and will soon be renewed.
-
 #### class Animation: [header](/src/common/animation.h) [source](/src/common/animation.cpp)
 Animation helper class with two easing-in animations: linear and exponential.
 

doc/devdocs/common/FilePreviewCommon.md

@@ -1,75 +0,0 @@
-# [FilePreviewCommon](/src/common/FilePreviewCommon)
-
-This project contains common code used for previewing and displaying files.
-
-## Monaco preview
-
-Monaco preview enables to display developer files. It is based on [Microsoft's Monaco Editor](https://microsoft.github.io/monaco-editor/) which is maintained by the Visual Studio Code team.
-
-This previewer is used for the File Explorer Dev File Previewer, as well as PowerToys Peek.
-
-### Update Monaco Editor
-
-1. Download Monaco editor with [npm](https://www.npmjs.com/): Run `npm i monaco-editor` in the command prompt.
-2. Delete everything except the `min` folder (the minimised code) from the downloaded files.
-3. Copy the `min` folder into the `src/common/FilePreviewCommon/Assets/Monaco/monacoSRC` folder of the PowerToys project.
-4. Generate the JSON file as described in the generate [monaco_languages.json file](#monaco_languagesjson) section.
-
-### Add a new language definition
-
-As an example on how to add a new language definition you can look at the one for [registry files](/src/common/FilePreviewCommon/Assets/Monaco/customLanguages/reg.js).
-
-1. Add the new language definition (written with [Monarch](https://microsoft.github.io/monaco-editor/monarch.html)) as a new file to the [folder containing Monaco custom languages](/src/common/FilePreviewCommon/Assets/Monaco/customLanguages/) (Remember the file name and the string you used for "idDefinition" as you need it later.). The file should be formatted like in the example below. (Please change `idDefinition` to the name of your language.)
-
-```javascript
-export function idDefinition() {
-    return {
-        ...
-    }
-}
-```
-
-2. Add the following line to the [`monacoSpecialLanguages.js`](/src/common/FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js) file, after the other import statements:
-
-```javascript
-import { idDefinition } from './customLanguages/file.js';
-```
-
-> Replace file.js with the name of your definition file from step 1. Please replace idDefinition with the string you used in step 1.
-
-3. In the [`monacoSpecialLanguages.js`](/src/common/FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js) file add the following line into the `registerAdditionalLanguages` function:
-
-```javascript
-registerAdditionalNewLanguage("id", [".fileExtension"], idDefinition(), monaco)
-```
-
-> Replace id and idDefinition with your id and string used in step 1. Replace fileExtension with a set of file extensions you want the language to register to.
-
-  * The id can be anything. Recommended is one of the file extensions. For example "php" or "reg".
-
-4. Execute the steps described in the [monaco_languages.json](#monaco_languagesjson) section.
-
-### Add a new file extension to an existing language
-
-1. In the [`monacoSpecialLanguages.js`](/src/common/FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js) file add the following line to the `registerAdditionalLanguages` function. (`existingId` is the id of the language you want to add the extension to. You can find these id's in the [`monaco_languages.json`](/src/common/FilePreviewCommon/Assets/Monaco/monaco_languages.json) file):
-
-```javascript
-registerAdditionalLanguage("id", [".fileExtension"], "existingId", monaco)
-```
-
-  * If for instance you want to add more extensions to the php language set the id to `phpExt` and the existingId to `php`.
-
-2. Copy the existing language definition into the `languageDefinitions` function in the same file. You can find the existing definitions in the following folder: [`/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/`](/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/).
-
-3. Execute the steps described in the [monaco_languages.json](#monaco_languagesjson) section.
-
-### monaco_languages.json
-
-[`monaco_languages.json`](/src/common/FilePreviewCommon/Assets/Monaco/monaco_languages.json) contains all extensions and IDs for the languages supported by Monaco. The [`MonacoHelper`](/src/common/FilePreviewCommon/MonacoHelper.cs) class and the installer are using this file to register preview handlers for the defined extensions.
-
-After updating Monaco Editor and/or adding a new language you should update the [`monaco_languages.json`](/src/common/FilePreviewCommon/Assets/Monaco/monaco_languages.json) file.
-
-1. Run the [`generateLanguagesJson.html`](/src/common/FilePreviewCommon/Assets/Monaco/generateLanguagesJson.html) file on a local webserver (as webbrowsers will block certain needed features when running the file locally.)
-  *  This can for example be achieved by using the [Preview Server](https://marketplace.visualstudio.com/items?itemName=yuichinukiyama.vscode-preview-server) extension for Visual Studio Code: Open the file in Visual Studio Code, right click in the code editor and select `vscode-preview-server: Launch on browser`. The file will be opened in a browser.
-2. The browser will download the new `monaco_languages.json` file
-3. Replace the old file with the newly downloaded one in the source code folder.

doc/devdocs/common/readme.md

@@ -1,7 +0,0 @@
-# Common
-
-The [common](/src/common) folder contains projects with code, that is used in multiple projects.
-
-## [FilePreviewCommon](FilePreviewCommon.md)
-
-This project contains common code for file previewing.

doc/devdocs/modules/launcher/new-plugin-checklist.md

@@ -3,7 +3,6 @@
 - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}`
 - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}`
 - [ ] The project file should import `Version.props` and specify `<Version>$(Version).0</Version>`
-- [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props`
 - [ ] Make sure `*.csproj` specify only x64 platform target
 - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder
 ```
@@ -18,8 +17,7 @@
   "Website": "https://aka.ms/powertoys",
   "ExecuteFileName": string, // Should be {Type}.PowerToys.Run.Plugin.{PluginName}.dll
   "IcoPathDark": string, // Path to dark theme icon. The path is relative to the root plugin folder 
-  "IcoPathLight": string // Path to light theme icon. The path is relative to the root plugin folder
-  "DynamicLoading": bool // Sets whether the plugin should dynamically load any dependencies isolated from the core application.  
+  "IcoPathLight": string // Path to light theme icon. The path is relative to the root plugin folder 
 }
 ```
 - [ ] Make sure your `Main` class contains a public, static string property for the `PluginID`. The plugin id has to be the same as the one in the `plugin.json`file.

doc/devdocs/modules/launcher/plugins/community.valuegenerator.md

@@ -1,6 +1,6 @@
 # Value Generator Plugin
 
-The Value Generator plugin is used to generate hashes for strings, to calculate base64 encodings, escape and encode URLs/URIs and to generate GUIDs versions 1, 3, 4 and 5.
+The Value Generator plugin is used to generate hashes for strings, to calculate base64 encodings and to generate GUIDs versions 1, 3, 4 and 5.
 
 ![Image of Value Generator plugin](/doc/images/launcher/plugin/community.valuegenerator.png)
 
@@ -10,7 +10,7 @@ The Value Generator plugin is used to generate hashes for strings, to calculate
 - The result of `string ResultToString()` will be used for the Result's title
 - The `Description` field will be used for the Result's subtitle
 
-### [`HashRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Hashing/HashRequest.cs)
+### [`HashRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Hashing/HashRequest.cs)
 - Implements IComputeRequest
 - Supports the hashing algorithms from System.Security.Cryptography:
   - MD5
@@ -20,19 +20,19 @@ The Value Generator plugin is used to generate hashes for strings, to calculate
   - SHA512
 - If other algorithms are added to System.Security.Cryptography, they can be added to the `_algorithms` dictionary. [`InputParser.ParseInput()`](#inputparser) will need to return a `HashRequest` for the algorithm in the query
 
-### [`Base64Request`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Base64/Base64Request.cs)
+### [`Base64Request`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Base64/Base64Request.cs)
 - Implements IComputeRequest
 - `Compute()` will populate `Result` with the base64 encoding of the byte array passed in the constructor
 
-### [`Base64DecodeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Base64/Base64DecodeRequest.cs)
+### [`Base64DecodeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Base64/Base64DecodeRequest.cs)
 - Implements IComputeRequest
 - `Compute()` will populate `Result` with the decoded byte array of the base64 string passed in the constructor
 
-### [`GUIDRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/GUID/GUIDRequest.cs)
+### [`GUIDRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/GUID/GUIDRequest.cs)
 - Implements IComputeRequest
 - Uses the [`GUIDGenerator`](#guidgenerator) class to generate or compute the requested GUID
 
-### [`GUIDGenerator`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/GUID/GUIDGenerator.cs)
+### [`GUIDGenerator`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/GUID/GUIDGenerator.cs)
 - Utility class for generating or calculating GUIDs
 - Generating GUID versions 1 and 4 is done using builtin APIs. [`UuidCreateSequential`](https://learn.microsoft.com/en-us/windows/win32/api/rpcdce/nf-rpcdce-uuidcreatesequential) for version 1 and `System.Guid.NewGuid()` for version 4
 - Versions 3 and 5 take two parameters, a namespace and a name
@@ -40,32 +40,6 @@ The Value Generator plugin is used to generate hashes for strings, to calculate
 - The `PredefinedNamespaces` dictionary contains aliases for the predefined namespaces
 - The name can be any string
 
-### [`UrlEncodeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/UrlEncodeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the encoded url converted using `HttpUtility.UrlEncode()`.
-
-### [`UrlDecodeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/UrlDecodeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the decoded url converted using `HttpUtility.UrlDecode()`.
-
-### [`DataEscapeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/DataEscapeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the escaped data string converted using `System.Uri.EscapeDataString()`.
-
-### [`DataUnescapeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/DataUnescapeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the unescaped data string converted using `System.Uri.UnescapeDataString()`.
-
-### [`HexEscapeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/HexEscapeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the escaped data string converted using `System.Uri.HexEscape()`.
-- Only single characters are supported as input.
-
-### [`HexUnescapeRequest`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/Uri/HexUnescapeRequest.cs)
-- Implements IComputeRequest
-- `Compute()` will populate `Result` with the unescaped data string converted using `System.Uri.HexUnescape()`.
-- Only the first hexadecimal character in the string gets unescaped. The rest of the user input is ignored.
-
 ### [`InputParser`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/InputParser.cs)
 - It is responsible only for parsing the query from the user
 - Based on the user query, the `ParseInput()` method must return an object that implements the `IComputeRequest` interface or it must throw one of `FormatException` or `ArgumentException`
@@ -77,6 +51,6 @@ The Value Generator plugin is used to generate hashes for strings, to calculate
 > The error message will not be shown to the user but a log message will be created
 
 ### Adding a new value generator
-1. To add a new value generator, create a folder under `/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Generators/` and inside it add a class that implements `IComputeRequest`.
+1. To add a new value generator, create a folder under `/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/` and inside it add a class that implements `IComputeRequest`.
 2. Add any utility classes that are specific to the new generator inside the same folder to keep them separated from the other generators.
 3. Modify the `InputParser.ParseInput()` to handle a request for the new generator and return an instance of the class you created in step 1

doc/devdocs/modules/peek/readme.md

@@ -1,7 +0,0 @@
-# PowerToys Peek
-
-> Documentation is currently under construction
-
-## Dev file previewer
-
-The previewer for developer files uses the project in [FileExplorerCommon] common project to render monaco. You can find its documentation here: [/doc/devdocs/common/FilePreviewCommon.md](/doc/devdocs/common/FilePreviewCommon.md).

doc/devdocs/modules/powerpreview/monaco/readme.md

@@ -0,0 +1,24 @@
+# Developer Preview (Monaco)
+
+Developer preview is based on [Microsoft's Monaco Editor](https://microsoft.github.io/monaco-editor/) which is maintained by the Visual Studio Code team.
+
+## Update monaco editor
+
+1. Download Monaco editor with npm: `npm i monaco-editor`.
+2. Delete everything except the `min` folder (the minimised code).
+3. Copy the `min` folder inside the [`monacoSRC`](/src/modules/previewpane/MonacoPreviewHandler/monacoSRC) folder.
+4. Generate the JSON file (see section below)
+
+## monaco_languages.json
+
+[`monaco_languages.json`](/src/modules/previewpane/MonacoPreviewHandler/monaco_languages.json) contains all extensions and Id's for the supported languages of Monaco. The [`FileHandler`](/src/modules/previewpane/MonacoPreviewHandler/FileHandler.cs) class and the installer are using this file.
+
+### Generate monaco_languages.json file
+
+After you updated monaco editor or adding a new language you should update the [`monaco_languages.json`](/src/modules/previewpane/MonacoPreviewHandler/monaco_languages.json) file.
+
+You have to run the file on a local webserver!
+
+1. Build monaco in debug mode.
+2. Open [generateLanguagesJson.html](/src/modules/previewpane/MonacoPreviewHandler/generateLanguagesJson.html) in a browser.
+3. Replace the old JSON file.

doc/thirdPartyRunPlugins.md

@@ -33,4 +33,3 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Quick Lookup](https://github.com/GTGalaxi/quick-lookup-ptrun) | [gtgalaxi](https://github.com/GTGalaxi) | Search across multiple cyber security tools |
 | [Visual Studio](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents |
 | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet |
-| [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop |

installer/PowerToysSetup/CmdNotFound.wxs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
-      <!-- !Warning! Make sure to change Component Guid if you update the file list -->
-      <Component Id="Module_CmdNotFound" Win64="yes" Guid="80F648F2-29F6-4685-AED4-04DC1B6EE176">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdNotFound" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)WinGetCommandNotFound.psd1" />
-        <!-- The dll files will be picked up by BaseApplications generateAllFileComponents.ps1-->
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="CmdNotFoundComponentGroup">
-      <ComponentRef Id="Module_CmdNotFound" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>

installer/PowerToysSetup/Common.wxi

@@ -18,7 +18,6 @@
   <?define PastePlainProjectName="PastePlain"?>
   <?define RegistryPreviewProjectName="RegistryPreview"?>
   <?define PeekProjectName="Peek"?>
-  <?define CmdNotFoundProjectName="CmdNotFound"?>
   
   <?define RepoDir="$(var.ProjectDir)..\..\" ?>
   <?if $(var.Platform) = x64?>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
   <Import Project="..\..\src\Version.props" />
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
@@ -15,7 +14,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-    </PreBuildEvent>
+</PreBuildEvent>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -26,7 +25,7 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-    </PreBuildEvent>
+</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
@@ -68,7 +67,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
 
   <PropertyGroup>
     <!-- We do not support debug installer builds -->
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> 
     <Platform>$(Platform)</Platform>
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>022a9d30-7c4f-416d-a9df-5ff2661cc0ad</ProjectGuid>
@@ -104,7 +103,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
 
     <Compile Include="Awake.wxs" />
     <Compile Include="BaseApplications.wxs" />
-    <Compile Include="CmdNotFound.wxs" />
     <Compile Include="ColorPicker.wxs" />
     <Compile Include="EnvironmentVariables.wxs" />
     <Compile Include="FileExplorerPreview.wxs" />
@@ -182,6 +180,17 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
 	<Target Name="AfterBuild">
 	</Target> -->
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true"/>
+    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC"
+      PreprocessorVariable="var.MonacoSRCHarvestPath"
+      OutputFile="MonacoSRC.wxs"
+      ComponentGroupName="MonacoSRCHeatGenerated"
+      DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder"
+      AutogenerateGuids="false"
+      GenerateGuidsNow="true" 
+      ToolPath="$(WixToolPath)"
+      RunAsSeparateProcess="true"
+      SuppressFragments="false"
+      SuppressRegistry="false"
+      SuppressRootDirectory="true"/>
   </Target>
 </Project>

installer/PowerToysSetup/Product.wxs

@@ -72,7 +72,6 @@
       <ComponentGroupRef Id="VideoConferenceComponentGroup" />
       <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
       <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
-      <ComponentGroupRef Id="CmdNotFoundComponentGroup" />
         
       <ComponentGroupRef Id="ResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
@@ -134,7 +133,6 @@
     <InstallExecuteSequence>
       <Custom Action="DetectPrevInstallPath" After="AppSearch" />
       <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
-      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
       <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize">
@@ -161,9 +159,6 @@
       <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
         Installed AND (REMOVE="ALL")
       </Custom>
-      <Custom Action="UninstallCommandNotFound" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
       <Custom Action="UninstallServicesTask" After="InstallFinalize">
           Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
       </Custom>
@@ -205,10 +200,6 @@
                     Property="UnApplyModulesRegistryChangeSets"
                     Value="[INSTALLFOLDER]" />
 
-    <CustomAction Id="SetUninstallCommandNotFoundParam"
-                    Property="UninstallCommandNotFound"
-                    Value="[INSTALLFOLDER]" />
-
     <CustomAction Id="SetCreateWinAppSDKHardlinksParam"
                     Property="CreateWinAppSDKHardlinks"
                     Value="[INSTALLFOLDER]" />
@@ -261,15 +252,7 @@
                     BinaryKey="PTCustomActions"
                     DllEntry="UninstallServicesCA"
                    />
-
-      <CustomAction Id="UninstallCommandNotFound"
-                    Return="ignore"
-                    Impersonate="yes"
-                    Execute="deferred"
-                    BinaryKey="PTCustomActions"
-                    DllEntry="UninstallCommandNotFoundModuleCA"
-                   />
-
+      
       <CustomAction Id="TelemetryLogInstallSuccess"
               Return="ignore"
               Impersonate="yes"

installer/PowerToysSetup/Settings.wxs

@@ -19,14 +19,12 @@
   <Fragment>
     <DirectoryRef Id="WinUI3AppsAssetsFolder">
       <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
-        <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts"/>
         <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="FluentIcons" />
         <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
           <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
         </Directory>
       </Directory>
     </DirectoryRef>
-
     <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
     <!--SettingsV2AssetsFiles_Component_Def-->
@@ -47,19 +45,6 @@
     <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
     </DirectoryRef>
 
-    <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
-      <Component Id="CommandNotFound_Scripts" Win64="yes" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="CommandNotFound_Scripts" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="CommandNotFound_Scripts_EnableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\EnableModule.ps1" />
-        <File Id="CommandNotFound_Scripts_DisableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\DisableModule.ps1" />
-        <File Id="CommandNotFound_Scripts_CheckCmdNotFoundRequirements.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\CheckCmdNotFoundRequirements.ps1" />
-        <File Id="CommandNotFound_Scripts_InstallWinGetClientModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallWinGetClientModule.ps1" />
-        <File Id="CommandNotFound_Scripts_InstallPowerShell7.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallPowerShell7.ps1" />
-      </Component>
-    </DirectoryRef>
-
     <ComponentGroup Id="SettingsComponentGroup">
 
       <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2AssetsInstallFolder" >
@@ -70,9 +55,7 @@
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall"/>
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall"/>
       </Component>
-      <ComponentRef Id="CommandNotFound_Scripts"/>
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -433,29 +433,7 @@ UINT __stdcall RemoveWindowsServiceByName(std::wstring serviceName)
     return ERROR_SUCCESS;
 }
 
-UINT __stdcall UninstallCommandNotFoundModuleCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-    std::string command;
 
-    hr = WcaInitialize(hInstall, "UninstallCommandNotFoundModule");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    command = "pwsh.exe";
-    command += " ";
-    command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"";
-
-    system(command.c_str());
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
 
 UINT __stdcall UninstallServicesCA(MSIHANDLE hInstall)
 {

installer/PowerToysSetupCustomActions/CustomAction.def

@@ -22,5 +22,4 @@ EXPORTS
 	UninstallVirtualCameraDriverCA
 	UnRegisterContextMenuPackagesCA
 	UninstallEmbeddedMSIXCA
-	UninstallServicesCA
-	UninstallCommandNotFoundModuleCA
+	UninstallServicesCA

src/.editorconfig

@@ -96,4 +96,49 @@ end_of_line = crlf
 dotnet_diagnostic.IDE0065.severity = none
 
 # IDE0009: Add this or Me qualification
-dotnet_diagnostic.IDE0009.severity = none
+dotnet_diagnostic.IDE0009.severity = none
+
+# CA1859: Change type for improved performance
+dotnet_diagnostic.CA1859.severity = none
+
+# CA1716: Identifiers should not match keywords
+dotnet_diagnostic.CA1716.severity = none
+
+# SYSLIB1096: Convert to 'GeneratedComInterface'
+dotnet_diagnostic.SYSLIB1096.severity = silent
+
+# CA1309: Use ordinal StringComparison
+dotnet_diagnostic.CA1309.severity = suggestion
+
+# CS1615: Argument may not be passed with the ref keyword
+dotnet_diagnostic.CS1615.severity = none
+
+# CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
+dotnet_diagnostic.CA1854.severity = suggestion
+
+# CA1860: Avoid using 'Enumerable.Any()' extension method
+dotnet_diagnostic.CA1860.severity = suggestion
+
+# CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array 
+dotnet_diagnostic.CA1861.severity = suggestion
+
+# CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
+dotnet_diagnostic.CA1862.severity = suggestion
+
+# CA1863: Cache a CompositeFormat for repeated use in this formatting operation
+dotnet_diagnostic.CA1863.severity = none
+
+# CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
+dotnet_diagnostic.CA1864.severity = suggestion
+
+# CA1865: Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char
+dotnet_diagnostic.CA1865.severity = suggestion
+
+# CA1869: Cache and reuse 'JsonSerializerOptions' instances
+dotnet_diagnostic.CA1869.severity = none
+
+# CA2208: Instantiate argument exceptions correctly
+dotnet_diagnostic.CA2208.severity = none
+
+# CS9191: The 'ref' modifier for argument corresponding to 'in' is equivalent to 'in'. Consider using 'in' instead.
+dotnet_diagnostic.CS9191.severity = none

src/common/AllExperiments/Experiments.cs

@@ -145,7 +145,7 @@ namespace AllExperiments
 
         private string? AssignmentUnit { get; set; }
 
-        private VariantAssignmentRequest GetVariantAssignmentRequest()
+        private IVariantAssignmentRequest GetVariantAssignmentRequest()
         {
             var jsonFilePath = CreateFilePath();
             try

src/common/FilePreviewCommon/FilePreviewCommon.csproj

@@ -4,15 +4,12 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+	<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <Version>$(Version).0</Version>
     <Authors>Microsoft Corporation</Authors>
     <Product>PowerToys</Product>
     <Description>PowerToys FilePreviewCommon</Description>
     <AssemblyName>PowerToys.FilePreviewCommon</AssemblyName>
-    <UseWindowsForms>true</UseWindowsForms>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,7 +32,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <Content Include="Assets\Monaco\monacoSRC\**">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Update="Assets\Monaco\monaco_languages.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

src/common/FilePreviewCommon/Formatters/JsonFormatter.cs

@@ -12,12 +12,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters
         /// <inheritdoc/>
         public string LangSet => "json";
 
-        private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
-        {
-            WriteIndented = true,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        };
-
         /// <inheritdoc/>
         public string Format(string value)
         {
@@ -28,7 +22,11 @@ namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters
 
             using (var jDocument = JsonDocument.Parse(value, new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip }))
             {
-                return JsonSerializer.Serialize(jDocument, _serializerOptions);
+                return JsonSerializer.Serialize(jDocument, new JsonSerializerOptions
+                {
+                    WriteIndented = true,
+                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                });
             }
         }
     }

src/common/FilePreviewCommon/Formatters/XmlFormatter.cs

@@ -26,7 +26,7 @@ namespace Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters
             var stringBuilder = new StringBuilder();
             var xmlWriterSettings = new XmlWriterSettings()
             {
-                OmitXmlDeclaration = xmlDocument.FirstChild?.NodeType != XmlNodeType.XmlDeclaration,
+                OmitXmlDeclaration = xmlDocument.FirstChild.NodeType != XmlNodeType.XmlDeclaration,
                 Indent = true,
             };
 

src/common/FilePreviewCommon/MarkdownHelper.cs

@@ -30,7 +30,7 @@ namespace Microsoft.PowerToys.FilePreviewCommon
 
             // Extension to modify markdown AST.
             HTMLParsingExtension extension = new HTMLParsingExtension(imagesBlockedCallBack);
-            extension.FilePath = Path.GetDirectoryName(filePath) ?? string.Empty;
+            extension.FilePath = Path.GetDirectoryName(filePath);
 
             // if you have a string with double space, some people view it as a new line.
             // while this is against spec, even GH supports this. Technically looks like GH just trims whitespace

src/common/FilePreviewCommon/MonacoHelper.cs

@@ -28,12 +28,12 @@ namespace Microsoft.PowerToys.FilePreviewCommon
             new XmlFormatter(),
         }.AsReadOnly();
 
-        private static string? _monacoDirectory;
+        private static string _monacoDirectory;
 
         public static string GetRuntimeMonacoDirectory()
         {
             string codeBase = Assembly.GetExecutingAssembly().Location;
-            string path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase) ?? string.Empty, "Assets", "Monaco"));
+            string path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase), "Assets", "Monaco"));
             if (Path.Exists(path))
             {
                 return path;
@@ -41,7 +41,7 @@ namespace Microsoft.PowerToys.FilePreviewCommon
             else
             {
                 // We're likely in WinUI3Apps directory and need to go back to the base directory.
-                return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase) ?? string.Empty, "..", "Assets", "Monaco"));
+                return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase), "..", "Assets", "Monaco"));
             }
         }
 

src/common/FilePreviewCommon/QoiImage.cs

@@ -1,177 +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.Buffers.Binary;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Text;
-
-//// Based on https://github.com/phoboslab/qoi/blob/master/qoi.h
-
-namespace Microsoft.PowerToys.FilePreviewCommon
-{
-    /// <summary>
-    /// QOI Image helper.
-    /// </summary>
-    public static class QoiImage
-    {
-#pragma warning disable SA1310 // Field names should not contain underscore
-        private const byte QOI_OP_INDEX = 0x00; // 00xxxxxx
-        private const byte QOI_OP_DIFF = 0x40;  // 01xxxxxx
-        private const byte QOI_OP_LUMA = 0x80;  // 10xxxxxx
-        private const byte QOI_OP_RUN = 0xc0;   // 11xxxxxx
-        private const byte QOI_OP_RGB = 0xfe;   // 11111110
-        private const byte QOI_OP_RGBA = 0xff;  // 11111111
-
-        private const byte QOI_MASK_2 = 0xc0;   // 11000000
-
-        private const int QOI_MAGIC = 'q' << 24 | 'o' << 16 | 'i' << 8 | 'f';
-        private const int QOI_HEADER_SIZE = 14;
-
-        private const uint QOI_PIXELS_MAX = 400000000;
-
-        private const byte QOI_PADDING_LENGTH = 8;
-#pragma warning restore SA1310 // Field names should not contain underscore
-
-        private record struct QoiPixel(byte R, byte G, byte B, byte A)
-        {
-            public readonly int GetColorHash() => (R * 3) + (G * 5) + (B * 7) + (A * 11);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="Bitmap"/> from the specified QOI data stream.
-        /// </summary>
-        /// <param name="stream">A <see cref="Stream"/> that contains the QOI data.</param>
-        /// <returns>The <see cref="Bitmap"/> this method creates.</returns>
-        /// <exception cref="ArgumentException">The stream does not have a valid QOI image format.</exception>
-        public static Bitmap FromStream(Stream stream)
-        {
-            var fileSize = stream.Length;
-
-            if (fileSize < QOI_HEADER_SIZE + QOI_PADDING_LENGTH)
-            {
-                throw new ArgumentException("Not enough data for a QOI file");
-            }
-
-            Bitmap? bitmap = null;
-
-            try
-            {
-                using var reader = new BinaryReader(stream, Encoding.UTF8, true);
-
-                var headerMagic = ReadUInt32BigEndian(reader);
-
-                if (headerMagic != QOI_MAGIC)
-                {
-                    throw new ArgumentException("Invalid QOI file header");
-                }
-
-                var width = ReadUInt32BigEndian(reader);
-                var height = ReadUInt32BigEndian(reader);
-                var channels = reader.ReadByte();
-                var colorSpace = reader.ReadByte();
-
-                if (width == 0 || height == 0 || channels < 3 || channels > 4 || colorSpace > 1 || height >= QOI_PIXELS_MAX / width)
-                {
-                    throw new ArgumentException("Invalid QOI file data");
-                }
-
-                var pixelFormat = channels == 4 ? PixelFormat.Format32bppArgb : PixelFormat.Format24bppRgb;
-
-                bitmap = new Bitmap((int)width, (int)height, pixelFormat);
-
-                var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.WriteOnly, pixelFormat);
-                var dataLength = bitmapData.Height * bitmapData.Stride;
-
-                var index = new QoiPixel[64];
-                var pixel = new QoiPixel(0, 0, 0, 255);
-
-                var run = 0;
-                var chunksLen = fileSize - QOI_PADDING_LENGTH;
-
-                for (var dataIndex = 0; dataIndex < dataLength; dataIndex += channels)
-                {
-                    if (run > 0)
-                    {
-                        run--;
-                    }
-                    else if (stream.Position < chunksLen)
-                    {
-                        var b1 = reader.ReadByte();
-
-                        if (b1 == QOI_OP_RGB)
-                        {
-                            pixel.R = reader.ReadByte();
-                            pixel.G = reader.ReadByte();
-                            pixel.B = reader.ReadByte();
-                        }
-                        else if (b1 == QOI_OP_RGBA)
-                        {
-                            pixel.R = reader.ReadByte();
-                            pixel.G = reader.ReadByte();
-                            pixel.B = reader.ReadByte();
-                            pixel.A = reader.ReadByte();
-                        }
-                        else if ((b1 & QOI_MASK_2) == QOI_OP_INDEX)
-                        {
-                            pixel = index[b1];
-                        }
-                        else if ((b1 & QOI_MASK_2) == QOI_OP_DIFF)
-                        {
-                            pixel.R += (byte)(((b1 >> 4) & 0x03) - 2);
-                            pixel.G += (byte)(((b1 >> 2) & 0x03) - 2);
-                            pixel.B += (byte)((b1 & 0x03) - 2);
-                        }
-                        else if ((b1 & QOI_MASK_2) == QOI_OP_LUMA)
-                        {
-                            var b2 = reader.ReadByte();
-                            var vg = (b1 & 0x3f) - 32;
-                            pixel.R += (byte)(vg - 8 + ((b2 >> 4) & 0x0f));
-                            pixel.G += (byte)vg;
-                            pixel.B += (byte)(vg - 8 + (b2 & 0x0f));
-                        }
-                        else if ((b1 & QOI_MASK_2) == QOI_OP_RUN)
-                        {
-                            run = b1 & 0x3f;
-                        }
-
-                        index[pixel.GetColorHash() % 64] = pixel;
-                    }
-
-                    unsafe
-                    {
-                        var bitmapPixel = (byte*)bitmapData.Scan0 + dataIndex;
-
-                        bitmapPixel[0] = pixel.B;
-                        bitmapPixel[1] = pixel.G;
-                        bitmapPixel[2] = pixel.R;
-                        if (channels == 4)
-                        {
-                            bitmapPixel[3] = pixel.A;
-                        }
-                    }
-                }
-
-                bitmap.UnlockBits(bitmapData);
-
-                return bitmap;
-            }
-            catch
-            {
-                bitmap?.Dispose();
-
-                throw;
-            }
-        }
-
-        private static uint ReadUInt32BigEndian(BinaryReader reader)
-        {
-            var buffer = reader.ReadBytes(4);
-
-            return BinaryPrimitives.ReadUInt32BigEndian(buffer);
-        }
-    }
-}

src/common/GPOWrapper/GPOWrapper.cpp

@@ -12,10 +12,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredAwakeEnabledValue());
     }
-    GpoRuleConfigured GPOWrapper::GetConfiguredCmdNotFoundEnabledValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCmdNotFoundEnabledValue());
-    }
     GpoRuleConfigured GPOWrapper::GetConfiguredColorPickerEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredColorPickerEnabledValue());

src/common/GPOWrapper/GPOWrapper.h

@@ -9,7 +9,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         GPOWrapper() = default;
         static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
         static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
-        static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
         static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
         static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
         static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();

src/common/GPOWrapper/GPOWrapper.idl

@@ -13,7 +13,6 @@ namespace PowerToys
         [default_interface] static runtimeclass GPOWrapper {
             static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
             static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
-            static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
             static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
             static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
             static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -27,11 +27,6 @@ namespace PowerToys.GPOWrapperProjection
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredFancyZonesEnabledValue();
         }
 
-        public static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue()
-        {
-            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredCmdNotFoundEnabledValue();
-        }
-
         public static GpoRuleConfigured GetConfiguredColorPickerEnabledValue()
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredColorPickerEnabledValue();

src/common/ManagedCommon/ManagedCommon.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+	<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <Version>$(Version).0</Version>
     <Authors>Microsoft Corporation</Authors>
     <Product>PowerToys</Product>

src/common/ManagedCommon/ModuleType.cs

@@ -9,7 +9,6 @@ namespace ManagedCommon
         AlwaysOnTop,
         Awake,
         ColorPicker,
-        CmdNotFound,
         CropAndLock,
         EnvironmentVariables,
         FancyZones,

src/common/logger/logger_settings.h

@@ -67,8 +67,6 @@ struct LogSettings
     inline const static std::string cropAndLockLoggerName = "crop-and-lock";
     inline const static std::wstring registryPreviewLogPath = L"Logs\\registryPreview-log.txt";
     inline const static std::string environmentVariablesLoggerName = "environment-variables";
-    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
-    inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
     inline const static int retention = 30;
     std::wstring logLevel;
     LogSettings();

src/common/notifications/NotificationUtil.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <common/notifications/notifications.h>
-#include <common/notifications/dont_show_again.h>
-#include <common/utils/resources.h>
-#include <common/SettingsAPI/settings_helpers.h>
-
-#include "Generated Files/resource.h"
-
-namespace notifications
-{
-    // Non-Localizable strings
-    namespace NonLocalizable
-    {
-        const wchar_t RunAsAdminInfoPage[] = L"https://aka.ms/powertoysDetectedElevatedHelp";
-        const wchar_t ToastNotificationButtonUrl[] = L"powertoys://cant_drag_elevated_disable/";
-    }
-
-    inline void WarnIfElevationIsRequired(std::wstring title, std::wstring message, std::wstring button1, std::wstring button2)
-    {
-        using namespace NonLocalizable;
-
-        auto settings = PTSettingsHelper::load_general_settings();
-        auto enableWarningsElevatedApps = settings.GetNamedBoolean(L"enable_warnings_elevated_apps", true);
-
-        static bool warning_shown = false;
-        if (enableWarningsElevatedApps && !warning_shown && !is_toast_disabled(ElevatedDontShowAgainRegistryPath, ElevatedDisableIntervalInDays))
-        {
-            std::vector<action_t> actions = {
-                link_button{ button1, RunAsAdminInfoPage },
-                link_button{ button2, ToastNotificationButtonUrl }
-            };
-            show_toast_with_activations(message,
-                                        title,
-                                        {},
-                                        std::move(actions));
-            warning_shown = true;
-        }
-    }
-}

src/common/notifications/dont_show_again.h

@@ -4,8 +4,8 @@
 
 namespace notifications
 {
-    const inline wchar_t ElevatedDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
-    const inline int64_t ElevatedDisableIntervalInDays = 30;
+    const inline wchar_t CantDragElevatedDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
+    const inline int64_t CantDragElevatedDisableIntervalInDays = 30;
 
     const inline wchar_t PreviewModulesDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{7e29e2b2-b31c-4dcd-b7b0-79c078b02430})";
     const inline int64_t PreviewModulesDisableIntervalInDays = 30;

src/common/notifications/notifications.vcxproj

@@ -27,7 +27,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="notifications.h" />
-    <ClInclude Include="NotificationUtil.h" />
     <ClInclude Include="dont_show_again.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>

src/common/utils/elevation.h

@@ -494,30 +494,3 @@ inline bool check_user_is_admin()
     freeMemory(pSID, pGroupInfo);
     return false;
 }
-
-inline bool IsProcessOfWindowElevated(HWND window)
-{
-    DWORD pid = 0;
-    GetWindowThreadProcessId(window, &pid);
-    if (!pid)
-    {
-        return false;
-    }
-
-    wil::unique_handle hProcess{ OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION,
-                                             FALSE,
-                                             pid) };
-
-    wil::unique_handle token;
-
-    if (OpenProcessToken(hProcess.get(), TOKEN_QUERY, &token))
-    {
-        TOKEN_ELEVATION elevation;
-        DWORD size;
-        if (GetTokenInformation(token.get(), TokenElevation, &elevation, sizeof(elevation), &size))
-        {
-            return elevation.TokenIsElevated != 0;
-        }
-    }
-    return false;
-}

src/common/utils/excluded_apps.h

@@ -32,7 +32,7 @@ inline bool find_folder_in_path(const std::wstring& where, const std::vector<std
 }
 
 #define MAX_TITLE_LENGTH 255
-inline bool check_excluded_app_with_title(const HWND& hwnd, const std::vector<std::wstring>& excludedApps)
+inline bool check_excluded_app_with_title(const HWND& hwnd, std::wstring& processPath, const std::vector<std::wstring>& excludedApps)
 {
     WCHAR title[MAX_TITLE_LENGTH];
     int len = GetWindowTextW(hwnd, title, MAX_TITLE_LENGTH);
@@ -42,25 +42,23 @@ inline bool check_excluded_app_with_title(const HWND& hwnd, const std::vector<st
     }
 
     std::wstring titleStr(title);
-    CharUpperBuffW(titleStr.data(), static_cast<DWORD>(titleStr.length()));
-
-    for (const auto& app : excludedApps)
+    auto lastBackslashPos = processPath.find_last_of(L'\\');
+    if (lastBackslashPos != std::wstring::npos)
     {
-        if (titleStr.contains(app))
-        {
-            return true;
-        }
+        processPath = processPath.substr(0, lastBackslashPos + 1); // retain up to the last backslash
+        processPath.append(titleStr); // append the title
     }
-    return false;
+    CharUpperBuffW(processPath.data(), static_cast<DWORD>(processPath.length()));
+    return find_app_name_in_path(processPath, excludedApps);
 }
 
-inline bool check_excluded_app(const HWND& hwnd, const std::wstring& processPath, const std::vector<std::wstring>& excludedApps)
+inline bool check_excluded_app(const HWND& hwnd, std::wstring& processPath, const std::vector<std::wstring>& excludedApps)
 {
     bool res = find_app_name_in_path(processPath, excludedApps);
 
     if (!res)
     {
-        res = check_excluded_app_with_title(hwnd, excludedApps);
+        res = check_excluded_app_with_title(hwnd, processPath, excludedApps);
     }
 
     return res;

src/common/utils/gpo.h

@@ -24,7 +24,6 @@ namespace powertoys_gpo {
     const std::wstring POLICY_CONFIGURE_ENABLED_GLOBAL_ALL_UTILITIES = L"ConfigureGlobalUtilityEnabledState";
     const std::wstring POLICY_CONFIGURE_ENABLED_ALWAYS_ON_TOP = L"ConfigureEnabledUtilityAlwaysOnTop";
     const std::wstring POLICY_CONFIGURE_ENABLED_AWAKE = L"ConfigureEnabledUtilityAwake";
-    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_FANCYZONES = L"ConfigureEnabledUtilityFancyZones";
@@ -225,11 +224,6 @@ namespace powertoys_gpo {
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_AWAKE);
     }
 
-    inline gpo_rule_configured_t getConfiguredCmdNotFoundEnabledValue()
-    {
-        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CMD_NOT_FOUND);
-    }
-
     inline gpo_rule_configured_t getConfiguredColorPickerEnabledValue()
     {
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_COLOR_PICKER);

src/common/utils/window.h

@@ -6,13 +6,9 @@
 
 #include <array>
 #include <optional>
-#include <functional>
-#include <unordered_map>
 
 // Initializes and runs windows message loop
-inline int run_message_loop(const bool until_idle = false,
-                            const std::optional<uint32_t> timeout_ms = {},
-                            std::unordered_map<DWORD, std::function<void()>> wm_app_msg_callbacks = {})
+inline int run_message_loop(const bool until_idle = false, const std::optional<uint32_t> timeout_ms = {})
 {
     MSG msg{};
     bool stop = false;
@@ -28,16 +24,11 @@ inline int run_message_loop(const bool until_idle = false,
         DispatchMessageW(&msg);
         stop = until_idle && !PeekMessageW(&msg, nullptr, 0, 0, PM_NOREMOVE);
         stop = stop || (msg.message == WM_TIMER && msg.wParam == timerId);
-
-        if (auto it = wm_app_msg_callbacks.find(msg.message); it != end(wm_app_msg_callbacks))
-            it->second();
     }
-
     if (timeout_ms.has_value())
     {
         KillTimer(nullptr, timerId);
     }
-
     return static_cast<int>(msg.wParam);
 }
 
@@ -69,7 +60,7 @@ template<typename T>
 inline T GetWindowCreateParam(LPARAM lparam)
 {
     static_assert(sizeof(T) <= sizeof(void*));
-    T data{ static_cast<T>(reinterpret_cast<CREATESTRUCT*>(lparam)->lpCreateParams) };
+    T data{ static_cast <T>(reinterpret_cast<CREATESTRUCT*>(lparam)->lpCreateParams) };
     return data;
 }
 
@@ -83,5 +74,5 @@ inline void StoreWindowParam(HWND window, T data)
 template<typename T>
 inline T GetWindowParam(HWND window)
 {
-    return reinterpret_cast<T>(GetWindowLongPtrW(window, GWLP_USERDATA));
+    return reinterpret_cast <T>(GetWindowLongPtrW(window, GWLP_USERDATA));
 }

src/common/version/version.h

@@ -13,7 +13,7 @@
 #define PRODUCT_VERSION_STRING FILE_VERSION_STRING
 
 #define COMPANY_NAME "Microsoft Corporation"
-#define COPYRIGHT_NOTE "Copyright (C) 2024 Microsoft Corporation"
+#define COPYRIGHT_NOTE "Copyright (C) 2023 Microsoft Corporation"
 #define PRODUCT_NAME "PowerToys"
 
 #include <string>

src/gpo/assets/PowerToys.admx

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.7" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.5" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
   </policyNamespaces>
-  <resources minRequiredRevision="1.7"/><!-- Last changed with PowerToys v0.77.0 -->
+  <resources minRequiredRevision="1.6"/><!-- Last changed with PowerToys v0.76.0 -->
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -15,7 +15,6 @@
       <definition name="SUPPORTED_POWERTOYS_0_73_0" displayName="$(string.SUPPORTED_POWERTOYS_0_73_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_75_0" displayName="$(string.SUPPORTED_POWERTOYS_0_75_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_76_0" displayName="$(string.SUPPORTED_POWERTOYS_0_76_0)"/>
-      <definition name="SUPPORTED_POWERTOYS_0_77_0" displayName="$(string.SUPPORTED_POWERTOYS_0_77_0)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -60,16 +59,6 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
-    <policy name="ConfigureEnabledUtilityCmdNotFound" class="Both" displayName="$(string.ConfigureEnabledUtilityCmdNotFound)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityCmdNotFound">
-      <parentCategory ref="PowerToys" />
-      <supportedOn ref="SUPPORTED_POWERTOYS_0_77_0" />
-      <enabledValue>
-        <decimal value="1" />
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0" />
-      </disabledValue>
-    </policy>
     <policy name="ConfigureEnabledUtilityColorPicker" class="Both" displayName="$(string.ConfigureEnabledUtilityColorPicker)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityColorPicker">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_64_0" />

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.7" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.6" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>
@@ -17,7 +17,6 @@
       <string id="SUPPORTED_POWERTOYS_0_73_0">PowerToys version 0.73.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_75_0">PowerToys version 0.75.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_76_0">PowerToys version 0.76.0 or later</string>
-      <string id="SUPPORTED_POWERTOYS_0_77_0">PowerToys version 0.77.0 or later</string>
 
             <string id="ConfigureGlobalUtilityEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
 
@@ -113,7 +112,6 @@ Note: Changes require a restart of PowerToys Run.
       <string id="ConfigureEnabledUtilityAlwaysOnTop">Always On Top: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityAwake">Awake: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityColorPicker">Color Picker: Configure enabled state</string>
-      <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs

@@ -7,7 +7,6 @@ using System.Runtime.InteropServices;
 using EnvironmentVariables.Helpers;
 using EnvironmentVariables.Helpers.Win32;
 using EnvironmentVariables.ViewModels;
-using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using WinUIEx;
 
@@ -31,20 +30,19 @@ namespace EnvironmentVariables
             Title = title;
             AppTitleTextBlock.Text = title;
 
-            var handle = this.GetWindowHandle();
-            RegisterWindow(handle);
-
-            WindowHelpers.BringToForeground(handle);
+            RegisterWindow();
         }
 
         private static readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
         private static NativeMethods.WinProc newWndProc;
         private static IntPtr oldWndProc = IntPtr.Zero;
 
-        private void RegisterWindow(IntPtr handle)
+        private void RegisterWindow()
         {
             newWndProc = new NativeMethods.WinProc(WndProc);
 
+            var handle = this.GetWindowHandle();
+
             oldWndProc = NativeMethods.SetWindowLongPtr(handle, NativeMethods.WindowLongIndexFlags.GWL_WNDPROC, newWndProc);
         }
 

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml

@@ -209,7 +209,7 @@
                                     <StackPanel Orientation="Horizontal" Spacing="12">
                                         <ToggleSwitch
                                             x:Uid="ToggleSwitch"
-                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
+                                            IsOn="{x:Bind Mode=TwoWay, Path=IsEnabled}"
                                             Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
                                         <Button Content="{ui:FontIcon Glyph=&#xE712;}" Style="{StaticResource SubtleButtonStyle}">
                                             <Button.Flyout>

src/modules/Hosts/Hosts/Settings/UserSettings.cs

@@ -17,7 +17,7 @@ namespace Hosts.Settings
         private const string HostsModuleName = "Hosts";
         private const int MaxNumberOfRetry = 5;
 
-        private readonly SettingsUtils _settingsUtils;
+        private readonly ISettingsUtils _settingsUtils;
         private readonly IFileSystemWatcher _watcher;
         private readonly object _loadingSettingsLock = new object();
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -146,8 +146,8 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -156,9 +156,9 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.755\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.4.231115000\build\native\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.221104.6" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.755" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.4.231115000" targetFramework="native" />
 </packages>

src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs

@@ -45,10 +45,6 @@ namespace MouseWithoutBorders
         private static string lastDragDropFile;
         private static long clipboardCopiedTime;
 
-        internal static readonly char[] Comma = new char[] { ',' };
-        internal static readonly char[] Star = new char[] { '*' };
-        internal static readonly char[] NullSeparator = new char[] { '\0' };
-
         internal static ID LastIDWithClipboardData { get; set; }
 
         internal static string LastDragDropFile
@@ -410,7 +406,7 @@ namespace MouseWithoutBorders
 
             try
             {
-                remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(Comma)[1] : Common.LastMachineWithClipboardData;
+                remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(new char[] { ',' })[1] : Common.LastMachineWithClipboardData;
 
                 remoteMachine = remoteMachine.Trim();
 
@@ -522,7 +518,7 @@ namespace MouseWithoutBorders
 
                 fileName = Common.GetStringU(header).Replace("\0", string.Empty);
                 Common.LogDebug("Header: " + fileName);
-                string[] headers = fileName.Split(Star);
+                string[] headers = fileName.Split(new char[] { '*' });
 
                 if (headers.Length < 2 || !long.TryParse(headers[0], out long dataSize))
                 {
@@ -977,7 +973,7 @@ namespace MouseWithoutBorders
 
             foreach (string txt in texts)
             {
-                if (string.IsNullOrEmpty(txt.Trim(NullSeparator)))
+                if (string.IsNullOrEmpty(txt.Trim(new char[] { '\0' })))
                 {
                     continue;
                 }

src/modules/MouseWithoutBorders/App/Class/Common.Encryption.cs

@@ -22,9 +22,7 @@ namespace MouseWithoutBorders
 {
     internal partial class Common
     {
-#pragma warning disable SYSLIB0021
-        private static AesCryptoServiceProvider symAl;
-#pragma warning restore SYSLIB0021
+        private static SymmetricAlgorithm symAl;
         private static string myKey;
         private static uint magicNumber;
         private static Random ran = new(); // Used for non encryption related functionality.

src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs

@@ -313,8 +313,7 @@ namespace MouseWithoutBorders
                 HasSwitchedMachineSinceLastCopy = true;
 
                 // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
-                var processes = Process.GetProcessesByName(HelperProcessName);
-                if (processes?.Length == 0)
+                if (Process.GetProcessesByName(HelperProcessName)?.Any() != true)
                 {
                     Log("Unable to start helper process.");
                     Common.ShowToolTip("Error starting Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
@@ -326,8 +325,7 @@ namespace MouseWithoutBorders
             }
             else
             {
-                var processes = Process.GetProcessesByName(HelperProcessName);
-                if (processes?.Length > 0)
+                if (Process.GetProcessesByName(HelperProcessName)?.Any() == true)
                 {
                     Log("Helper process found running.");
                 }
@@ -434,7 +432,7 @@ namespace MouseWithoutBorders
         {
             if (string.IsNullOrEmpty(Setting.Values.Username) && !Common.RunOnLogonDesktop)
             {
-                if (Program.User.Contains("system", StringComparison.CurrentCultureIgnoreCase))
+                if (Program.User.ToLower(CultureInfo.CurrentCulture).Contains("system"))
                 {
                     _ = Common.ImpersonateLoggedOnUserAndDoSomething(() =>
                     {

src/modules/MouseWithoutBorders/App/Class/Common.Launch.cs

@@ -84,11 +84,12 @@ namespace MouseWithoutBorders
             }
         }
 
+        [SuppressMessage("Microsoft.Globalization", "CA1304:SpecifyCultureInfo", MessageId = "System.String.ToLower", Justification = "Dotnet port with style preservation")]
         internal static int CreateProcessInInputDesktopSession(string commandLine, string arg, string desktop, short wShowWindow, bool lowIntegrity = false)
 
         // As user who runs explorer.exe
         {
-            if (!Program.User.Contains("system", StringComparison.InvariantCultureIgnoreCase))
+            if (!Program.User.ToLower(CultureInfo.InvariantCulture).Contains("system"))
             {
                 ProcessStartInfo s = new(commandLine, arg);
                 s.WindowStyle = wShowWindow != 0 ? ProcessWindowStyle.Normal : ProcessWindowStyle.Hidden;

src/modules/MouseWithoutBorders/App/Class/Common.Service.cs

@@ -45,7 +45,7 @@ namespace MouseWithoutBorders
             {
                 Process[] ps = Process.GetProcessesByName("MouseWithoutBordersSvc");
 
-                if (ps.Length != 0)
+                if (ps.Any())
                 {
                     if (DateTime.UtcNow - lastStartServiceTime < TimeSpan.FromSeconds(5))
                     {

src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs

@@ -353,7 +353,6 @@ namespace MouseWithoutBorders.Class
         private static bool ctrlDown;
         private static bool altDown;
         private static bool shiftDown;
-        internal static readonly string[] Args = new string[] { "CAD" };
 
         private static void ResetModifiersState(HotkeySettings matchingHotkey)
         {
@@ -457,7 +456,7 @@ namespace MouseWithoutBorders.Class
                         if (ctrlDown && altDown)
                         {
                             ctrlDown = altDown = false;
-                            new ServiceController("MouseWithoutBordersSvc").Start(Args);
+                            new ServiceController("MouseWithoutBordersSvc").Start(new string[] { "CAD" });
                         }
 
                         break;

src/modules/MouseWithoutBorders/App/Class/MachinePool.cs

@@ -156,7 +156,7 @@ namespace MouseWithoutBorders.Class
                     }
                     else if (list.Count >= 4)
                     {
-                        throw new ArgumentException($"The number of machines exceeded the maximum allowed limit of {Common.MAX_MACHINE}. Actual count: {list.Count}.");
+                        throw new ArgumentException("machineNames.Length > Common.MAX_MACHINE");
                     }
 
                     _ = LearnMachine(name);
@@ -178,7 +178,7 @@ namespace MouseWithoutBorders.Class
                     }
                     else if (list.Count >= 4)
                     {
-                        throw new ArgumentException($"The number of machines exceeded the maximum allowed limit of {Common.MAX_MACHINE}. Actual count: {list.Count}.");
+                        throw new ArgumentException("infos.Length > Common.MAX_MACHINE");
                     }
 
                     _ = LearnMachine(inf.Name);

src/modules/MouseWithoutBorders/App/Class/MachinePoolHelpers.cs

@@ -8,9 +8,6 @@ namespace MouseWithoutBorders.Class
 {
     internal static class MachinePoolHelpers
     {
-        internal static readonly char[] Comma = new char[] { ',' };
-        internal static readonly char[] Colon = new char[] { ':' };
-
         internal static MachineInf[] LoadMachineInfoFromMachinePoolStringSetting(string s)
         {
             if (s == null)
@@ -18,7 +15,7 @@ namespace MouseWithoutBorders.Class
                 throw new ArgumentNullException(s);
             }
 
-            string[] st = s.Split(Comma);
+            string[] st = s.Split(new char[] { ',' });
 
             if (st.Length < Common.MAX_MACHINE)
             {
@@ -28,7 +25,7 @@ namespace MouseWithoutBorders.Class
             MachineInf[] rv = new MachineInf[Common.MAX_MACHINE];
             for (int i = 0; i < Common.MAX_MACHINE; i++)
             {
-                string[] mc = st[i].Split(Colon);
+                string[] mc = st[i].Split(new char[] { ':' });
                 if (mc.Length == 2)
                 {
                     rv[i].Name = mc[0];

src/modules/MouseWithoutBorders/App/Class/Setting.cs

@@ -38,7 +38,7 @@ namespace MouseWithoutBorders.Class
     {
         internal bool Changed;
 
-        private readonly SettingsUtils _settingsUtils;
+        private readonly ISettingsUtils _settingsUtils;
         private readonly object _loadingSettingsLock = new object();
         private readonly IFileSystemWatcher _watcher;
 

src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs

@@ -887,14 +887,14 @@ namespace MouseWithoutBorders.Class
 
                 if (!string.IsNullOrEmpty(Setting.Values.Name2IP))
                 {
-                    string[] name2ip = Setting.Values.Name2IP.Split(Separator, StringSplitOptions.RemoveEmptyEntries);
+                    string[] name2ip = Setting.Values.Name2IP.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
                     string[] nameNip;
 
                     if (name2ip != null)
                     {
                         foreach (string st in name2ip)
                         {
-                            nameNip = st.Split(BlankSeparator, StringSplitOptions.RemoveEmptyEntries);
+                            nameNip = st.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
 
                             if (nameNip != null && nameNip.Length >= 2 && nameNip[0].Trim().Equals(machineName, StringComparison.OrdinalIgnoreCase)
                                 && IPAddress.TryParse(nameNip[1].Trim(), out IPAddress ip) && !validAddressesSt.Contains("[" + ip.ToString() + "]")
@@ -1063,7 +1063,7 @@ namespace MouseWithoutBorders.Class
 
             List<IPAddress> localIPv4Addresses = GetMyIPv4Addresses().ToList();
 
-            if (localIPv4Addresses.Count == 0)
+            if (!localIPv4Addresses.Any())
             {
                 Common.Log($"No IPv4 resolved from the local machine: {Common.MachineName}");
                 return true;
@@ -1234,8 +1234,6 @@ namespace MouseWithoutBorders.Class
         }
 
         private long lastRemoteMachineID;
-        internal static readonly string[] Separator = new string[] { "\r\n" };
-        internal static readonly char[] BlankSeparator = new char[] { ' ' };
 
         private void MainTCPRoutine(TcpSk tcp, string machineName, bool isClient)
         {

src/modules/MouseWithoutBorders/App/Class/TcpServer.cs

@@ -104,7 +104,6 @@ namespace MouseWithoutBorders.Class
         }
 
         private static bool logged;
-        internal static readonly string[] Separator = new[] { " " };
 
         private void LogError(string log)
         {
@@ -147,7 +146,7 @@ namespace MouseWithoutBorders.Class
                                 try
                                 {
                                     // Assuming the format of netstat's output is fixed.
-                                    pid = int.Parse(portLogLine.Split(Separator, StringSplitOptions.RemoveEmptyEntries).Last(), CultureInfo.CurrentCulture);
+                                    pid = int.Parse(portLogLine.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries).Last(), CultureInfo.CurrentCulture);
                                     process = Process.GetProcessById(pid);
                                 }
                                 catch (Exception)

src/modules/MouseWithoutBorders/App/Form/Settings/SettingsForm.cs

@@ -123,14 +123,13 @@ namespace MouseWithoutBorders
         }
 
         private string lastMessage = string.Empty;
-        private static readonly string[] Separator = new string[] { "\r\n" };
 
         internal void ShowTip(ToolTipIcon icon, string msg, int durationInMilliseconds)
         {
             int x = 0;
             string text = msg + $"\r\n {(lastMessage.Equals(msg, StringComparison.OrdinalIgnoreCase) ? string.Empty : $"\r\nPrevious message/error: {lastMessage}")} ";
             lastMessage = msg;
-            int y = (-text.Split(Separator, StringSplitOptions.None).Length * 15) - 30;
+            int y = (-text.Split(new string[] { "\r\n" }, StringSplitOptions.None).Length * 15) - 30;
 
             toolTipManual.Hide(this);
 

src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs

@@ -742,13 +742,11 @@ namespace MouseWithoutBorders
             LoadMachines();
         }
 
-        internal static readonly string[] Separator = new string[] { "\r\n" };
-
         internal void ShowTip(ToolTipIcon icon, string text, int duration)
         {
             int x = 0;
             text += "\r\n ";
-            int y = (-text.Split(Separator, StringSplitOptions.None).Length * 15) - 30;
+            int y = (-text.Split(new string[] { "\r\n" }, StringSplitOptions.None).Length * 15) - 30;
 
             toolTipManual.Hide(this);
 

src/modules/PowerOCR/PowerOCR/Helpers/ImageMethods.cs

@@ -148,8 +148,6 @@ internal sealed class ImageMethods
         return resultText.Trim();
     }
 
-    internal static readonly char[] Separator = new char[] { '\n', '\r' };
-
     public static async Task<string> ExtractText(Bitmap bmp, Language? preferredLanguage, System.Windows.Point? singlePoint = null)
     {
         Language? selectedLanguage = preferredLanguage ?? GetOCRLanguage();
@@ -213,7 +211,7 @@ internal sealed class ImageMethods
 
         if (culture.TextInfo.IsRightToLeft)
         {
-            string[] textListLines = text.ToString().Split(Separator);
+            string[] textListLines = text.ToString().Split(new char[] { '\n', '\r' });
 
             _ = text.Clear();
             foreach (string textLine in textListLines)

src/modules/PowerOCR/PowerOCR/Models/ResultTable.cs

@@ -239,7 +239,7 @@ public class ResultTable
         return rowAreas;
     }
 
-    private static void CheckIntersectionsWithWordBorders(int hitGridSpacing, ICollection<WordBorder> wordBorders, List<int> rowAreas, int i, Rect horizontalLineRect)
+    private static void CheckIntersectionsWithWordBorders(int hitGridSpacing, ICollection<WordBorder> wordBorders, ICollection<int> rowAreas, int i, Rect horizontalLineRect)
     {
         foreach (WordBorder wb in wordBorders)
         {

src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs

@@ -50,7 +50,15 @@ public partial class OCROverlay : Window
 
         InitializeComponent();
 
-        Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this, Wpf.Ui.Controls.WindowBackdropType.None);
+        // workaround for #30177
+        try
+        {
+            Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this, Wpf.Ui.Controls.WindowBackdropType.None);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Exception in SystemThemeWatcher.Watch, issue 30177. {ex.Message}");
+        }
 
         PopulateLanguageMenu();
     }

src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs

@@ -16,7 +16,7 @@ namespace PowerOCR.Settings
     [Export(typeof(IUserSettings))]
     public class UserSettings : IUserSettings
     {
-        private readonly SettingsUtils _settingsUtils;
+        private readonly ISettingsUtils _settingsUtils;
         private const string PowerOcrModuleName = "TextExtractor";
         private const string DefaultActivationShortcut = "Win + Shift + O";
         private const int MaxNumberOfRetry = 5;

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.base.rc

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

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp

@@ -8,10 +8,6 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/process_path.h>
 
-#include <common/utils/elevation.h>
-#include <common/notifications/NotificationUtil.h>
-#include <Generated Files/resource.h>
-
 #include <interop/shared_constants.h>
 
 #include <trace.h>
@@ -493,10 +489,6 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
     break;
     case EVENT_SYSTEM_FOREGROUND:
     {
-        if (!is_process_elevated() && IsProcessOfWindowElevated(data->hwnd))
-        {
-            notifications::WarnIfElevationIsRequired(GET_RESOURCE_STRING(IDS_ALWAYSONTOP), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED_LEARN_MORE), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED_DIALOG_DONT_SHOW_AGAIN));
-        }
         RefreshBorders();
     }
     break;

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj

@@ -3,9 +3,6 @@
   <!-- Project configurations -->
   <!-- Props that should be disabled while building on CI server -->
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h AlwaysOnTop.base.rc AlwaysOnTop.rc" />
-  </Target>
   <ItemDefinitionGroup Condition="'$(CIBuild)'!='true'">
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -144,12 +141,9 @@
   <ItemGroup>
     <ClInclude Include="AlwaysOnTop.h" />
     <ClInclude Include="FrameDrawer.h" />
-	<ClInclude Include="Generated Files/resource.h" />
     <ClInclude Include="ModuleConstants.h" />
-	<ClInclude Include="NotificationUtil.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
-	<None Include="resource.base.h" />
     <ClInclude Include="ScalingUtils.h" />
     <ClInclude Include="Settings.h" />
     <ClInclude Include="SettingsConstants.h" />
@@ -173,17 +167,10 @@
     </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>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Generated Files/AlwaysOnTop.rc" />
-    <None Include="AlwaysOnTop.base.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources.resx" />
+    <ResourceCompile Include="AlwaysOnTop.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\..\deps\spdlog.props" />

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters

@@ -12,9 +12,6 @@
     <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>
-	<Filter Include="Generated Files">
-      <UniqueIdentifier>{A74B5AAC-E913-410D-8941-D73346CF47AE}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -52,22 +49,8 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Generated Files/AlwaysOnTop.rc">
-      <Filter>Generated Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-	<None Include="Resources.resx">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource.base.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="AlwaysOnTop.base.rc">
-      <Filter>Resource Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -114,9 +97,6 @@
     </ClInclude>
     <ClInclude Include="ScalingUtils.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-	<ClInclude Include="Generated Files/resource.h">
-      <Filter>Generated Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

src/modules/alwaysontop/AlwaysOnTop/Resources.resx

@@ -1,134 +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="AlwaysOnTop" xml:space="preserve">
-    <value>AlwaysOnTop</value>
-    <comment>AlwaysOnTop is a product name, keep as is.</comment>
-  </data>
-  <data name="System_Foreground_Elevated" xml:space="preserve">
-    <value>We've detected an application running with administrator privileges. This will prevent certain interactions with these applications.</value>
-    <comment>administrator is context of user account.</comment>
-  </data>
-  <data name="System_Foreground_Elevated_Learn_More" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
-  <data name="System_Foreground_Elevated_Dialog_Dont_Show_Again" xml:space="preserve">
-    <value>Don't show again</value>
-  </data>
-</root>

src/modules/alwaysontop/AlwaysOnTop/resource.base.h

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

src/modules/awake/Awake/Core/Manager.cs

@@ -28,9 +28,6 @@ namespace Awake.Core
     /// </summary>
     public class Manager
     {
-        private static readonly CompositeFormat AwakeMinutes = System.Text.CompositeFormat.Parse(Properties.Resources.AWAKE_MINUTES);
-        private static readonly CompositeFormat AwakeHours = System.Text.CompositeFormat.Parse(Properties.Resources.AWAKE_HOURS);
-
         private static BlockingCollection<ExecutionState> _stateQueue;
 
         private static CancellationTokenSource _tokenSource;
@@ -279,9 +276,9 @@ namespace Awake.Core
         {
             Dictionary<string, int> optionsList = new Dictionary<string, int>
             {
-                { string.Format(CultureInfo.InvariantCulture, AwakeMinutes, 30), 1800 },
+                { string.Format(CultureInfo.InvariantCulture, Resources.AWAKE_MINUTES, 30), 1800 },
                 { Resources.AWAKE_1_HOUR, 3600 },
-                { string.Format(CultureInfo.InvariantCulture, AwakeHours, 2), 7200 },
+                { string.Format(CultureInfo.InvariantCulture, Resources.AWAKE_HOURS, 2), 7200 },
             };
             return optionsList;
         }

src/modules/awake/Awake/Program.cs

@@ -47,11 +47,6 @@ namespace Awake
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
         private static ManualResetEvent _exitSignal = new ManualResetEvent(false);
-        internal static readonly string[] AliasesConfigOption = new[] { "--use-pt-config", "-c" };
-        internal static readonly string[] AliasesDisplayOption = new[] { "--display-on", "-d" };
-        internal static readonly string[] AliasesTimeOption = new[] { "--time-limit", "-t" };
-        internal static readonly string[] AliasesPidOption = new[] { "--pid", "-p" };
-        internal static readonly string[] AliasesExpireAtOption = new[] { "--expire-at", "-e" };
 
         private static int Main(string[] args)
         {
@@ -91,7 +86,7 @@ namespace Awake
             Logger.LogInfo("Parsing parameters...");
 
             Option<bool> configOption = new(
-                    aliases: AliasesConfigOption,
+                    aliases: new[] { "--use-pt-config", "-c" },
                     getDefaultValue: () => false,
                     description: $"Specifies whether {Core.Constants.AppName} will be using the PowerToys configuration file for managing the state.")
             {
@@ -100,7 +95,7 @@ namespace Awake
             };
 
             Option<bool> displayOption = new(
-                    aliases: AliasesDisplayOption,
+                    aliases: new[] { "--display-on", "-d" },
                     getDefaultValue: () => true,
                     description: "Determines whether the display should be kept awake.")
             {
@@ -109,7 +104,7 @@ namespace Awake
             };
 
             Option<uint> timeOption = new(
-                    aliases: AliasesTimeOption,
+                    aliases: new[] { "--time-limit", "-t" },
                     getDefaultValue: () => 0,
                     description: "Determines the interval, in seconds, during which the computer is kept awake.")
             {
@@ -118,7 +113,7 @@ namespace Awake
             };
 
             Option<int> pidOption = new(
-                    aliases: AliasesPidOption,
+                    aliases: new[] { "--pid", "-p" },
                     getDefaultValue: () => 0,
                     description: $"Bind the execution of {Core.Constants.AppName} to another process. When the process ends, the system will resume managing the current sleep and display state.")
             {
@@ -127,7 +122,7 @@ namespace Awake
             };
 
             Option<string> expireAtOption = new(
-                    aliases: AliasesExpireAtOption,
+                    aliases: new[] { "--expire-at", "-e" },
                     getDefaultValue: () => string.Empty,
                     description: $"Determines the end date/time when {Core.Constants.AppName} will back off and let the system manage the current sleep and display state.")
             {

src/modules/cmdNotFound/CmdNotFound/CmdNotFound.csproj

@@ -1,68 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="..\..\..\Version.props" />
-
-	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-		<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Authors>Microsoft Corporation</Authors>
-		<Product>PowerToys</Product>
-		<Nullable>enable</Nullable>
-		<Description>PowerToys CommandNotFound</Description>
-		<AssemblyName>PowerToys.CmdNotFound</AssemblyName>
-		<GenerateDependencyFile>false</GenerateDependencyFile>
-		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
-		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<SelfContained>true</SelfContained>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-
-	<!-- SelfContained=true requires RuntimeIdentifier to be set -->
-	<PropertyGroup Condition="'$(Platform)'=='x64'">
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Platform)'=='ARM64'">
-		<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<DebugType>full</DebugType>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-		<Optimize>false</Optimize>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)'=='Release'">
-		<DefineConstants>TRACE;RELEASE</DefineConstants>
-		<Optimize>true</Optimize>
-		<DebugType>pdbonly</DebugType>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.ObjectPool">
-			<ExcludeAssets>contentFiles</ExcludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="System.Management.Automation">
-			<ExcludeAssets>contentFiles</ExcludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<Content Include="WinGetCommandNotFound.psd1">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-		</Content>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-	  <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
-	</ItemGroup>
-
-</Project>

src/modules/cmdNotFound/CmdNotFound/Init.cs

@@ -1,57 +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.Management.Automation;
-using System.Management.Automation.Subsystem;
-using System.Management.Automation.Subsystem.Feedback;
-using System.Management.Automation.Subsystem.Prediction;
-
-namespace WinGetCommandNotFound
-{
-    public sealed class Init : IModuleAssemblyInitializer, IModuleAssemblyCleanup
-    {
-        internal const string Id = "e5351aa4-dfde-4d4d-bf0f-1a2f5a37d8d6";
-
-        public void OnImport()
-        {
-            if (!Platform.IsWindows || !IsWinGetInstalled())
-            {
-                return;
-            }
-
-            SubsystemManager.RegisterSubsystem(SubsystemKind.FeedbackProvider, WinGetCommandNotFoundFeedbackPredictor.Singleton);
-            SubsystemManager.RegisterSubsystem(SubsystemKind.CommandPredictor, WinGetCommandNotFoundFeedbackPredictor.Singleton);
-        }
-
-        public void OnRemove(PSModuleInfo psModuleInfo)
-        {
-            if (!IsWinGetInstalled())
-            {
-                return;
-            }
-
-            SubsystemManager.UnregisterSubsystem<IFeedbackProvider>(new Guid(Id));
-            SubsystemManager.UnregisterSubsystem<ICommandPredictor>(new Guid(Id));
-        }
-
-        private bool IsWinGetInstalled()
-        {
-            // Ensure WinGet is installed
-            using (var pwsh = PowerShell.Create(RunspaceMode.CurrentRunspace))
-            {
-                var results = pwsh.AddCommand("Get-Command")
-                    .AddParameter("Name", "winget")
-                    .AddParameter("CommandType", "Application")
-                    .Invoke();
-
-                if (results.Count is 0)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-}

src/modules/cmdNotFound/CmdNotFound/PooledPowerShellObjectPolicy.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.Management.Automation;
-using System.Management.Automation.Runspaces;
-using Microsoft.Extensions.ObjectPool;
-
-namespace WinGetCommandNotFound
-{
-    public sealed class PooledPowerShellObjectPolicy : IPooledObjectPolicy<PowerShell>
-    {
-        private static readonly string[] WingetClientModuleName = new[] { "Microsoft.WinGet.Client" };
-
-        public PowerShell Create()
-        {
-            var iss = InitialSessionState.CreateDefault2();
-            iss.ImportPSModule(WingetClientModuleName);
-            return PowerShell.Create(iss);
-        }
-
-        public bool Return(PowerShell obj)
-        {
-            if (obj != null)
-            {
-                obj.Commands.Clear();
-                obj.Streams.ClearStreams();
-                return true;
-            }
-
-            return false;
-        }
-    }
-}

src/modules/cmdNotFound/CmdNotFound/Telemetry/CmdNotFoundFeedbackProvidedEvent.cs

@@ -1,16 +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.Tracing;
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace WinGetCommandNotFound.Telemetry
-{
-    [EventData]
-    public class CmdNotFoundFeedbackProvidedEvent : EventBase, IEvent
-    {
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

src/modules/cmdNotFound/CmdNotFound/Telemetry/CmdNotFoundSuggestionProvidedEvent.cs

@@ -1,16 +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.Tracing;
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace WinGetCommandNotFound.Telemetry
-{
-    [EventData]
-    public class CmdNotFoundSuggestionProvidedEvent : EventBase, IEvent
-    {
-        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    }
-}

src/modules/cmdNotFound/CmdNotFound/WinGetCommandNotFound.psd1

@@ -1,11 +0,0 @@
-@{
-    ModuleVersion = '0.1.0'
-    GUID = '28c9afa2-92e5-413e-8e53-44b2d7a83ac6'
-    Author = 'Carlos Zamora'
-    CompanyName = "Microsoft Corporation"
-    Copyright = "Copyright (c) Microsoft Corporation."
-    Description = 'Enable suggestions on how to install missing commands via winget'
-    PowerShellVersion = '7.4'
-    NestedModules = @('PowerToys.CmdNotFound.dll')
-    RequiredModules   = @(@{ModuleName = 'Microsoft.WinGet.Client';  ModuleVersion = "0.2.1"; })
-}

src/modules/cmdNotFound/CmdNotFound/WinGetCommandNotFoundFeedbackPredictor.cs

@@ -1,217 +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;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Management.Automation;
-using System.Management.Automation.Subsystem.Feedback;
-using System.Management.Automation.Subsystem.Prediction;
-using ManagedCommon;
-using Microsoft.Extensions.ObjectPool;
-using Microsoft.PowerToys.Telemetry;
-
-namespace WinGetCommandNotFound
-{
-    public sealed class WinGetCommandNotFoundFeedbackPredictor : IFeedbackProvider, ICommandPredictor
-    {
-        private readonly Guid _guid;
-
-        private readonly ObjectPool<PowerShell> _pool;
-
-        private const int _maxSuggestions = 20;
-
-        private List<string>? _candidates;
-
-        private bool _warmedUp;
-
-        public static WinGetCommandNotFoundFeedbackPredictor Singleton { get; } = new WinGetCommandNotFoundFeedbackPredictor(Init.Id);
-
-        private WinGetCommandNotFoundFeedbackPredictor(string guid)
-        {
-            Logger.InitializeLogger("\\CmdNotFound\\Logs");
-
-            _guid = new Guid(guid);
-
-            var provider = new DefaultObjectPoolProvider();
-            _pool = provider.Create(new PooledPowerShellObjectPolicy());
-            _pool.Return(_pool.Get());
-            Task.Run(() => WarmUp());
-        }
-
-        public Guid Id => _guid;
-
-        public string Name => "Windows Package Manager - WinGet";
-
-        public string Description => "Finds missing commands that can be installed via WinGet.";
-
-        public Dictionary<string, string>? FunctionsToDefine => null;
-
-        private void WarmUp()
-        {
-            var ps = _pool.Get();
-            try
-            {
-                ps.AddCommand("Find-WinGetPackage")
-                    .AddParameter("Count", 1)
-                    .Invoke();
-            }
-            finally
-            {
-                _pool.Return(ps);
-                _warmedUp = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets feedback based on the given commandline and error record.
-        /// </summary>
-        public FeedbackItem? GetFeedback(FeedbackContext context, CancellationToken token)
-        {
-            var target = (string)context.LastError!.TargetObject;
-            if (target is not null)
-            {
-                try
-                {
-                    bool tooManySuggestions = false;
-                    string packageMatchFilterField = "command";
-                    var pkgList = FindPackages(target, ref tooManySuggestions, ref packageMatchFilterField);
-                    if (pkgList.Count == 0)
-                    {
-                        return null;
-                    }
-
-                    // Build list of suggestions
-                    _candidates = new List<string>();
-                    foreach (var pkg in pkgList)
-                    {
-                        _candidates.Add(string.Format(CultureInfo.InvariantCulture, "winget install --id {0}", pkg.Members["Id"].Value.ToString()));
-                    }
-
-                    // Build footer message
-                    var footerMessage = tooManySuggestions ?
-                        string.Format(CultureInfo.InvariantCulture, "Additional results can be found using \"winget search --{0} {1}\"", packageMatchFilterField, target) :
-                        null;
-
-                    PowerToysTelemetry.Log.WriteEvent(new Telemetry.CmdNotFoundFeedbackProvidedEvent());
-
-                    return new FeedbackItem(
-                        "Try installing this package using winget:",
-                        _candidates,
-                        footerMessage,
-                        FeedbackDisplayLayout.Portrait);
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("GetFeedback failed to execute", ex);
-                    return new FeedbackItem($"Failed to execute PowerToys Command Not Found.{Environment.NewLine}This is a known issue if PowerShell 7 is installed from the Store or MSIX. If that isn't your case, please report an issue.", new List<string>(), FeedbackDisplayLayout.Portrait);
-                }
-            }
-
-            return null;
-        }
-
-        private Collection<PSObject> FindPackages(string query, ref bool tooManySuggestions, ref string packageMatchFilterField)
-        {
-            if (!_warmedUp)
-            {
-                return new Collection<PSObject>();
-            }
-
-            var ps = _pool.Get();
-            try
-            {
-                var common = new Hashtable()
-                {
-                    ["Source"] = "winget",
-                };
-
-                // 1) Search by command
-                var pkgList = ps.AddCommand("Find-WinGetPackage")
-                    .AddParameter("Command", query)
-                    .AddParameter("MatchOption", "StartsWithCaseInsensitive")
-                    .AddParameters(common)
-                    .Invoke();
-                if (pkgList.Count > 0)
-                {
-                    tooManySuggestions = pkgList.Count > _maxSuggestions;
-                    packageMatchFilterField = "command";
-                    return pkgList;
-                }
-
-                // 2) No matches found,
-                //    search by name
-                ps.Commands.Clear();
-                pkgList = ps.AddCommand("Find-WinGetPackage")
-                    .AddParameter("Name", query)
-                    .AddParameter("MatchOption", "ContainsCaseInsensitive")
-                    .AddParameters(common)
-                    .Invoke();
-                if (pkgList.Count > 0)
-                {
-                    tooManySuggestions = pkgList.Count > _maxSuggestions;
-                    packageMatchFilterField = "name";
-                    return pkgList;
-                }
-
-                // 3) No matches found,
-                //    search by moniker
-                ps.Commands.Clear();
-                pkgList = ps.AddCommand("Find-WinGetPackage")
-                    .AddParameter("Moniker", query)
-                    .AddParameter("MatchOption", "ContainsCaseInsensitive")
-                    .AddParameters(common)
-                    .Invoke();
-                tooManySuggestions = pkgList.Count > _maxSuggestions;
-                packageMatchFilterField = "moniker";
-                return pkgList;
-            }
-            finally
-            {
-                _pool.Return(ps);
-            }
-        }
-
-        public bool CanAcceptFeedback(PredictionClient client, PredictorFeedbackKind feedback)
-        {
-            return feedback switch
-            {
-                PredictorFeedbackKind.CommandLineAccepted => true,
-                _ => false,
-            };
-        }
-
-        public SuggestionPackage GetSuggestion(PredictionClient client, PredictionContext context, CancellationToken cancellationToken)
-        {
-            if (_candidates is not null)
-            {
-                string input = context.InputAst.Extent.Text;
-                List<PredictiveSuggestion>? result = null;
-
-                foreach (string c in _candidates)
-                {
-                    if (c.StartsWith(input, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result ??= new List<PredictiveSuggestion>(_candidates.Count);
-                        result.Add(new PredictiveSuggestion(c));
-                    }
-                }
-
-                if (result is not null)
-                {
-                    PowerToysTelemetry.Log.WriteEvent(new Telemetry.CmdNotFoundSuggestionProvidedEvent());
-                    return new SuggestionPackage(result);
-                }
-            }
-
-            return default;
-        }
-
-        public void OnCommandLineAccepted(PredictionClient client, IReadOnlyList<string> history)
-        {
-            // Reset the candidate state.
-            _candidates = null;
-        }
-    }
-}

src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.rc

@@ -1,108 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include <windows.h>
-#include "resource.h"
-#include "../../../common/version/version.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDS_CMD_NOT_FOUND_NAME       "Command Not Found"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{0014d652-901f-4456-8d65-06fc5f997fb0}</ProjectGuid>
-    <RootNamespace>CmdNotFoundModuleInterface</RootNamespace>
-    <TargetName>PowerToys.CmdNotFoundModuleInterface</TargetName>
-    <PlatformToolset>v143</PlatformToolset>
-    <ProjectName>CmdNotFoundModuleInterface</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;CMDNOTFOUNDMODULEINTERFACE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>Shlwapi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;CMDNOTFOUNDMODULEINTERFACE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>Shlwapi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <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>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CmdNotFoundModuleInterface.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj.filters

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;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>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <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>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CmdNotFoundModuleInterface.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

src/modules/cmdNotFound/CmdNotFoundModuleInterface/dllmain.cpp

@@ -1,158 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#include "pch.h"
-
-#include <filesystem>
-#include <string>
-
-#include <common/logger/logger.h>
-#include <common/logger/logger_settings.h>
-#include <common/SettingsAPI/settings_objects.h>
-#include <common/utils/gpo.h>
-#include <common/utils/logger_helper.h>
-#include <common/utils/process_path.h>
-#include <common/utils/resources.h>
-#include <interface/powertoy_module_interface.h>
-
-#include "resource.h"
-#include "trace.h"
-
-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;
-}
-
-const static wchar_t* MODULE_NAME = L"Command Not Found";
-const static wchar_t* MODULE_DESC = L"A module that detects an error thrown by a command in PowerShell and suggests a relevant WinGet package to install, if available.";
-
-inline const std::wstring ModuleKey = L"CmdNotFound";
-
-class CmdNotFound : public PowertoyModuleIface
-{
-    std::wstring app_name;
-    std::wstring app_key;
-
-private:
-    bool m_enabled = false;
-
-    void install_module()
-    {
-        auto module_path = get_module_folderpath();
-
-        std::string command = "pwsh.exe";
-        command += " ";
-        command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(module_path) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\EnableModule.ps1" + "\"" + " -scriptPath \"" + winrt::to_string(module_path) + "\"";
-
-        int ret = system(command.c_str());
-
-        if (ret != 0)
-        {
-            Logger::error("Running EnableModule.ps1 script failed.");
-        }
-        else
-        {
-            Logger::info("Module installed successfully.");
-            Trace::EnableCmdNotFoundGpo(true);
-        }
-    }
-
-    void uninstall_module()
-    {
-        auto module_path = get_module_folderpath();
-
-        std::string command = "pwsh.exe";
-        command += " ";
-        command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(module_path) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"";
-
-        int ret = system(command.c_str());
-
-        if (ret != 0)
-        {
-            Logger::error("Running EnableModule.ps1 script failed.");
-        }
-        else
-        {
-            Logger::info("Module uninstalled successfully.");
-            Trace::EnableCmdNotFoundGpo(false);
-        }
-    }
-
-public:
-    CmdNotFound()
-    {
-        app_name = GET_RESOURCE_STRING(IDS_CMD_NOT_FOUND_NAME);
-        app_key = ModuleKey;
-        LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::cmdNotFoundLoggerName);
-        Logger::info("CmdNotFound object is constructing");
-
-        powertoys_gpo::gpo_rule_configured_t gpo_rule_configured_value = gpo_policy_enabled_configuration();
-        if (gpo_rule_configured_value == powertoys_gpo::gpo_rule_configured_t::gpo_rule_configured_enabled)
-        {
-            install_module();
-            m_enabled = true;
-        }
-        else if (gpo_rule_configured_value == powertoys_gpo::gpo_rule_configured_t::gpo_rule_configured_disabled)
-        {
-            uninstall_module();
-            m_enabled = false;
-        }
-    }
-
-    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
-    {
-        return powertoys_gpo::getConfiguredCmdNotFoundEnabledValue();
-    }
-
-    virtual void destroy() override
-    {
-        delete this;
-    }
-
-    virtual const wchar_t* get_name() override
-    {
-        return MODULE_NAME;
-    }
-
-    virtual const wchar_t* get_key() override
-    {
-        return app_key.c_str();
-    }
-
-    virtual bool get_config(wchar_t* /*buffer*/, int* /*buffer_size*/) override
-    {
-        return false;
-    }
-
-    virtual void set_config(const wchar_t* config) override
-    {
-    }
-
-    virtual void enable()
-    {
-    }
-
-    virtual void disable()
-    {
-    }
-
-    virtual bool is_enabled() override
-    {
-        return m_enabled;
-    }
-};
-
-extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
-{
-    return new CmdNotFound();
-}

src/modules/cmdNotFound/CmdNotFoundModuleInterface/pch.cpp

@@ -1,5 +0,0 @@
-// pch.cpp: source file corresponding to the pre-compiled header
-
-#include "pch.h"
-
-// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.

src/modules/cmdNotFound/CmdNotFoundModuleInterface/pch.h

@@ -1,16 +0,0 @@
-// pch.h: This is a precompiled header file.
-// Files listed below are compiled only once, improving build performance for future builds.
-// This also affects IntelliSense performance, including code completion and many code browsing features.
-// However, files listed here are ALL re-compiled if any one of them is updated between builds.
-// Do not add files here that you will be updating frequently as this negates the performance advantage.
-
-#ifndef PCH_H
-#define PCH_H
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files
-#include <windows.h>
-
-#include <ProjectTelemetry.h>
-
-#endif //PCH_H

src/modules/cmdNotFound/CmdNotFoundModuleInterface/resource.h

@@ -1,21 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Awake.rc
-//
-#define IDS_CMD_NOT_FOUND_NAME               101
-
-
-#define FILE_DESCRIPTION "PowerToys Command Not Found"
-#define INTERNAL_NAME "PowerToys.CmdNotFoundModuleInterface"
-#define ORIGINAL_FILENAME "PowerToys.CmdNotFoundModuleInterface.dll"
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif