put commands in the top level

This reverts commit 9ec1eae62e.

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

@@ -282,9 +282,3 @@ xef
 xes
 PACKAGEVERSIONNUMBER
 APPXMANIFESTVERSION
-
-# MRU lists
-CACHEWRITE
-MRUCMPPROC
-MRUINFO
-REGSTR

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

@@ -38,7 +38,6 @@ ALLAPPS
 ALLCHILDREN
 ALLINPUT
 Allman
-Allmodule
 ALLOWUNDO
 ALLVIEW
 ALPHATYPE
@@ -247,7 +246,6 @@ CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
 copiedcolorrepresentation
-coppied
 copyable
 COPYPEN
 COREWINDOW
@@ -446,7 +444,6 @@ ERRORIMAGE
 ERRORTITLE
 ESettings
 esrp
-etd
 ETDT
 etl
 etw
@@ -531,8 +528,8 @@ frm
 FROMTOUCH
 fsanitize
 fsmgmt
-fuzzingtesting
 fxf
+fuzzingtesting
 FZE
 gacutil
 Gaeilge
@@ -737,7 +734,6 @@ INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
 Interlop
-intput
 INTRESOURCE
 INVALIDARG
 invalidoperatioexception
@@ -820,7 +816,6 @@ LMEM
 LMENU
 LOADFROMFILE
 LOBYTE
-localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
@@ -1123,7 +1118,6 @@ oldtheme
 oleaut
 OLECHAR
 onebranch
-OOBEUI
 openas
 opencode
 OPENFILENAME
@@ -1389,8 +1383,8 @@ RIDEV
 RIGHTSCROLLBAR
 riid
 RKey
-Rns
 RNumber
+Rns
 rop
 ROUNDSMALL
 ROWSETEXT
@@ -1401,7 +1395,6 @@ Rsp
 rstringalnum
 rstringalpha
 rstringdigit
-rtb
 RTB
 RTLREADING
 rtm
@@ -1440,7 +1433,6 @@ secpol
 securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
-selfhost
 SENDCHANGE
 sendvirtualinput
 serverside
@@ -1537,7 +1529,6 @@ SLGP
 sln
 SMALLICON
 smartphone
-smileys
 SMTO
 SNAPPROCESS
 snk
@@ -1624,8 +1615,6 @@ svgz
 SVSI
 SWFO
 SWP
-SWPNOSIZE
-SWPNOZORDER
 SWRESTORE
 symbolrequestprod
 SYMCACHE
@@ -1765,8 +1754,8 @@ Uptool
 urld
 Usb
 USEDEFAULT
-USEFILEATTRIBUTES
 USEINSTALLERFORTEST
+USEFILEATTRIBUTES
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
@@ -1880,7 +1869,6 @@ winexe
 winforms
 winget
 wingetcreate
-wingetpkgs
 Winhook
 WINL
 winlogon

.github/pull_request_template.md

@@ -4,7 +4,7 @@
 <!-- Please review the items on the PR checklist before submitting-->
 ## PR Checklist
 
-- [ ] Closes: #xxx
+- [ ] **Closes:** #xxx
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized

Directory.Packages.props

@@ -70,7 +70,6 @@
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
     <PackageVersion Include="OpenAI" Version="2.0.0" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
-    <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
     <!-- Don't update SkiaSharp.Views.WinUI to version 3.* branch as this brakes the HexBox control in Registry Preview. -->

PowerToys.sln

@@ -39,14 +39,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fancyzones", "fancyzones",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FancyZonesLib", "src\modules\fancyzones\FancyZonesLib\FancyZonesLib.vcxproj", "{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FancyZones.UnitTests", "src\modules\fancyzones\FancyZonesTests\UnitTests\UnitTests.vcxproj", "{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests-FancyZones", "src\modules\fancyzones\FancyZonesTests\UnitTests\UnitTests.vcxproj", "{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{1AFB6476-670D-4E80-A464-657E01DFF482}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Lib.UnitTests", "src\common\UnitTests-CommonLib\UnitTests-CommonLib.vcxproj", "{1A066C63-64B3-45F8-92FE-664E1CCE8077}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests-CommonLib", "src\common\UnitTests-CommonLib\UnitTests-CommonLib.vcxproj", "{1A066C63-64B3-45F8-92FE-664E1CCE8077}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FancyZonesEditor", "src\modules\fancyzones\editor\FancyZonesEditor\FancyZonesEditor.csproj", "{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}"
 EndProject
@@ -60,8 +60,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameLib", "src\modules\powerrename\lib\PowerRenameLib.vcxproj", "{51920F1F-C28C-4ADF-8660-4238766796C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameTest", "src\modules\powerrename\testapp\PowerRenameTest.vcxproj", "{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.UnitTests", "src\modules\powerrename\unittests\PowerRenameLibUnitTests.vcxproj", "{2151F984-E006-4A9F-92EF-C6DDE3DC8413}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRenameUnitTests", "src\modules\powerrename\unittests\PowerRenameLibUnitTests.vcxproj", "{2151F984-E006-4A9F-92EF-C6DDE3DC8413}"
 	ProjectSection(ProjectDependencies) = postProject
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
 		{B25AC7A5-FB9F-4789-B392-D5C85E948670} = {B25AC7A5-FB9F-4789-B392-D5C85E948670}
@@ -77,7 +80,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUI", "src\modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerExt", "src\modules\imageresizer\dll\ImageResizerExt.vcxproj", "{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizer.UnitTests", "src\modules\imageresizer\tests\ImageResizer.UnitTests.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUITest", "src\modules\imageresizer\tests\ImageResizerUITest.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -149,13 +152,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PreviewHandlerCommon", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdownPreviewHandler", "src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj", "{6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.MarkdownPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-MarkdownPreviewHandler\Preview.MarkdownPreviewHandler.UnitTests.csproj", "{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-MarkdownPreviewHandler", "src\modules\previewpane\UnitTests-MarkdownPreviewHandler\UnitTests-MarkdownPreviewHandler.csproj", "{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgPreviewHandler", "src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj", "{DA425894-6E13-404F-8DCB-78584EC0557A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.SvgPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-SvgPreviewHandler\Preview.SvgPreviewHandler.UnitTests.csproj", "{060D75DA-2D1C-48E6-A4A1-6F0718B64661}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-SvgPreviewHandler", "src\modules\previewpane\UnitTests-SvgPreviewHandler\UnitTests-SvgPreviewHandler.csproj", "{060D75DA-2D1C-48E6-A4A1-6F0718B64661}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PreviewHandlerCommon.UnitTests", "src\modules\previewpane\UnitTests-PreviewHandlerCommon\Preview.PreviewHandlerCommon.UnitTests.csproj", "{748417CA-F17E-487F-9411-CAFB6D3F4877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PreviewHandlerCommon", "src\modules\previewpane\UnitTests-PreviewHandlerCommon\UnitTests-PreviewHandlerCommon.csproj", "{748417CA-F17E-487F-9411-CAFB6D3F4877}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreview", "src\modules\previewpane\powerpreview\powerpreview.vcxproj", "{217DF501-135C-4E38-BFC8-99D4821032EA}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -192,7 +195,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCommon", "src\common
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Program.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Program.UnitTests\Microsoft.Plugin.Program.UnitTests.csproj", "{42851751-CBC8-45A6-97F5-7A0753F7B4D1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.SvgThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-SvgThumbnailProvider\Preview.SvgThumbnailProvider.UnitTests.csproj", "{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-SvgThumbnailProvider", "src\modules\previewpane\UnitTests-SvgThumbnailProvider\UnitTests-SvgThumbnailProvider.csproj", "{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgThumbnailProvider", "src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj", "{8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD}"
 EndProject
@@ -213,6 +216,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.UnitTests", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest\Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest.csproj", "{632BBE62-5421-49EA-835A-7FFA4F499BD6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj", "{4FA206A5-F69F-4193-BF8F-F6EEB496734C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "src\modules\colorPicker\UnitTest-ColorPickerUI\UnitTest-ColorPickerUI.csproj", "{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.System", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.System\Microsoft.PowerToys.Run.Plugin.System.csproj", "{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}"
@@ -228,7 +235,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "src\common\logger
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SettingsAPI", "src\common\SettingsAPI\SettingsAPI.vcxproj", "{6955446D-23F7-4023-9BB3-8657F904AF99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Interop.UnitTests", "src\common\interop\interop-tests\Common.Interop.UnitTests.csproj", "{58736667-1027-4AD7-BFDF-7A3A6474103A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.Tests", "src\common\interop\interop-tests\Microsoft.Interop.Tests.csproj", "{58736667-1027-4AD7-BFDF-7A3A6474103A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notifications", "notifications", "{D92131D6-7610-4D60-A7DB-1C169783F83B}"
 EndProject
@@ -300,7 +307,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UI", "src\common\Com
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfPreviewHandler", "src\modules\previewpane\PdfPreviewHandler\PdfPreviewHandler.csproj", "{69E1EE8D-143A-4060-9129-4658ACF14AAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PdfPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-PdfPreviewHandler\Preview.PdfPreviewHandler.UnitTests.csproj", "{ECC20689-002A-4354-95A6-B58DF089C6FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PdfPreviewHandler", "src\modules\previewpane\UnitTests-PdfPreviewHandler\UnitTests-PdfPreviewHandler.csproj", "{ECC20689-002A-4354-95A6-B58DF089C6FF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Registry", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Registry\Microsoft.PowerToys.Run.Plugin.Registry.csproj", "{4BABF3FE-3451-42FD-873F-3C332E18DCEF}"
 EndProject
@@ -310,13 +317,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngine", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngineLibrary", "src\modules\keyboardmanager\KeyboardManagerEngineLibrary\KeyboardManagerEngineLibrary.vcxproj", "{E496B7FC-1E99-4BAB-849B-0E8367040B02}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager.Engine.UnitTests", "src\modules\keyboardmanager\KeyboardManagerEngineTest\KeyboardManagerEngineTest.vcxproj", "{7F4B3A60-BC27-45A7-8000-68B0B6EA7466}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEngineTest", "src\modules\keyboardmanager\KeyboardManagerEngineTest\KeyboardManagerEngineTest.vcxproj", "{7F4B3A60-BC27-45A7-8000-68B0B6EA7466}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditor", "src\modules\keyboardmanager\KeyboardManagerEditor\KeyboardManagerEditor.vcxproj", "{8DF78B53-200E-451F-9328-01EB907193AE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibrary", "src\modules\keyboardmanager\KeyboardManagerEditorLibrary\KeyboardManagerEditorLibrary.vcxproj", "{23D2070D-E4AD-4ADD-85A7-083D9C76AD49}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager.Editor.UnitTests", "src\modules\keyboardmanager\KeyboardManagerEditorTest\KeyboardManagerEditorTest.vcxproj", "{62173D9A-6724-4C00-A1C8-FB646480A9EC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorTest", "src\modules\keyboardmanager\KeyboardManagerEditorTest\KeyboardManagerEditorTest.vcxproj", "{62173D9A-6724-4C00-A1C8-FB646480A9EC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "awake", "awake", "{127F38E0-40AA-4594-B955-5616BF206882}"
 EndProject
@@ -344,7 +351,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfThumbnailProvider", "src\modules\previewpane\PdfThumbnailProvider\PdfThumbnailProvider.csproj", "{11491FD8-F921-48BF-880C-7FEA185B80A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.PdfThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-PdfThumbnailProvider\Preview.PdfThumbnailProvider.UnitTests.csproj", "{F40C3397-1834-4530-B2D9-8F8B8456BCDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-PdfThumbnailProvider", "src\modules\previewpane\UnitTests-PdfThumbnailProvider\UnitTests-PdfThumbnailProvider.csproj", "{F40C3397-1834-4530-B2D9-8F8B8456BCDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.WindowsTerminal", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj", "{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85}"
 EndProject
@@ -358,11 +365,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseHighlighter", "src\mod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GcodeThumbnailProvider", "src\modules\previewpane\GcodeThumbnailProvider\GcodeThumbnailProvider.csproj", "{809AA252-E17A-4FA2-B0A1-0450976B763F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.GcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-GcodeThumbnailProvider\Preview.GcodeThumbnailProvider.UnitTests.csproj", "{133281D8-1BCE-4D07-B31E-796612A9609E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-GcodeThumbnailProvider", "src\modules\previewpane\UnitTests-GcodeThumbnailProvider\UnitTests-GcodeThumbnailProvider.csproj", "{133281D8-1BCE-4D07-B31E-796612A9609E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GcodePreviewHandler", "src\modules\previewpane\GcodePreviewHandler\GcodePreviewHandler.csproj", "{805306FF-A562-4415-8DEF-E493BDC45918}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.GcodePreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-GcodePreviewHandler\Preview.GcodePreviewHandler.UnitTests.csproj", "{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-GcodePreviewHandler", "src\modules\previewpane\UnitTests-GcodePreviewHandler\UnitTests-GcodePreviewHandler.csproj", "{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AlwaysOnTop", "AlwaysOnTop", "{60CD2D4F-C3B9-4897-9821-FCA5098B41CE}"
 EndProject
@@ -376,7 +383,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MousePointerCrosshairs", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StlThumbnailProvider", "src\modules\previewpane\StlThumbnailProvider\StlThumbnailProvider.csproj", "{F7C8C0F1-5431-4347-89D0-8E5354F93CF2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.StlThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-StlThumbnailProvider\Preview.StlThumbnailProvider.UnitTests.csproj", "{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-StlThumbnailProvider", "src\modules\previewpane\UnitTests-StlThumbnailProvider\UnitTests-StlThumbnailProvider.csproj", "{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonacoPreviewHandler", "src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj", "{04B193D7-3E21-46B8-A958-89B63A8A69DE}"
 EndProject
@@ -412,8 +419,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerOCR", "src\modules\Pow
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerOCRModuleInterface", "src\modules\PowerOCR\PowerOCRModuleInterface\PowerOCRModuleInterface.vcxproj", "{6AB6A2D6-F859-4A82-9184-0BD29C9F07D1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1234567-1234-1234-1234-123456789ABC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.History", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.History\Microsoft.PowerToys.Run.Plugin.History.csproj", "{212AD910-8488-4036-BE20-326931B75FB2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MeasureTool", "MeasureTool", "{7AC943C9-52E8-44CF-9083-744D8049667B}"
@@ -435,7 +440,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostsUILib", "src\modules\H
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostsEditor.UnitTests", "src\modules\Hosts\Hosts.Tests\HostsEditor.UnitTests.csproj", "{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hosts.Tests", "src\modules\Hosts\Hosts.Tests\Hosts.Tests.csproj", "{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostsModuleInterface", "src\modules\Hosts\HostsModuleInterface\HostsModuleInterface.vcxproj", "{B41B888C-7DB8-4747-B262-4062E05A230D}"
 EndProject
@@ -525,6 +530,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CropAndLockModuleInterface"
 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}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvironmentVariablesUILib", "src\modules\EnvironmentVariables\EnvironmentVariablesUILib\EnvironmentVariablesUILib.csproj", "{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}"
@@ -539,9 +546,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QoiPreviewHandlerCpp", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QoiPreviewHandler", "src\modules\previewpane\QoiPreviewHandler\QoiPreviewHandler.csproj", "{6B04803D-B418-4833-A67E-B0FC966636A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.QoiPreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-QoiPreviewHandler\Preview.QoiPreviewHandler.UnitTests.csproj", "{3940AD4D-F748-4BE4-9083-85769CD553EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests-QoiPreviewHandler", "src\modules\previewpane\UnitTests-QoiPreviewHandler\UnitTests-QoiPreviewHandler.csproj", "{3940AD4D-F748-4BE4-9083-85769CD553EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Preview.QoiThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-QoiThumbnailProvider\Preview.QoiThumbnailProvider.UnitTests.csproj", "{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38}"
+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
@@ -557,6 +564,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegistryPreview", "src\modu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvironmentVariables", "src\modules\EnvironmentVariables\EnvironmentVariables\EnvironmentVariables.csproj", "{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests-FancyZones", "src\modules\fancyzones\UITests-FancyZones\UITests-FancyZones.csproj", "{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests-FancyZonesEditor", "src\modules\fancyzones\UITests-FancyZonesEditor\UITests-FancyZonesEditor.csproj", "{3A9A791E-94A9-49F8-8401-C11CE288D5FB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FancyZonesEditorCommon", "src\modules\fancyzones\FancyZonesEditorCommon\FancyZonesEditorCommon.csproj", "{C0974915-8A1D-4BF0-977B-9587D3807AB7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DSC", "DSC", "{557C4636-D7E1-4838-A504-7D19B725EE95}"
@@ -593,7 +604,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Workspaces.Lib.UnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLibUnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
 EndProject
@@ -669,6 +680,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSea
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZoomIt", "ZoomIt", "{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomIt", "src\modules\ZoomIt\ZoomIt\ZoomIt.vcxproj", "{0A84F764-3A88-44CD-AA96-41BDBD48627B}"
@@ -685,17 +700,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardManagerEditorUI", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibraryWrapper", "src\modules\keyboardmanager\KeyboardManagerEditorLibraryWrapper\KeyboardManagerEditorLibraryWrapper.vcxproj", "{4382A954-179A-4078-92AF-715187DFFF50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostsEditor.FuzzTests", "src\modules\Hosts\Hosts.FuzzTests\HostsEditor.FuzzTests.csproj", "{EBED240C-8702-452D-B764-6DB9DA9179AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.FuzzTests", "src\modules\Hosts\Hosts.FuzzTests\Hosts.FuzzTests.csproj", "{EBED240C-8702-452D-B764-6DB9DA9179AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostsEditor.UITests", "src\modules\Hosts\Hosts.UITests\HostsEditor.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\modules\Hosts\Hosts.UITests\Hosts.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{0217E86E-3476-9946-DE8E-9D200CEBD47A}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzTests", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BgcodePreviewHandler", "src\modules\previewpane\BgcodePreviewHandler\BgcodePreviewHandler.csproj", "{9E0CBC06-F29A-4810-B93C-97D53863B95E}"
 EndProject
@@ -705,76 +722,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BgcodeThumbnailProviderCpp"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BgcodeThumbnailProvider", "src\modules\previewpane\BgcodeThumbnailProvider\BgcodeThumbnailProvider.csproj", "{9BC1C986-1E97-4D07-A7B1-CE226C239EFA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodePreviewHandler.UnitTests", "src\modules\previewpane\UnitTests-BgcodePreviewHandler\Preview.BgcodePreviewHandler.UnitTests.csproj", "{99CA1509-FB73-456E-AFAF-AB89C017BD72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-BgcodePreviewHandler", "src\modules\previewpane\UnitTests-BgcodePreviewHandler\UnitTests-BgcodePreviewHandler.csproj", "{99CA1509-FB73-456E-AFAF-AB89C017BD72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\Preview.BgcodeThumbnailProvider.UnitTests.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-BgcodeThumbnailProvider", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\UnitTests-BgcodeThumbnailProvider.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workspaces.Editor.UITests", "src\modules\Workspaces\WorkspacesEditorUITest\Workspaces.Editor.UITests.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesEditorUITest", "src\modules\Workspaces\WorkspacesEditorUITest\WorkspacesEditorUITest.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorEngineCommon", "src\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCsWin32", "src\common\ManagedCsWin32\ManagedCsWin32.csproj", "{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRename.UITests", "src\modules\powerrename\PowerRenameUITest\PowerRename.UITests.csproj", "{9D3F3793-EFE3-4525-8782-238015DABA62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRenameUITest", "src\modules\powerrename\PowerRenameUITest\PowerRenameUITest.csproj", "{9D3F3793-EFE3-4525-8782-238015DABA62}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Actions", "src\modules\cmdpal\ext\MIcrosoft.CmdPal.Ext.Actions\Microsoft.CmdPal.Ext.Actions.csproj", "{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0E556541-6A45-42CB-AE49-EE5A9BE05E7C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{27D9CB3A-46D1-402C-9273-F88CB8AC42F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B9617A31-0F0A-4397-851D-BF2FBEE32D7F}"
-	ProjectSection(SolutionItems) = preProject
-		src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj = src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1C48CD47-D610-463A-A53C-AF82DD6C47E7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D9BD324E-1D80-44AA-8E7B-73EB00944434}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8EF25507-2575-4ADE-BF7E-D23376903AB8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerOCR.UITests", "src\modules\PowerOCR\PowerOCR-UITests\PowerOCR.UITests.csproj", "{070AC093-C9F2-20AD-0BCD-F318FC2761EA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2C318EC3-BA86-4372-B1BC-DB0F33C208B2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BFFB607F-7C78-434B-86B9-DA4C8196A1B5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{66E1534A-1587-42B2-912F-45C994D32904}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E885E71F-0B34-4A03-B13B-20F4E05E90BB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{264B412F-DB8B-4CF8-A74B-96998B183045}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3527BF37-DFC5-4309-A032-29278CA21328}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{68328142-5B31-4715-BCBB-7B6345EE0971}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{4122388B-59E4-CDB0-0338-EA6881DF86F0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UITests", "src\modules\cmdpal\Microsoft.CmdPal.UITests\Microsoft.CmdPal.UITests.csproj", "{6748A29D-DA6A-033A-825B-752295FF6AA0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{6EABCF9A-6526-441F-932F-658B1DC3E403}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.UITests", "src\modules\fancyzones\FancyZones.UITests\FancyZones.UITests.csproj", "{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZonesEditor.UITests", "src\modules\fancyzones\FancyZonesEditor.UITests\FancyZonesEditor.UITests.csproj", "{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZonesEditor.UnitTests", "src\modules\fancyzones\FancyZonesEditor.UnitTests\FancyZonesEditor.UnitTests.csproj", "{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPickerUI.UnitTests", "src\modules\colorPicker\ColorPickerUI.UnitTests\ColorPickerUI.UnitTests.csproj", "{F93C2817-C846-4259-84D8-B39A6B57C8DE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{8131151D-B0E9-4E18-84A5-E5F946C4480A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Calc.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Calc.UnitTests\Microsoft.CmdPal.Ext.Calc.UnitTests.csproj", "{E816D7AC-4688-4ECB-97CC-3D8E798F3825}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UITests", "src\modules\cmdpal\Microsoft.CmdPal.UITests\Microsoft.CmdPal.UITests.csproj", "{840455DF-5634-51BB-D937-9D7D32F0B0C2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1176,6 +1144,22 @@ Global
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|ARM64.Build.0 = Release|ARM64
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|x64.ActiveCfg = Release|x64
 		{632BBE62-5421-49EA-835A-7FFA4F499BD6}.Release|x64.Build.0 = Release|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|x64.ActiveCfg = Debug|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|x64.Build.0 = Debug|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|ARM64.Build.0 = Release|ARM64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.ActiveCfg = Release|x64
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.Build.0 = Release|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|ARM64.Build.0 = Debug|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.ActiveCfg = Debug|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.Build.0 = Debug|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|ARM64.Build.0 = Release|ARM64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.ActiveCfg = Release|x64
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.Build.0 = Release|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.Build.0 = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
@@ -2060,6 +2044,14 @@ Global
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|ARM64.Build.0 = Release|ARM64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.ActiveCfg = Release|x64
 		{3157FA75-86CF-4EE2-8F62-C43F776493C6}.Release|x64.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
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Debug|x64.Build.0 = Debug|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|ARM64.Build.0 = Release|ARM64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|x64.ActiveCfg = Release|x64
+		{FC8EB78F-F061-4BD9-A3F6-507BEA965E2B}.Release|x64.Build.0 = Release|x64
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{51465DA1-C18B-4B99-93E1-ECF8E0FA0CBA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2184,6 +2176,22 @@ Global
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|ARM64.Build.0 = Release|ARM64
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|x64.ActiveCfg = Release|x64
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8}.Release|x64.Build.0 = Release|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|x64.ActiveCfg = Debug|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Debug|x64.Build.0 = Debug|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|ARM64.Build.0 = Release|ARM64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|x64.ActiveCfg = Release|x64
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}.Release|x64.Build.0 = Release|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|x64.ActiveCfg = Debug|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Debug|x64.Build.0 = Debug|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|ARM64.Build.0 = Release|ARM64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|x64.ActiveCfg = Release|x64
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB}.Release|x64.Build.0 = Release|x64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7}.Debug|x64.ActiveCfg = Debug|x64
@@ -2508,6 +2516,22 @@ Global
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.ActiveCfg = Release|x64
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Build.0 = Release|x64
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Deploy.0 = Release|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.Build.0 = Debug|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|ARM64.Build.0 = Release|ARM64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x64.ActiveCfg = Release|x64
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Release|x64.Build.0 = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.ActiveCfg = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Debug|x64.Build.0 = Debug|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|ARM64.Build.0 = Release|ARM64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.ActiveCfg = Release|x64
+		{7F5B9557-5878-4438-A721-3E28296BA193}.Release|x64.Build.0 = Release|x64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B}.Debug|x64.ActiveCfg = Debug|x64
@@ -2600,6 +2624,14 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2694,14 +2726,6 @@ Global
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|ARM64.Build.0 = Release|ARM64
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|x64.ActiveCfg = Release|x64
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A}.Release|x64.Build.0 = Release|x64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|x64.ActiveCfg = Debug|x64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|x64.Build.0 = Debug|x64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|ARM64.Build.0 = Release|ARM64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.ActiveCfg = Release|x64
-		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.Build.0 = Release|x64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|ARM64.Build.0 = Debug|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Debug|x64.ActiveCfg = Debug|x64
@@ -2710,86 +2734,30 @@ Global
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|ARM64.Build.0 = Release|ARM64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|x64.ActiveCfg = Release|x64
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}.Release|x64.Build.0 = Release|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|x64.ActiveCfg = Debug|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Debug|x64.Build.0 = Debug|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|ARM64.Build.0 = Release|ARM64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|x64.ActiveCfg = Release|x64
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA}.Release|x64.Build.0 = Release|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|x64.ActiveCfg = Debug|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Debug|x64.Build.0 = Debug|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|ARM64.Build.0 = Release|ARM64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|x64.ActiveCfg = Release|x64
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0}.Release|x64.Build.0 = Release|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|ARM64.Build.0 = Debug|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|x64.ActiveCfg = Debug|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Debug|x64.Build.0 = Debug|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|ARM64.ActiveCfg = Release|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|ARM64.Build.0 = Release|ARM64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|x64.ActiveCfg = Release|x64
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55}.Release|x64.Build.0 = Release|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|x64.ActiveCfg = Debug|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Debug|x64.Build.0 = Debug|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|ARM64.Build.0 = Release|ARM64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|x64.ActiveCfg = Release|x64
-		{6748A29D-DA6A-033A-825B-752295FF6AA0}.Release|x64.Build.0 = Release|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|x64.ActiveCfg = Debug|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Debug|x64.Build.0 = Debug|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|ARM64.Build.0 = Release|ARM64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|x64.ActiveCfg = Release|x64
-		{6EABCF9A-6526-441F-932F-658B1DC3E403}.Release|x64.Build.0 = Release|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|ARM64.Build.0 = Debug|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|x64.ActiveCfg = Debug|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Debug|x64.Build.0 = Debug|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|ARM64.ActiveCfg = Release|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|ARM64.Build.0 = Release|ARM64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|x64.ActiveCfg = Release|x64
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15}.Release|x64.Build.0 = Release|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|x64.ActiveCfg = Debug|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Debug|x64.Build.0 = Debug|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|ARM64.Build.0 = Release|ARM64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|x64.ActiveCfg = Release|x64
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83}.Release|x64.Build.0 = Release|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|x64.ActiveCfg = Debug|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Debug|x64.Build.0 = Debug|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|ARM64.Build.0 = Release|ARM64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|x64.ActiveCfg = Release|x64
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9}.Release|x64.Build.0 = Release|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|x64.ActiveCfg = Debug|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Debug|x64.Build.0 = Debug|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|ARM64.Build.0 = Release|ARM64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|x64.ActiveCfg = Release|x64
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE}.Release|x64.Build.0 = Release|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Debug|x64.Build.0 = Debug|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|x64.ActiveCfg = Release|x64
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825}.Release|x64.Build.0 = Release|x64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|x64.ActiveCfg = Debug|x64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Debug|x64.Build.0 = Debug|x64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|ARM64.Build.0 = Release|ARM64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.ActiveCfg = Release|x64
+		{9D3F3793-EFE3-4525-8782-238015DABA62}.Release|x64.Build.0 = Release|x64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Debug|x64.ActiveCfg = Debug|x64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Debug|x64.Build.0 = Debug|x64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Release|ARM64.Build.0 = Release|ARM64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Release|x64.ActiveCfg = Release|x64
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80}.Release|x64.Build.0 = Release|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|x64.ActiveCfg = Debug|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Debug|x64.Build.0 = Debug|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|ARM64.Build.0 = Release|ARM64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|x64.ActiveCfg = Release|x64
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2798,26 +2766,26 @@ Global
 		{3BB8493E-D18E-4485-A320-CB40F90F55AE} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
-		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
+		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{B25AC7A5-FB9F-4789-B392-D5C85E948670} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{2151F984-E006-4A9F-92EF-C6DDE3DC8413} = {66E1534A-1587-42B2-912F-45C994D32904}
+		{2151F984-E006-4A9F-92EF-C6DDE3DC8413} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{6C7F47CC-2151-44A3-A546-41C70025132C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {6C7F47CC-2151-44A3-A546-41C70025132C}
 		{0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {6C7F47CC-2151-44A3-A546-41C70025132C}
-		{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} = {0E556541-6A45-42CB-AE49-EE5A9BE05E7C}
+		{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} = {6C7F47CC-2151-44A3-A546-41C70025132C}
 		{17DA04DF-E393-4397-9CF0-84DABE11032E} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{38BDB927-829B-4C65-9CD9-93FB05D66D65} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
-		{FF742965-9A80-41A5-B042-D6C7D3A21708} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{FF742965-9A80-41A5-B042-D6C7D3A21708} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{4AFC9975-2456-4C70-94A4-84073C1CED93} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{59BD9891-3837-438A-958D-ADC7F91F6F7E} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{4D971245-7A70-41D5-BAA0-DDB5684CAF51} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
@@ -2830,29 +2798,31 @@ Global
 		{2F305555-C296-497E-AC20-5FA1B237996A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{AF2349B8-E5B6-4004-9502-687C1C7730B1} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{6A71162E-FC4C-4A2C-B90F-3CF94F59A9BB} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{DA425894-6E13-404F-8DCB-78584EC0557A} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{060D75DA-2D1C-48E6-A4A1-6F0718B64661} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{748417CA-F17E-487F-9411-CAFB6D3F4877} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{060D75DA-2D1C-48E6-A4A1-6F0718B64661} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{748417CA-F17E-487F-9411-CAFB6D3F4877} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{5D00D290-4016-4CFE-9E41-1E7C724509BA} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{4AED67B6-55FD-486F-B917-E543DEE2CB3C} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{42851751-CBC8-45A6-97F5-7A0753F7B4D1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{42851751-CBC8-45A6-97F5-7A0753F7B4D1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{8FFE09DA-FA4F-4EE1-B3A2-AD5497FBD1AD} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{655C9AF2-18D3-4DA6-80E4-85504A7722BA} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{BA58206B-1493-4C75-BFEA-A85768A1E156} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{1D78B84B-CA39-406C-98F4-71F7EC266CC0} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{03276A39-D4E9-417C-8FFD-200B0EE5E871} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{B81FB7B6-D30E-428F-908A-41422EFC1172} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{0F85E674-34AE-443D-954C-8321EB8B93B1} = {E885E71F-0B34-4A03-B13B-20F4E05E90BB}
-		{632BBE62-5421-49EA-835A-7FFA4F499BD6} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{B81FB7B6-D30E-428F-908A-41422EFC1172} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{0F85E674-34AE-443D-954C-8321EB8B93B1} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
+		{632BBE62-5421-49EA-835A-7FFA4F499BD6} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{4FA206A5-F69F-4193-BF8F-F6EEB496734C} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F} = {E4E03FE0-94FD-47C7-88C5-F17D0AA549D3}
 		{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{DA5A6FE9-0040-40CC-83CC-764AE5306590} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{DA5A6FE9-0040-40CC-83CC-764AE5306590} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{0351ADA4-0C32-4652-9BA0-41F7B602372B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD} = {E4E03FE0-94FD-47C7-88C5-F17D0AA549D3}
 		{6955446D-23F7-4023-9BB3-8657F904AF99} = {1AFB6476-670D-4E80-A464-657E01DFF482}
@@ -2871,20 +2841,20 @@ Global
 		{8F62026A-294B-41C6-8839-87463613F216} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{C3A17DCA-217B-462C-BB0C-BE086AF80081} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{69E1EE8D-143A-4060-9129-4658ACF14AAF} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{ECC20689-002A-4354-95A6-B58DF089C6FF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{ECC20689-002A-4354-95A6-B58DF089C6FF} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{4BABF3FE-3451-42FD-873F-3C332E18DCEF} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{0648DF05-5DDA-4BE1-B5F2-584926EBDB65} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{0648DF05-5DDA-4BE1-B5F2-584926EBDB65} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{BA661F5B-1D5A-4FFC-9BF1-FC39DF280BDD} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{E496B7FC-1E99-4BAB-849B-0E8367040B02} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{7F4B3A60-BC27-45A7-8000-68B0B6EA7466} = {D9BD324E-1D80-44AA-8E7B-73EB00944434}
+		{7F4B3A60-BC27-45A7-8000-68B0B6EA7466} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{8DF78B53-200E-451F-9328-01EB907193AE} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{23D2070D-E4AD-4ADD-85A7-083D9C76AD49} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{62173D9A-6724-4C00-A1C8-FB646480A9EC} = {D9BD324E-1D80-44AA-8E7B-73EB00944434}
+		{62173D9A-6724-4C00-A1C8-FB646480A9EC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{127F38E0-40AA-4594-B955-5616BF206882} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{5E7360A8-D048-4ED3-8F09-0BFD64C5529A} = {127F38E0-40AA-4594-B955-5616BF206882}
 		{D940E07F-532C-4FF3-883F-790DA014F19A} = {127F38E0-40AA-4594-B955-5616BF206882}
 		{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{3E424AD2-19E5-4AE6-B833-F53963EB5FC1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{3E424AD2-19E5-4AE6-B833-F53963EB5FC1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{106CBECA-0701-4FC3-838C-9DF816A19AE2} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{2D604C07-51FC-46BB-9EB7-75AECC7F5E81} = {106CBECA-0701-4FC3-838C-9DF816A19AE2}
 		{2EDB3EB4-FA92-4BFF-B2D8-566584837231} = {106CBECA-0701-4FC3-838C-9DF816A19AE2}
@@ -2892,27 +2862,27 @@ Global
 		{FF1D7936-842A-4BBB-8BEA-E9FE796DE700} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{11491FD8-F921-48BF-880C-7FEA185B80A1} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{F40C3397-1834-4530-B2D9-8F8B8456BCDF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{F40C3397-1834-4530-B2D9-8F8B8456BCDF} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{A2D583F0-B70C-4462-B1F0-8E81AFB7BA85} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{4ED320BC-BA04-4D42-8D15-CBE62151F08B} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{4ED320BC-BA04-4D42-8D15-CBE62151F08B} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{322566EF-20DC-43A6-B9F8-616AF942579A} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{E94FD11C-0591-456F-899F-EFC0CA548336} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{782A61BE-9D85-4081-B35C-1CCC9DCC1E88} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{809AA252-E17A-4FA2-B0A1-0450976B763F} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{133281D8-1BCE-4D07-B31E-796612A9609E} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{133281D8-1BCE-4D07-B31E-796612A9609E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{805306FF-A562-4415-8DEF-E493BDC45918} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{60CD2D4F-C3B9-4897-9821-FCA5098B41CE} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{1DC3BE92-CE89-43FB-8110-9C043A2FE7A2} = {60CD2D4F-C3B9-4897-9821-FCA5098B41CE}
 		{48A0A19E-A0BE-4256-ACF8-CC3B80291AF9} = {60CD2D4F-C3B9-4897-9821-FCA5098B41CE}
 		{9F94B303-5E21-4364-9362-64426F8DB932} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{EAE14C0E-7A6B-45DA-9080-A7D8C077BA6E} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{F7C8C0F1-5431-4347-89D0-8E5354F93CF2} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{04B193D7-3E21-46B8-A958-89B63A8A69DE} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5BDBD6C9-A31F-4CEB-871A-5E9E709197EF} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{FD464B4C-2F68-4D06-91E7-4208146C41F5} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
-		{8FE5A5EE-1B59-401C-9FB3-B04ECD3E29C1} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{FD464B4C-2F68-4D06-91E7-4208146C41F5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+		{8FE5A5EE-1B59-401C-9FB3-B04ECD3E29C1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{020A7474-3601-4160-A159-D7B70B77B15F} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{27718999-C175-450A-861C-89F911E16A88} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{1DBBB112-4BB1-444B-8EBB-E66555C76BA6} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
@@ -2926,7 +2896,6 @@ Global
 		{A50C70A6-2DA0-4027-B90E-B1A40755A8A5} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{25C91A4E-BA4E-467A-85CD-8B62545BF674} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{6AB6A2D6-F859-4A82-9184-0BD29C9F07D1} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
-		{B1234567-1234-1234-1234-123456789ABC} = {A50C70A6-2DA0-4027-B90E-B1A40755A8A5}
 		{212AD910-8488-4036-BE20-326931B75FB2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{7AC943C9-52E8-44CF-9083-744D8049667B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{54A93AF7-60C7-4F6C-99D2-FBB1F75F853A} = {7AC943C9-52E8-44CF-9083-744D8049667B}
@@ -2935,7 +2904,7 @@ Global
 		{C97D9A5D-206C-454E-997E-009E227D7F02} = {0F14491C-6369-4C45-AAA8-135814E66E6B}
 		{31D1C81D-765F-4446-AA62-E743F6325049} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{F05E590D-AD46-42BE-9C25-6A63ADD2E3EA} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
+		{E2D03E0F-7A75-4813-9F4B-D8763D43FD3A} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{B41B888C-7DB8-4747-B262-4062E05A230D} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{AB82E5DD-C32D-4F28-9746-2C780846188E} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{57175EC7-92A5-4C1E-8244-E3FBCA2A81DE} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
@@ -2964,7 +2933,7 @@ Global
 		{A663E672-B26D-4EC0-BEAB-FE2E424AC46F} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{8A08D663-4995-40E3-B42C-3F910625F284} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{923DF87C-CA99-4D1C-B1D2-959174E95BFA} = {322566EF-20DC-43A6-B9F8-616AF942579A}
-		{D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
+		{D5E42C63-57C5-4EF6-AECE-1E2FCA725B77} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{D962A009-834F-4EEC-AABB-430DF8F98E39} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{9873BA05-4C41-4819-9283-CF45D795431B} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{FC373B24-3293-453C-AAF5-CF2909DCEE6A} = {9873BA05-4C41-4819-9283-CF45D795431B}
@@ -2975,11 +2944,12 @@ Global
 		{9EBAA524-0EDA-470B-95D4-39383285CBB2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{500DED3E-CFB5-4ED5-ACC6-02B3D6DC336D} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{D095BE44-1F2E-463E-A494-121892A75EA2} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
-		{90F9FA90-2C20-4004-96E6-F3B78151F5A5} = {B9617A31-0F0A-4397-851D-BF2FBEE32D7F}
+		{90F9FA90-2C20-4004-96E6-F3B78151F5A5} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{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}
 		{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}
 		{B9420661-B0E4-4241-ABD4-4A27A1F64250} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
@@ -2987,8 +2957,8 @@ Global
 		{D949EC7D-48A9-4279-95D5-078E7FD1F048} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{3BAF9C81-A194-4925-A035-5E24A5D1E542} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{6B04803D-B418-4833-A67E-B0FC966636A5} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{3940AD4D-F748-4BE4-9083-85769CD553EF} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{F8FFFC12-A31A-4AFA-B3DF-14DCF42B5E38} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
+		{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}
 		{799A50D8-DE89-4ED1-8FF8-AD5A9ED8C0CA} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
 		{9D52FD25-EF90-4F9A-A015-91EFC5DAF54F} = {AB82E5DD-C32D-4F28-9746-2C780846188E}
@@ -2996,6 +2966,8 @@ Global
 		{02DD46D3-F761-47D9-8894-2D6DA0124650} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{8E23E173-7127-4A5F-9F93-3049F2B68047} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{DFF88D16-D36F-40A4-A955-CDCAA76EF7B8} = {538ED0BB-B863-4B20-98CC-BCDF7FA0B68A}
+		{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
+		{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
@@ -3005,7 +2977,7 @@ Global
 		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
-		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
@@ -3013,7 +2985,7 @@ Global
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
-		{66614C26-314C-4B91-9071-76133422CFEF} = {BFFB607F-7C78-434B-86B9-DA4C8196A1B5}
+		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
@@ -3043,6 +3015,8 @@ Global
 		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
+		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
@@ -3051,49 +3025,28 @@ Global
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{4382A954-179A-4078-92AF-715187DFFF50} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {1C48CD47-D610-463A-A53C-AF82DD6C47E7}
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {8131151D-B0E9-4E18-84A5-E5F946C4480A}
+		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
+		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {66E1534A-1587-42B2-912F-45C994D32904}
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 		{9E0CBC06-F29A-4810-B93C-97D53863B95E} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{F6088A11-1C9E-4420-AA90-CF7E78DD7F1C} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{47B0678C-806B-4FE1-9F50-46BA88989532} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{61CBF221-9452-4934-B685-146285E080D7} = {2F305555-C296-497E-AC20-5FA1B237996A}
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{24133F7F-C1D1-DE04-EFA8-F5D5467FE027} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{0E556541-6A45-42CB-AE49-EE5A9BE05E7C} = {6C7F47CC-2151-44A3-A546-41C70025132C}
-		{27D9CB3A-46D1-402C-9273-F88CB8AC42F7} = {9873BA05-4C41-4819-9283-CF45D795431B}
-		{B9617A31-0F0A-4397-851D-BF2FBEE32D7F} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
-		{1C48CD47-D610-463A-A53C-AF82DD6C47E7} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
-		{D9BD324E-1D80-44AA-8E7B-73EB00944434} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
-		{8EF25507-2575-4ADE-BF7E-D23376903AB8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{070AC093-C9F2-20AD-0BCD-F318FC2761EA} = {B1234567-1234-1234-1234-123456789ABC}
-		{2C318EC3-BA86-4372-B1BC-DB0F33C208B2} = {322566EF-20DC-43A6-B9F8-616AF942579A}
-		{BFFB607F-7C78-434B-86B9-DA4C8196A1B5} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
-		{66E1534A-1587-42B2-912F-45C994D32904} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{E885E71F-0B34-4A03-B13B-20F4E05E90BB} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
-		{264B412F-DB8B-4CF8-A74B-96998B183045} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
-		{3527BF37-DFC5-4309-A032-29278CA21328} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
-		{6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704} = {2F305555-C296-497E-AC20-5FA1B237996A}
-		{68328142-5B31-4715-BCBB-7B6345EE0971} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
-		{4122388B-59E4-CDB0-0338-EA6881DF86F0} = {27D9CB3A-46D1-402C-9273-F88CB8AC42F7}
-		{988C9FAF-5AEC-EB15-578D-FED0DF52BF55} = {27D9CB3A-46D1-402C-9273-F88CB8AC42F7}
-		{6748A29D-DA6A-033A-825B-752295FF6AA0} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{6EABCF9A-6526-441F-932F-658B1DC3E403} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{69D76A76-6EF6-4846-94CD-EAAF0CAC9F15} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{9BAFFC28-E1EF-4C14-A101-EEBFC0A50D83} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{F93C2817-C846-4259-84D8-B39A6B57C8DE} = {3527BF37-DFC5-4309-A032-29278CA21328}
-		{8131151D-B0E9-4E18-84A5-E5F946C4480A} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
+		{9D3F3793-EFE3-4525-8782-238015DABA62} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
+		{0A4D5CD7-C03D-63C6-E1C5-A8CB1BB4FD80} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{840455DF-5634-51BB-D937-9D7D32F0B0C2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/devdocs/UITests.md

@@ -68,7 +68,7 @@ The PowerToys UI test pipeline provides flexible options for building and testin
 - Pipeline: https://microsoft.visualstudio.com/Dart/_build?definitionId=161438&_a=summary
 
 ## How to add the first UI tests for your modules
-- Follow the naming convention: ![{ModuleFolder}/Tests/{ModuleName}-{TestType(Fuzz/UI/Unit)}Tests](images/uitests/naming.png)
+
 - Create a new project and add the following references to the project file. Change the OutputPath to your own module's path.
   ```
     <Project Sdk="Microsoft.NET.Sdk">

doc/devdocs/core/installer.md

@@ -87,13 +87,6 @@
 
 ### Building PowerToys Locally
 
-#### One stop script for building installer
-1. Open developer powershell for vs 2022
-2. Run tools\build\build-installer.ps1
-> For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.
-
-The following manual steps will not install the MSIX apps (such as Command Palette) on your local installer.
-
 #### Prerequisites for building the MSI installer
 
 1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).

doc/devdocs/development/test-winget-install-locally.md

@@ -1,33 +0,0 @@
-## If for any reason, you'd like to test winget install scenario, you can follow this doc:
-
-### Powertoys winget manifest definition:
-[winget repository](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys)
-
-### How to test a winget installation locally:
-1. Get artifacts from release CI pipeline  Pipelines - Runs for PowerToys Signed YAML Release Build, or you can build one yourself by execute the 
- 'tools\build\build-installer.ps1' script
-
-2. Get the artifact hash, this is required to define winget manifest
-```powershell
-cd /path/to/your/directory/contains/installer
-Get-FileHash -Path ".\<Installer-name>.exe" -Algorithm SHA256
-```
- 3.  Host your installer.exe - Attention: staged github release artifacts or artifacts in release pipeline is not OK in this step
-You can self-host it or you can upload to a publicly available endpoint  
-**How to selfhost it** (A extremely simple way):
-```powershell
-python -m http.server 8000
-```
-
-4. Download a version folder from wingetpkgs like: [version 0.92.1](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys/0.92.1)
-and you get **a folder contains 3 yml files**
->note: Do not put any files other than these three in this folder
-
-5. Modify the yml files based on your version and the self hosted artifact link, and modify the sha256 hash for the installer you'd like to use
-
-6. Start winget install:
-```powershell
-#execute as admin
-winget settings --enable LocalManifestFiles
-winget install --manifest "<folder_path_of_manifest_files>" --architecture x64 --scope user
-```

doc/devdocs/readme.md

@@ -67,7 +67,10 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 - When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
 - When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
 - Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
-- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
+- We don't close issues automatically when referenced in a PR, so after the PR is merged:
+  - mark the issue(s) that the PR solved with the `Resolution-Fix-Committed` label, remove the `In progress` label and if the issue is assigned to a project, move the item to the `Done` status.
+  - don't close the issue if it's a bug in the current released version; since users tend to not search for closed issues, we will close the resolved issues when a new version is released.
+  - if it's not a code fix that effects the end user, the issue can be closed (for example a fix in the build or a code refactoring and so on).
 
 ## Compiling PowerToys
 

src/common/UITestAutomation/Element/ComboBox.cs

@@ -24,16 +24,5 @@ namespace Microsoft.PowerToys.UITest
         {
             this.Find<NavigationViewItem>(value).Click();
         }
-
-        /// <summary>
-        /// Select a text item from the ComboBox.
-        /// </summary>
-        /// <param name="value">The text to select from the ComboBox.</param>
-        public void SelectTxt(string value)
-        {
-            this.Click(); // First click to expand the ComboBox
-            Thread.Sleep(100); // Wait for the dropdown to appear
-            this.Find<Element>(value).Click(); // Find and click the text item using basic Element type
-        }
     }
 }

src/common/UITestAutomation/Element/Element.cs

@@ -364,7 +364,7 @@ namespace Microsoft.PowerToys.UITest
         /// Save UI Element to a PNG file.
         /// </summary>
         /// <param name="path">the full path</param>
-        public void SaveToPngFile(string path)
+        internal void SaveToPngFile(string path)
         {
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method SaveToPngFile with parameter: path = {path}");
             this.windowsElement.GetScreenshot().SaveAsFile(path);

src/common/UITestAutomation/Element/RadioButton.cs

@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Represents a radio button UI element in the application.
-    /// </summary>
-    public class RadioButton : Element
-    {
-        private static readonly string ExpectedControlType = "ControlType.RadioButton";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioButton"/> class.
-        /// </summary>
-        public RadioButton()
-        {
-            this.TargetControlType = RadioButton.ExpectedControlType;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the RadioButton is selected.
-        /// </summary>
-        public bool IsSelected => this.Selected;
-
-        /// <summary>
-        /// Select the RadioButton.
-        /// </summary>
-        public void Select()
-        {
-            if (!this.IsSelected)
-            {
-                this.Click();
-            }
-        }
-    }
-}

src/common/UITestAutomation/SessionHelper.cs

@@ -91,12 +91,15 @@ namespace Microsoft.PowerToys.UITest
         }
 
         /// <summary>
-        /// Exit a exe by Name.
+        /// Exit a exe.
         /// </summary>
-        /// <param name="processName">The path to the application executable.</param>
-        public void ExitExeByName(string processName)
+        /// <param name="appPath">The path to the application executable.</param>
+        public void ExitExe(string appPath)
         {
-            Process[] processes = Process.GetProcessesByName(processName);
+            // Exit Exe
+            string exeName = Path.GetFileNameWithoutExtension(appPath);
+
+            Process[] processes = Process.GetProcessesByName(exeName);
             foreach (Process process in processes)
             {
                 try
@@ -111,18 +114,6 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
-        /// <summary>
-        /// Exit a exe.
-        /// </summary>
-        /// <param name="appPath">The path to the application executable.</param>
-        public void ExitExe(string appPath)
-        {
-            // Exit Exe
-            string exeName = Path.GetFileNameWithoutExtension(appPath);
-
-            ExitExeByName(exeName);
-        }
-
         /// <summary>
         /// Starts a new exe and takes control of it.
         /// </summary>
@@ -131,34 +122,26 @@ namespace Microsoft.PowerToys.UITest
         public void StartExe(string appPath, string[]? args = null)
         {
             var opts = new AppiumOptions();
+            opts.AddAdditionalCapability("app", appPath);
 
-            if (scope == PowerToysModule.PowerToysSettings)
+            if (args != null && args.Length > 0)
             {
-                TryLaunchPowerToysSettings(opts);
-            }
-            else
-            {
-                opts.AddAdditionalCapability("app", appPath);
-
-                if (args != null && args.Length > 0)
+                // Build command line arguments string
+                string argsString = string.Join(" ", args.Select(arg =>
                 {
-                    // Build command line arguments string
-                    string argsString = string.Join(" ", args.Select(arg =>
+                    // Quote arguments that contain spaces
+                    if (arg.Contains(' '))
                     {
-                        // Quote arguments that contain spaces
-                        if (arg.Contains(' '))
-                        {
-                            return $"\"{arg}\"";
-                        }
+                        return $"\"{arg}\"";
+                    }
 
-                        return arg;
-                    }));
+                    return arg;
+                }));
 
-                    opts.AddAdditionalCapability("appArguments", argsString);
-                }
+                opts.AddAdditionalCapability("appArguments", argsString);
             }
 
-            Driver = NewWindowsDriver(opts);
+            this.Driver = NewWindowsDriver(opts);
         }
 
         private void TryLaunchPowerToysSettings(AppiumOptions opts)
@@ -167,18 +150,15 @@ namespace Microsoft.PowerToys.UITest
 
             var runnerProcessInfo = new ProcessStartInfo
             {
-                FileName = locationPath + runnerPath,
+                FileName = locationPath + this.runnerPath,
                 Verb = "runas",
                 Arguments = "--open-settings",
             };
 
-            ExitExe(runnerProcessInfo.FileName);
-            runner = Process.Start(runnerProcessInfo);
+            this.ExitExe(runnerProcessInfo.FileName);
+            this.runner = Process.Start(runnerProcessInfo);
             Thread.Sleep(5000);
 
-            // Exit CmdPal UI before launching new process if use installer for test
-            ExitExeByName("Microsoft.CmdPal.UI");
-
             if (root != null)
             {
                 const int maxRetries = 5;
@@ -188,7 +168,7 @@ namespace Microsoft.PowerToys.UITest
                 for (int attempt = 1; attempt <= maxRetries; attempt++)
                 {
                     var settingsWindow = ApiHelper.FindDesktopWindowHandler(
-                        [windowName, AdministratorPrefix + windowName]);
+                        new[] { windowName, AdministratorPrefix + windowName });
 
                     if (settingsWindow.Count > 0)
                     {

src/common/UITestAutomation/UITestBase.cs

@@ -22,8 +22,6 @@ namespace Microsoft.PowerToys.UITest
 
         public bool IsInPipeline { get; }
 
-        public string? ScreenshotDirectory { get; set; }
-
         public static MonitorInfoData.ParamsWrapper MonitorInfoData { get; set; } = new MonitorInfoData.ParamsWrapper() { Monitors = new List<MonitorInfoData.MonitorInfoDataWrapper>() };
 
         private readonly PowerToysModule scope;
@@ -31,6 +29,7 @@ namespace Microsoft.PowerToys.UITest
         private readonly string[]? commandLineArgs;
         private SessionHelper? sessionHelper;
         private System.Threading.Timer? screenshotTimer;
+        private string? screenshotDirectory;
 
         public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified, string[]? commandLineArgs = null)
         {
@@ -59,11 +58,11 @@ namespace Microsoft.PowerToys.UITest
             CloseOtherApplications();
             if (IsInPipeline)
             {
-                ScreenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
-                Directory.CreateDirectory(ScreenshotDirectory);
+                screenshotDirectory = Path.Combine(this.TestContext.TestResultsDirectory ?? string.Empty, "UITestScreenshots_" + Guid.NewGuid().ToString());
+                Directory.CreateDirectory(screenshotDirectory);
 
                 // Take screenshot every 1 second
-                screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, ScreenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
+                screenshotTimer = new System.Threading.Timer(ScreenCapture.TimerCallback, screenshotDirectory, TimeSpan.Zero, TimeSpan.FromMilliseconds(1000));
 
                 // Escape Popups before starting
                 System.Windows.Forms.SendKeys.SendWait("{ESC}");
@@ -416,9 +415,9 @@ namespace Microsoft.PowerToys.UITest
 
         protected void AddScreenShotsToTestResultsDirectory()
         {
-            if (ScreenshotDirectory != null)
+            if (screenshotDirectory != null)
             {
-                foreach (string file in Directory.GetFiles(ScreenshotDirectory))
+                foreach (string file in Directory.GetFiles(screenshotDirectory))
                 {
                     this.TestContext.AddResultFile(file);
                 }
@@ -628,23 +627,6 @@ namespace Microsoft.PowerToys.UITest
                     Console.WriteLine($"Failed to change display resolution. Error code: {result}");
                 }
             }
-
-            // Windows API for moving windows
-            [DllImport("user32.dll")]
-            private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags);
-
-            private const uint SWPNOSIZE = 0x0001;
-            private const uint SWPNOZORDER = 0x0004;
-
-            public static void MoveWindow(Element window, int x, int y)
-            {
-                var windowHandle = IntPtr.Parse(window.GetAttribute("NativeWindowHandle") ?? "0", System.Globalization.CultureInfo.InvariantCulture);
-                if (windowHandle != IntPtr.Zero)
-                {
-                    SetWindowPos(windowHandle, IntPtr.Zero, x, y, 0, 0, SWPNOSIZE | SWPNOZORDER);
-                    Task.Delay(500).Wait();
-                }
-            }
         }
     }
 }

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

@@ -7,7 +7,6 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UnitTestsCommonLib</RootNamespace>
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-    <ProjectName>Common.Lib.UnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPaste-UITests.csproj

@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-
-	<PropertyGroup>
-		<ProjectGuid>{2B1505FA-132A-460B-B22B-7CC3FFAB0C5D}</ProjectGuid>
-		<RootNamespace>Microsoft.AdvancedPaste.UITests</RootNamespace>
-		<IsPackable>false</IsPackable>
-		<Nullable>enable</Nullable>
-		<OutputType>Library</OutputType>
-
-		<!-- This is a UI test, so don't run as part of MSBuild -->
-		<RunVSTest>false</RunVSTest>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\UITests-AdvancedPaste\</OutputPath>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Appium.WebDriver" />
-		<PackageReference Include="MSTest" />
-		<PackageReference Include="System.Net.Http" />
-		<PackageReference Include="System.Private.Uri" />
-		<PackageReference Include="System.Text.RegularExpressions" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Include="TestFiles\**\*.*">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
-</Project>

src/modules/AdvancedPaste/UITest-AdvancedPaste/AdvancedPasteUITest.cs

@@ -1,791 +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.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Windows.Forms;
-
-using Microsoft.AdvancedPaste.UITests.Helper;
-using Microsoft.CodeCoverage.Core.Reports.Coverage;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium;
-using Windows.ApplicationModel.DataTransfer;
-using static System.Net.Mime.MediaTypeNames;
-using static System.Resources.ResXFileRef;
-using static System.Runtime.InteropServices.JavaScript.JSType;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip;
-
-namespace Microsoft.AdvancedPaste.UITests
-{
-    [TestClass]
-    public class AdvancedPasteUITest : UITestBase
-    {
-        private readonly string testFilesFolderPath;
-        private readonly string tempRTFFileName = "TempFile.rtf";
-        private readonly string pasteAsPlainTextRawFileName = "PasteAsPlainTextFileRaw.rtf";
-        private readonly string pasteAsPlainTextPlainFileName = "PasteAsPlainTextFilePlain.rtf";
-        private readonly string pasteAsPlainTextPlainNoRepeatFileName = "PasteAsPlainTextFilePlainNoRepeat.rtf";
-        private readonly string wordpadPath = @"C:\Program Files\wordpad\wordpad.exe";
-
-        private readonly string tempTxtFileName = "TempFile.txt";
-        private readonly string pasteAsMarkdownSrcFile = "PasteAsMarkdownFile.html";
-        private readonly string pasteAsMarkdownResultFile = "PasteAsMarkdownResultFile.txt";
-
-        private readonly string pasteAsJsonFileName = "PasteAsJsonFile.xml";
-        private readonly string pasteAsJsonResultFile = "PasteAsJsonResultFile.txt";
-
-        private bool _notepadSettingsChanged;
-
-        // Static constructor - runs before any instance is created
-        static AdvancedPasteUITest()
-        {
-            // Using the predefined settings.
-            // paste as plain text: win + ctrl + alt + o
-            // paste as markdown text: win + ctrl + alt + m
-            // paste as json text: win + ctrl + alt + j
-            CopySettingsFileBeforeTests();
-        }
-
-        public AdvancedPasteUITest()
-            : base(PowerToysModule.PowerToysSettings, size: WindowSize.Small)
-        {
-            Type currentTestType = typeof(AdvancedPasteUITest);
-            string? dirName = Path.GetDirectoryName(currentTestType.Assembly.Location);
-            Assert.IsNotNull(dirName, "Failed to get directory name of the current test assembly.");
-
-            string testFilesFolder = Path.Combine(dirName, "TestFiles");
-            Assert.IsTrue(Directory.Exists(testFilesFolder), $"Test files directory not found at: {testFilesFolder}");
-
-            testFilesFolderPath = testFilesFolder;
-
-            // ignore the notepad settings in pipeline
-            _notepadSettingsChanged = true;
-        }
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            Session.CloseMainWindow();
-            SendKeys(Key.Win, Key.M);
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsPlainText")]
-        [Ignore("Temporarily disabled due to wordpad.exe is missing in pipeline.")]
-        public void TestCasePasteAsPlainText()
-        {
-            // Copy some rich text(e.g word of the text is different color, another work is bold, underlined, etd.).
-            // Paste the text using standard Windows Ctrl + V shortcut and ensure that rich text is pasted(with all colors, formatting, etc.)
-            DeleteAndCopyFile(pasteAsPlainTextRawFileName, tempRTFFileName);
-            ContentCopyAndPasteDirectly(tempRTFFileName, isRTF: true);
-
-            var resultWithFormatting = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempRTFFileName),
-                Path.Combine(testFilesFolderPath, pasteAsPlainTextRawFileName),
-                compareFormatting: true);
-
-            Assert.IsTrue(resultWithFormatting.IsConsistent, "RTF files should be identical including formatting");
-
-            // Paste the text using Paste As Plain Text activation shortcut and ensure that plain text without any formatting is pasted.
-            // Paste again the text using standard Windows Ctrl + V shortcut and ensure the text is now pasted plain without formatting as well.
-            DeleteAndCopyFile(pasteAsPlainTextRawFileName, tempRTFFileName);
-            ContentCopyAndPasteWithShortcutThenPasteAgain(tempRTFFileName, isRTF: true);
-            resultWithFormatting = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempRTFFileName),
-                Path.Combine(testFilesFolderPath, pasteAsPlainTextPlainFileName),
-                compareFormatting: true);
-            Assert.IsTrue(resultWithFormatting.IsConsistent, "RTF files should be identical without formatting");
-
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, click Paste as Plain Text button and confirm that plain text without any formatting is pasted.
-            DeleteAndCopyFile(pasteAsPlainTextRawFileName, tempRTFFileName);
-            ContentCopyAndPasteCase3(tempRTFFileName, isRTF: true);
-            resultWithFormatting = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempRTFFileName),
-                Path.Combine(testFilesFolderPath, pasteAsPlainTextPlainNoRepeatFileName),
-                compareFormatting: true);
-            Assert.IsTrue(resultWithFormatting.IsConsistent, "RTF files should be identical without formatting");
-
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, press Ctrl + 1 and confirm that plain text without any formatting is pasted.
-            DeleteAndCopyFile(pasteAsPlainTextRawFileName, tempRTFFileName);
-            ContentCopyAndPasteCase4(tempRTFFileName, isRTF: true);
-            resultWithFormatting = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempRTFFileName),
-                Path.Combine(testFilesFolderPath, pasteAsPlainTextPlainNoRepeatFileName),
-                compareFormatting: true);
-            Assert.IsTrue(resultWithFormatting.IsConsistent, "RTF files should be identical without formatting");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase1")]
-        public void TestCasePasteAsMarkdownCase1()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some text(e.g.some HTML text - convertible to Markdown)
-            // Paste the text using set hotkey and confirm that pasted text is converted to markdown
-            DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
-            ContentCopyAndPasteAsMarkdownCase1(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as markdown using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase2")]
-        public void TestCasePasteAsMarkdownCase2()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
-            // Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
-            DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
-            ContentCopyAndPasteAsMarkdownCase2(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as markdown using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsMarkdownCase3")]
-        public void TestCasePasteAsMarkdownCase3()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
-            // Open Advanced Paste window using hotkey, press Ctrl + 2 and confirm that pasted text is converted to markdown
-            DeleteAndCopyFile(pasteAsMarkdownSrcFile, tempTxtFileName);
-            ContentCopyAndPasteAsMarkdownCase3(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsMarkdownResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as markdown using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase1")]
-        public void TestCasePasteAsJSONCase1()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some XML or CSV text(or any other text, it will be converted to simple JSON object)
-            // Paste the text using set hotkey and confirm that pasted text is converted to JSON
-            DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
-            ContentCopyAndPasteAsJsonCase1(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as Json using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase2")]
-        public void TestCasePasteAsJSONCase2()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
-            // Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
-            DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
-            ContentCopyAndPasteAsJsonCase2(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as Json using shortcut failed.");
-        }
-
-        [TestMethod]
-        [TestCategory("AdvancedPasteUITest")]
-        [TestCategory("PasteAsJSONCase3")]
-        public void TestCasePasteAsJSONCase3()
-        {
-            if (_notepadSettingsChanged == false)
-            {
-                ChangeNotePadSettings();
-            }
-
-            // Copy some text(same as in the previous step or different.If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
-            // Open Advanced Paste window using hotkey, press Ctrl + 3 and confirm that pasted text is converted to markdown
-            DeleteAndCopyFile(pasteAsJsonFileName, tempTxtFileName);
-            ContentCopyAndPasteAsJsonCase3(tempTxtFileName);
-            var result = FileReader.CompareRtfFiles(
-                Path.Combine(testFilesFolderPath, tempTxtFileName),
-                Path.Combine(testFilesFolderPath, pasteAsJsonResultFile),
-                compareFormatting: true);
-            Assert.IsTrue(result.IsConsistent, "Paste as Json using shortcut failed.");
-        }
-
-        /*
-         * Clipboard History
-           - [] Open Settings and Enable clipboard history (if not enabled already). Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry. Check OS clipboard history (Win+V), and confirm that the same entry no longer exist.
-           - [] Open Advanced Paste window with hotkey, click Clipboard history, and click any entry (but first). Observe that entry is put on top of clipboard history. Check OS clipboard history (Win+V), and confirm that the same entry is on top of the clipboard.
-           - [] Open Settings and Disable clipboard history. Open Advanced Paste window with hotkey and observe that Clipboard history button is disabled.
-         * Disable Advanced Paste, try different Advanced Paste hotkeys and confirm that it's disabled and nothing happens.
-         */
-        private void TestCaseClipboardHistory()
-        {
-        }
-
-        private void ContentCopyAndPasteDirectly(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.V);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Backspace);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            process.Kill(true);
-        }
-
-        private void ContentCopyAndPasteWithShortcutThenPasteAgain(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Win, Key.LCtrl, Key.Alt, Key.O);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.V);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            process.Kill(true);
-        }
-
-        private void ContentCopyAndPasteCase3(string fileName, bool isRTF = false)
-        {
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, click Paste as Plain Text button and confirm that plain text without any formatting is pasted.
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
-
-            // Click Paste as Plain Text button and confirm that plain text without any formatting is pasted.
-            var apWind = this.Find<Window>("Advanced Paste", global: true);
-            apWind.Find<TextBlock>("Paste as plain text").Click();
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            process.Kill(true);
-        }
-
-        private void ContentCopyAndPasteCase4(string fileName, bool isRTF = false)
-        {
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, press Ctrl + 1 and confirm that plain text without any formatting is pasted.
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(1000);
-
-            // press Ctrl + 1 and confirm that plain text without any formatting is pasted.
-            this.SendKeys(Key.LCtrl, Key.Num1);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            process.Kill(true);
-        }
-
-        private void ContentCopyAndPasteAsMarkdownCase1(string fileName, bool isRTF = false)
-        {
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, press Ctrl + 1 and confirm that plain text without any formatting is pasted.
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.Win, Key.LCtrl, Key.Alt, Key.M);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private void ContentCopyAndPasteAsMarkdownCase2(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
-
-            // click Paste as markdown button and confirm that pasted text is converted to markdown
-            var apWind = this.Find<Window>("Advanced Paste", global: true);
-            apWind.Find<TextBlock>("Paste as markdown").Click();
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private void ContentCopyAndPasteAsMarkdownCase3(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
-
-            this.SendKeys(Key.LCtrl, Key.Num2);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private void ContentCopyAndPasteAsJsonCase1(string fileName, bool isRTF = false)
-        {
-            // Copy some rich text again.
-            // Open Advanced Paste window using hotkey, press Ctrl + 1 and confirm that plain text without any formatting is pasted.
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.Win, Key.LCtrl, Key.Alt, Key.J);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private void ContentCopyAndPasteAsJsonCase2(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
-
-            // click Paste as markdown button and confirm that pasted text is converted to markdown
-            var apWind = this.Find<Window>("Advanced Paste", global: true);
-            apWind.Find<TextBlock>("Paste as JSON").Click();
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private void ContentCopyAndPasteAsJsonCase3(string fileName, bool isRTF = false)
-        {
-            string tempFile = Path.Combine(testFilesFolderPath, fileName);
-
-            Process process = Process.Start(isRTF ? wordpadPath : "notepad.exe", tempFile);
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start {(isRTF ? "WordPad" : "Notepad")}.");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle(Path.GetFileName(tempFile), isRTF);
-
-            window.Click();
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.A);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.LCtrl, Key.C);
-            Thread.Sleep(1000);
-            this.SendKeys(Key.Delete);
-            Thread.Sleep(1000);
-
-            // Open Advanced Paste window using hotkey
-            this.SendKeys(Key.Win, Key.Shift, Key.V);
-            Thread.Sleep(15000);
-
-            this.SendKeys(Key.LCtrl, Key.Num3);
-            Thread.Sleep(1000);
-
-            this.SendKeys(Key.LCtrl, Key.S);
-            Thread.Sleep(1000);
-
-            window.Close();
-        }
-
-        private string DeleteAndCopyFile(string sourceFileName, string destinationFileName)
-        {
-            string sourcePath = Path.Combine(testFilesFolderPath, sourceFileName);
-            string destinationPath = Path.Combine(testFilesFolderPath, destinationFileName);
-
-            // Check if source file exists
-            if (!File.Exists(sourcePath))
-            {
-                throw new FileNotFoundException($"Source file not found: {sourcePath}");
-            }
-
-            // Delete destination file if it exists
-            if (File.Exists(destinationPath))
-            {
-                try
-                {
-                    File.Delete(destinationPath);
-                }
-                catch (IOException ex)
-                {
-                    throw new IOException($"Failed to delete file {destinationPath}. The file may be in use: {ex.Message}", ex);
-                }
-            }
-
-            // Copy the source file to the destination
-            try
-            {
-                File.Copy(sourcePath, destinationPath);
-            }
-            catch (IOException ex)
-            {
-                throw new IOException($"Failed to copy file from {sourcePath} to {destinationPath}: {ex.Message}", ex);
-            }
-
-            return destinationPath;
-        }
-
-        private void ChangeNotePadSettings()
-        {
-            Process process = Process.Start("notepad.exe");
-            if (process == null)
-            {
-                throw new InvalidOperationException($"Failed to start Notepad.exe");
-            }
-
-            Thread.Sleep(15000);
-
-            var window = FindWindowWithFlexibleTitle("Untitled", false);
-
-            window.Find<PowerToys.UITest.Button>("Settings").Click();
-            var combobox = window.Find<PowerToys.UITest.ComboBox>("Opening files");
-            combobox.SelectTxt("Open in a new window");
-
-            window.Find<Group>("When Notepad starts").Click();
-
-            window.Find<PowerToys.UITest.RadioButton>("Open a new window").Select();
-
-            _notepadSettingsChanged = true;
-            window.Close();
-        }
-
-        /// <summary>
-        /// Finds a window with flexible title matching, trying multiple title variations
-        /// </summary>
-        /// <param name="baseTitle">The base title to search for</param>
-        /// <param name="isRTF">Whether the window is a WordPad window</param>
-        /// <returns>The found Window element or throws an exception if not found</returns>
-        private Window FindWindowWithFlexibleTitle(string baseTitle, bool isRTF)
-        {
-            Window? window = null;
-            string appType = isRTF ? "WordPad" : "Notepad";
-
-            // Try different title variations
-            string[] titleVariations = new string[]
-            {
-                baseTitle + (isRTF ? " - WordPad" : " - Notepad"),  // With suffix
-                baseTitle,                                          // Without suffix
-                Path.GetFileNameWithoutExtension(baseTitle) + (isRTF ? " - WordPad" : " - Notepad"),  // Without extension, with suffix
-                Path.GetFileNameWithoutExtension(baseTitle),        // Without extension, without suffix
-            };
-
-            Exception? lastException = null;
-
-            foreach (string title in titleVariations)
-            {
-                try
-                {
-                    window = this.Find<Window>(title, global: true);
-                    if (window != null)
-                    {
-                        return window;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // Save the exception, but continue trying other variations
-                    lastException = ex;
-                }
-            }
-
-            // If we couldn't find the window with any variation, throw an exception with details
-            throw new InvalidOperationException(
-                $"Failed to find {appType} window with title containing '{baseTitle}'. ");
-        }
-
-        private static void CopySettingsFileBeforeTests()
-        {
-            try
-            {
-                // Determine the assembly location and test files path
-                string? assemblyLocation = Path.GetDirectoryName(typeof(AdvancedPasteUITest).Assembly.Location);
-                if (assemblyLocation == null)
-                {
-                    Debug.WriteLine("ERROR: Failed to get assembly location");
-                    return;
-                }
-
-                string testFilesFolder = Path.Combine(assemblyLocation, "TestFiles");
-                if (!Directory.Exists(testFilesFolder))
-                {
-                    Debug.WriteLine($"ERROR: Test files directory not found at: {testFilesFolder}");
-                    return;
-                }
-
-                // Settings file source path
-                string settingsFileName = "settings.json";
-                string sourceSettingsPath = Path.Combine(testFilesFolder, settingsFileName);
-
-                // Make sure the source file exists
-                if (!File.Exists(sourceSettingsPath))
-                {
-                    Debug.WriteLine($"ERROR: Settings file not found at: {sourceSettingsPath}");
-                    return;
-                }
-
-                // Determine the target directory in %LOCALAPPDATA%
-                string targetDirectory = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "Microsoft",
-                    "PowerToys",
-                    "AdvancedPaste");
-
-                // Create the directory if it doesn't exist
-                if (!Directory.Exists(targetDirectory))
-                {
-                    Directory.CreateDirectory(targetDirectory);
-                }
-
-                string targetSettingsPath = Path.Combine(targetDirectory, settingsFileName);
-
-                // Copy the file and overwrite if it exists
-                File.Copy(sourceSettingsPath, targetSettingsPath, true);
-
-                Debug.WriteLine($"Successfully copied settings file from {sourceSettingsPath} to {targetSettingsPath}");
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"ERROR copying settings file: {ex.Message}");
-            }
-        }
-    }
-}

src/modules/AdvancedPaste/UITest-AdvancedPaste/Helper/FileReader.cs

@@ -1,85 +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.IO;
-using System.Text;
-using System.Windows.Forms;
-
-namespace Microsoft.AdvancedPaste.UITests.Helper;
-
-public class FileReader
-{
-    public static string ReadContent(string filePath)
-    {
-        try
-        {
-            return File.ReadAllText(filePath);
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException($"Failed to read file: {ex.Message}", ex);
-        }
-    }
-
-    public static string ReadRTFPlainText(string filePath)
-    {
-        try
-        {
-            using (var rtb = new System.Windows.Forms.RichTextBox())
-            {
-                rtb.Rtf = File.ReadAllText(filePath);
-                return rtb.Text;
-            }
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException($"Failed to read plain text from file: {ex.Message}", ex);
-        }
-    }
-
-    /// <summary>
-    /// Compares the contents of two RTF files to check if they are consistent.
-    /// </summary>
-    /// <param name="firstFilePath">Path to the first RTF file</param>
-    /// <param name="secondFilePath">Path to the second RTF file</param>
-    /// <param name="compareFormatting">If true, compares the raw RTF content (including formatting).
-    /// If false, compares only the plain text content.</param>
-    /// <returns>
-    /// A tuple containing: (bool isConsistent, string firstContent, string secondContent)
-    /// - isConsistent: true if the files are consistent according to the comparison method
-    /// - firstContent: the content of the first file
-    /// - secondContent: the content of the second file
-    /// </returns>
-    public static (bool IsConsistent, string FirstContent, string SecondContent) CompareRtfFiles(
-        string firstFilePath,
-        string secondFilePath,
-        bool compareFormatting = false)
-    {
-        try
-        {
-            string firstContent, secondContent;
-
-            if (compareFormatting)
-            {
-                // Compare raw RTF content (including formatting)
-                firstContent = ReadContent(firstFilePath);
-                secondContent = ReadContent(secondFilePath);
-            }
-            else
-            {
-                // Compare only the plain text content
-                firstContent = ReadRTFPlainText(firstFilePath);
-                secondContent = ReadRTFPlainText(secondFilePath);
-            }
-
-            bool isConsistent = string.Equals(firstContent, secondContent, StringComparison.Ordinal);
-            return (isConsistent, firstContent, secondContent);
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException($"Failed to compare RTF files: {ex.Message}", ex);
-        }
-    }
-}

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/PasteAsJsonFile.xml

@@ -1,6 +0,0 @@
-<note>
-    <to>Tove</to>
-    <from>Jani</from>
-    <heading>Reminder</heading>
-    <body>Don't forget me this weekend!</body>
-</note>

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/PasteAsJsonResultFile.txt

@@ -1,8 +0,0 @@
-{
-  "note": {
-    "to": "Tove",
-    "from": "Jani",
-    "heading": "Reminder",
-    "body": "Don't forget me this weekend!"
-  }
-}

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/PasteAsMarkdownFile.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<body>
-
-    <h2 title="I'm a header">The title Attribute</h2>
-
-    <p title="I'm a tooltip">Mouse over this paragraph, to display the title attribute as a tooltip.</p>
-
-</body>
-
-</html>

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/PasteAsMarkdownResultFile.txt

@@ -1,3 +0,0 @@
-## The title Attribute
- 
-Mouse over this paragraph, to display the title attribute as a tooltip.

src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json

@@ -1 +0,0 @@
-{"properties":{"IsAdvancedAIEnabled":{"value":false},"ShowCustomPreview":{"value":true},"CloseAfterLosingFocus":{"value":false},"advanced-paste-ui-hotkey":{"win":true,"ctrl":false,"alt":false,"shift":true,"code":86,"key":""},"paste-as-plain-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":79,"key":""},"paste-as-markdown-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":77,"key":""},"paste-as-json-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":74,"key":""},"custom-actions":{"value":[]},"additional-actions":{"image-to-text":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-file":{"isShown":true,"paste-as-txt-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-png-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-html-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}},"transcode":{"isShown":true,"transcode-to-mp3":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"transcode-to-mp4":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}}}},"name":"AdvancedPaste","version":"1"}

src/modules/AdvancedPaste/UITest-AdvancedPaste/UITestAdvancedPaste.md

@@ -1,41 +0,0 @@
-## [Advanced Paste](tests-checklist-template-advanced-paste-section.md)
-  NOTES:
-    When using Advanced Paste, make sure that window focused while starting/using Advanced paste is text editor or has text input field focused (e.g. Word).
- * Paste As Plain Text
-   - [x] Copy some rich text (e.g word of the text is different color, another work is bold, underlined, etd.).
-   - [x] Paste the text using standard Windows Ctrl + V shortcut and ensure that rich text is pasted (with all colors, formatting, etc.)
-   - [x] Paste the text using Paste As Plain Text activation shortcut and ensure that plain text without any formatting is pasted.
-   - [x] Paste again the text using standard Windows Ctrl + V shortcut and ensure the text is now pasted plain without formatting as well.
-   - [x] Copy some rich text again.
-   - [x] Open Advanced Paste window using hotkey, click Paste as Plain Text button and confirm that plain text without any formatting is pasted.
-   - [x] Copy some rich text again.
-   - [x] Open Advanced Paste window using hotkey, press Ctrl + 1 and confirm that plain text without any formatting is pasted.
- * Paste As Markdown
-   - [] Open Settings and set Paste as Markdown directly hotkey
-   - [x] Copy some text (e.g. some HTML text - convertible to Markdown)
-   - [x] Paste the text using set hotkey and confirm that pasted text is converted to markdown
-   - [x] Copy some text (same as in the previous step or different. If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
-   - [x] Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
-   - [x] Copy some text (same as in the previous step or different. If nothing is coppied between steps, previously pasted Markdown text will be picked up from clipboard and converted again to nested Markdown).
-   - [x] Open Advanced Paste window using hotkey, press Ctrl + 2 and confirm that pasted text is converted to markdown
- * Paste As JSON
-   - [] Open Settings and set Paste as JSON directly hotkey
-   - [x] Copy some XML or CSV text (or any other text, it will be converted to simple JSON object)
-   - [x] Paste the text using set hotkey and confirm that pasted text is converted to JSON
-   - [x] Copy some text (same as in the previous step or different. If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
-   - [x] Open Advanced Paste window using hotkey, click Paste as markdown button and confirm that pasted text is converted to markdown
-   - [x] Copy some text (same as in the previous step or different. If nothing is coppied between steps, previously pasted JSON text will be picked up from clipboard and converted again to nested JSON).
-   - [x] Open Advanced Paste window using hotkey, press Ctrl + 3 and confirm that pasted text is converted to markdown
- * Paste as custom format using AI
-   - [] Open Settings, navigate to Enable Paste with AI and set OpenAI key.
-   - [] Copy some text to clipboard. Any text.
-   - [] Open Advanced Paste window using hotkey, and confirm that Custom intput text box is now enabled. Write "Insert smiley after every word" and press Enter. Observe that result preview shows coppied text with smileys between words. Press Enter to paste the result and observe that it is pasted.
-   - [] Open Advanced Paste window using hotkey. Input some query (any, feel free to play around) and press Enter. When result is shown, click regenerate button, to see if new result is generated. Select one of the results and paste. Observe that correct result is pasted.
-   - [] Create few custom actions. Set up hotkey for custom actions and confirm they work. Enable/disable custom actions and confirm that the change is reflected in Advanced Paste UI - custom action is not listed. Try different ctrl + <num> in-app shortcuts for custom actions. Try moving custom actions up/down and confirm that the change is reflected in Advanced Paste UI.
-   - [] Open Settings and disable Custom format preview. Open Advanced Paste window with hotkey, enter some query and press enter. Observe that result is now pasted right away, without showing the preview first.
-   - [] Open Settings and Disable Enable Paste with AI. Open Advanced Paste window with hotkey and observe that Custom Input text box is now disabled.
- * Clipboard History
-   - [] Open Settings and Enable clipboard history (if not enabled already). Open Advanced Paste window with hotkey, click Clipboard history and try deleting some entry. Check OS clipboard history (Win+V), and confirm that the same entry no longer exist.
-   - [] Open Advanced Paste window with hotkey, click Clipboard history, and click any entry (but first). Observe that entry is put on top of clipboard history. Check OS clipboard history (Win+V), and confirm that the same entry is on top of the clipboard.
-   - [] Open Settings and Disable clipboard history. Open Advanced Paste window with hotkey and observe that Clipboard history button is disabled.
- * Disable Advanced Paste, try different Advanced Paste hotkeys and confirm that it's disabled and nothing happens.

src/modules/Hosts/Hosts.FuzzTests/OneFuzzConfig.json

@@ -4,8 +4,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv4",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -35,8 +35,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -45,8 +45,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidIPv6",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -76,8 +76,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -86,8 +86,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzValidHosts",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -117,8 +117,8 @@
         // the DLL and PDB files
         // you will need to add any other files required
         // (globs are supported)
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "WinRT.Runtime.dll"
       ],
@@ -127,8 +127,8 @@
     {
       "fuzzer": {
         "$type": "libfuzzerDotNet",
-        "dll": "HostsEditor.FuzzTests.dll",
-        "class": "HostsEditor.FuzzTests.FuzzTests",
+        "dll": "Hosts.FuzzTests.dll",
+        "class": "Hosts.FuzzTests.FuzzTests",
         "method": "FuzzWriteAsync",
         "FuzzingTargetBinaries": [
           "PowerToys.Hosts.dll"
@@ -160,8 +160,8 @@
         // (globs are supported)
         "Castle.Core.dll",
         "CommunityToolkit.Mvvm.dll",
-        "HostsEditor.FuzzTests.dll",
-        "HostsEditor.FuzzTests.pdb",
+        "Hosts.FuzzTests.dll",
+        "Hosts.FuzzTests.pdb",
         "Microsoft.Windows.SDK.NET.dll",
         "Moq.dll",
         "System.IO.Abstractions.dll",

src/modules/PowerOCR/PowerOCR-UITests/PowerOCR.UITests.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
-    <RootNamespace>PowerOCR.UITests</RootNamespace>
-	<ImplicitUsings>enable</ImplicitUsings>
-	<Nullable>enable</Nullable>
-	<OutputType>Library</OutputType>
-	<RunVSTest>false</RunVSTest>
-  </PropertyGroup>
-
-  <PropertyGroup>
-	<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\PowerOCR.UITests\</OutputPath>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="MSTest" />
-	<ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-  </ItemGroup>
-</Project>

src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using static Microsoft.PowerToys.UITest.UITestBase;
-
-namespace PowerOCR.UITests;
-
-[TestClass]
-public class PowerOCRTests : UITestBase
-{
-    public PowerOCRTests()
-        : base(PowerToysModule.PowerToysSettings, WindowSize.Medium)
-    {
-    }
-
-    [TestInitialize]
-    public void TestInitialize()
-    {
-        if (FindAll<NavigationViewItem>("Text Extractor").Count == 0)
-        {
-            // Expand Advanced list-group if needed
-            Find<NavigationViewItem>("System Tools").Click();
-        }
-
-        Find<NavigationViewItem>("Text Extractor").Click();
-
-        Find<ToggleSwitch>("Enable Text Extractor").Toggle(true);
-
-        SendKeys(Key.Win, Key.D);
-    }
-
-    [TestMethod("PowerOCR.DetectTextExtractor")]
-    [TestCategory("PowerOCR Detection")]
-    public void DetectTextExtractorTest()
-    {
-        try
-        {
-            SendKeys(Key.Win, Key.Shift, Key.T);
-
-            Thread.Sleep(5000);
-
-            var textExtractorWindow = Find("TextExtractor", 10000, true);
-
-            Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-            Console.WriteLine("✓ TextExtractor window detected successfully after hotkey activation");
-
-            SendKeys(Key.Esc);
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Failed to detect TextExtractor window: {ex.Message}");
-            Assert.Fail("TextExtractor window was not found after hotkey activation");
-        }
-    }
-}

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

@@ -5,7 +5,7 @@
     <ProjectGuid>{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>WorkspacesLibUnitTests</RootNamespace>
-    <ProjectName>Workspaces.Lib.UnitTests</ProjectName>
+    <ProjectName>WorkspacesLibUnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">

src/modules/cmdpal/.wt.json

@@ -26,6 +26,11 @@
             "input": "pushd .\\ExtensionTemplate\\ ; git archive -o ..\\Microsoft.CmdPal.UI.ViewModels\\Assets\\template.zip HEAD -- .\\TemplateCmdPalExtension\\ ; popd",
             "name": "Update template project",
             "description": "zips up the ExtensionTemplate into our assets. Run this in the cmdpal/ directory."
+        },
+        {
+            "input": "pwsh -c .\\clean-sdk.ps1",
+            "name": "Delete old extensions output",
+            "description": "Delete old extensions output directory.\r\nUse this after regenerating the interface, otherwise it will not pass fast up to date checks."
         }
     ]
 }

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IRunHistoryService.cs

@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.CmdPal.Common.Services;
-
-public interface IRunHistoryService
-{
-    /// <summary>
-    /// Gets the run history.
-    /// </summary>
-    /// <returns>A list of run history items.</returns>
-    IReadOnlyList<string> GetRunHistory();
-
-    /// <summary>
-    /// Clears the run history.
-    /// </summary>
-    void ClearRunHistory();
-
-    /// <summary>
-    /// Adds a run history item.
-    /// </summary>
-    /// <param name="item">The run history item to add.</param>
-    void AddRunHistoryItem(string item);
-}

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ArgumentItemViewModel.cs

@@ -0,0 +1,162 @@
+// 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 CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Models;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public partial class ArgumentItemViewModel : ExtensionObjectViewModel
+{
+    public ExtensionObject<ICommandArgument> Model => _model;
+
+    private readonly ExtensionObject<ICommandArgument> _model = new(null);
+
+    public ParameterType Type { get; private set; }
+
+    public string Name { get; private set; } = string.Empty;
+
+    public bool Required { get; private set; }
+
+    private string ModelDisplayName { get; set; } = string.Empty;
+
+    public string DisplayName => string.IsNullOrEmpty(ModelDisplayName) ? Name : ModelDisplayName;
+
+    // TODO! This should be an ExtensionObject<object> since it's out-of-proc
+    public object? Value
+    {
+        get; set
+        {
+            field = value;
+            SafeSetValue(value);
+        }
+    }
+
+    public ArgumentItemViewModel(ExtensionObject<ICommandArgument> model, WeakReference<IPageContext> pageContext)
+        : base(pageContext)
+    {
+        _model = model;
+    }
+
+    public override void InitializeProperties()
+    {
+        var model = _model.Unsafe;
+        if (model == null)
+        {
+            return;
+        }
+
+        Type = model.Type;
+        Name = model.Name;
+        Required = model.Required;
+        Value = model.Value;
+        ModelDisplayName = model.DisplayName;
+
+        // Register for property changes
+        model.PropChanged += Model_PropChanged;
+    }
+
+    private void Model_PropChanged(object sender, IPropChangedEventArgs args)
+    {
+        try
+        {
+            FetchProperty(args.PropertyName);
+        }
+        catch (Exception ex)
+        {
+            ShowException(ex);
+        }
+    }
+
+    protected virtual void FetchProperty(string propertyName)
+    {
+        var model = this._model.Unsafe;
+        if (model == null)
+        {
+            return; // throw?
+        }
+
+        switch (propertyName)
+        {
+            case nameof(ICommandArgument.Type):
+                if (model.Type == Type)
+                {
+                    return;
+                }
+
+                Type = model.Type;
+                break;
+            case nameof(ICommandArgument.Name):
+                if (model.Name == Name)
+                {
+                    return;
+                }
+
+                Name = model.Name;
+                UpdateProperty(nameof(DisplayName));
+                break;
+            case nameof(ICommandArgument.Required):
+                if (model.Required == Required)
+                {
+                    return;
+                }
+
+                Required = model.Required;
+                break;
+            case nameof(ICommandArgument.Value):
+                if (model.Value == Value)
+                {
+                    return;
+                }
+
+                Value = model.Value;
+                break;
+            case nameof(ICommandArgument.DisplayName):
+                if (model.DisplayName == ModelDisplayName)
+                {
+                    return;
+                }
+
+                ModelDisplayName = model.DisplayName;
+                break;
+        }
+
+        UpdateProperty(propertyName);
+    }
+
+    private void SafeSetValue(object? value)
+    {
+        _ = Task.Run(() => SafeSetValueSynchronous(value));
+    }
+
+    private void SafeSetValueSynchronous(object? value)
+    {
+        try
+        {
+            var model = _model.Unsafe;
+            if (model == null)
+            {
+                return;
+            }
+
+            model.Value = value;
+        }
+        catch
+        {
+        }
+    }
+
+    public void OpenPicker()
+    {
+        var model = _model.Unsafe;
+        if (model == null)
+        {
+            return;
+        }
+
+        WeakReferenceMessenger.Default.Send<RequestOpenPickerMessage>(new(_model));
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ArgumentsViewModel.cs

@@ -0,0 +1,21 @@
+// 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.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public partial class ArgumentsViewModel : INotifyPropertyChanged
+{
+    public ObservableCollection<ArgumentItemViewModel> Arguments { get; } = new();
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}

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

@@ -149,12 +149,12 @@ public partial class CommandBarViewModel : ObservableObject,
 
         if (command.HasMoreCommands)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command));
             return ContextKeybindingResult.KeepOpen;
         }
         else
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command));
             return ContextKeybindingResult.Hide;
         }
     }

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

@@ -2,6 +2,7 @@
 // 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.ObjectModel;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -62,6 +63,10 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     public bool ShouldBeVisible => !string.IsNullOrEmpty(Name);
 
+    public bool HasParameters => Command.HasParameters;
+
+    public ObservableCollection<ArgumentItemViewModel> Parameters => Command.Parameters;
+
     public List<IContextItemViewModel> AllCommands
     {
         get
@@ -181,14 +186,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             MoreCommands = more
                 .Select(item =>
                 {
-                    if (item is ICommandContextItem contextItem)
-                    {
-                        return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
-                    }
-                    else
-                    {
-                        return new SeparatorContextItemViewModel() as IContextItemViewModel;
-                    }
+                    return item is ICommandContextItem contextItem
+                        ? new CommandContextItemViewModel(contextItem, PageContext)
+                        : new SeparatorContextItemViewModel() as IContextItemViewModel;
                 })
                 .ToList();
         }
@@ -338,14 +338,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                     var newContextMenu = more
                         .Select(item =>
                         {
-                            if (item is CommandContextItem contextItem)
-                            {
-                                return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
-                            }
-                            else
-                            {
-                                return new SeparatorContextItemViewModel() as IContextItemViewModel;
-                            }
+                            return item is CommandContextItem contextItem
+                                ? new CommandContextItemViewModel(contextItem, PageContext)
+                                : new SeparatorContextItemViewModel() as IContextItemViewModel;
                         })
                         .ToList();
                     lock (MoreCommands)

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs

@@ -2,6 +2,7 @@
 // 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.ObjectModel;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 
@@ -29,6 +30,10 @@ public partial class CommandViewModel : ExtensionObjectViewModel
 
     public IconInfoViewModel Icon { get; private set; }
 
+    public bool HasParameters { get; set; }
+
+    public ObservableCollection<ArgumentItemViewModel> Parameters { get; private set; } = new();
+
     public CommandViewModel(ICommand? command, WeakReference<IPageContext> pageContext)
         : base(pageContext)
     {
@@ -51,6 +56,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
 
         Id = model.Id ?? string.Empty;
         Name = model.Name ?? string.Empty;
+
         IsFastInitialized = true;
     }
 
@@ -80,6 +86,22 @@ public partial class CommandViewModel : ExtensionObjectViewModel
             UpdateProperty(nameof(Icon));
         }
 
+        // TODO! we can probably make this a slow initialization
+        if (model is IInvokableCommandWithParameters withParams)
+        {
+            HasParameters = true;
+
+            if (withParams.Parameters is ICommandArgument[] parameters)
+            {
+                foreach (var p in parameters)
+                {
+                    var paramViewModel = new ArgumentItemViewModel(new(p), PageContext);
+                    paramViewModel.InitializeProperties();
+                    Parameters.Add(paramViewModel);
+                }
+            }
+        }
+
         model.PropChanged += Model_PropChanged;
     }
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs

@@ -250,7 +250,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
     {
         if (PrimaryCommand != null)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand.Command.Model, PrimaryCommand.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand));
         }
     }
 
@@ -260,7 +260,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
     {
         if (SecondaryCommand != null)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand.Command.Model, SecondaryCommand.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand));
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs

@@ -225,7 +225,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         }
         else
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command));
             UpdateContextItems();
             return ContextKeybindingResult.Hide;
         }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs

@@ -56,8 +56,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     public CommandItemViewModel EmptyContent { get; private set; }
 
-    public bool IsMainPage { get; init; }
-
     private bool _isDynamic;
 
     private Task? _initializeItemsTask;
@@ -134,7 +132,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
         try
         {
+            var stopwatch = System.Diagnostics.Stopwatch.StartNew();
+            stopwatch.Start();
+
             var newItems = _model.Unsafe!.GetItems();
+            var getItemsTime = stopwatch.ElapsedMilliseconds;
 
             // Collect all the items into new viewmodels
             Collection<ListItemViewModel> newViewModels = [];
@@ -171,6 +173,13 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
             // TODO: Iterate over everything in Items, and prune items from the
             // cache if we don't need them anymore
+            stopwatch.Stop();
+            var initializeTime = stopwatch.ElapsedMilliseconds - getItemsTime;
+            WeakReferenceMessenger.Default.Send<FetchItemsMetricsMessage>(new(
+                newViewModels.Count,
+                getItemsTime,
+                initializeTime
+            ));
         }
         catch (Exception ex)
         {
@@ -299,13 +308,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
     {
         if (item != null)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.Command.Model, item.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item));
         }
         else if (ShowEmptyContent && EmptyContent.PrimaryCommand?.Model.Unsafe != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
-                EmptyContent.PrimaryCommand.Command.Model,
-                EmptyContent.PrimaryCommand.Model));
+                EmptyContent.PrimaryCommand));
         }
     }
 
@@ -317,14 +325,13 @@ public partial class ListViewModel : PageViewModel, IDisposable
         {
             if (item.SecondaryCommand != null)
             {
-                WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.SecondaryCommand.Command.Model, item.Model));
+                WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.SecondaryCommand, item));
             }
         }
         else if (ShowEmptyContent && EmptyContent.SecondaryCommand?.Model.Unsafe != null)
         {
             WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
-                EmptyContent.SecondaryCommand.Command.Model,
-                EmptyContent.SecondaryCommand.Model));
+                EmptyContent.SecondaryCommand));
         }
     }
 
@@ -372,7 +379,15 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }
 
                TextToSuggest = item.TextToSuggest;
-               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(item.TextToSuggest));
+
+               if (item.HasParameters)
+               {
+                   WeakReferenceMessenger.Default.Send<UpdateParametersMessage>(new(item.Parameters));
+               }
+               else
+               {
+                   WeakReferenceMessenger.Default.Send<UpdateParametersMessage>(new(null));
+               }
            });
 
         _lastSelectedItem = item;
@@ -426,8 +441,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
                WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
 
-               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(string.Empty));
-
                TextToSuggest = string.Empty;
            });
     }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/FetchItemsMetricsMessage.cs

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+public record FetchItemsMetricsMessage(int ItemCount, long GetItemsTime, long InitializeItemsTime)
+{
+}

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/PerformCommandMessage.cs

@@ -18,12 +18,13 @@ public record PerformCommandMessage
 
     public bool WithAnimation { get; set; } = true;
 
-    public PerformCommandMessage(ExtensionObject<ICommand> command)
-    {
-        Command = command;
-        Context = null;
-    }
+    public ICommandArgument?[] Arguments { get; set; } = [];
 
+    // public PerformCommandMessage(ExtensionObject<ICommand> command)
+    // {
+    //    Command = command;
+    //    Context = null;
+    // }
     public PerformCommandMessage(ExtensionObject<ICommand> command, ExtensionObject<IListItem> context)
     {
         Command = command;
@@ -48,6 +49,16 @@ public record PerformCommandMessage
         Context = contextCommand.Model.Unsafe;
     }
 
+    public PerformCommandMessage(CommandItemViewModel item, CommandItemViewModel? context = null)
+    {
+        Command = item.Command.Model;
+        Context = context?.Model.Unsafe ?? item.Model.Unsafe;
+        if (item.Parameters != null && item.Parameters.Any())
+        {
+            Arguments = item.Parameters.Select(p => p.Model.Unsafe).ToArray();
+        }
+    }
+
     public PerformCommandMessage(ConfirmResultViewModel vm)
     {
         Command = vm.PrimaryCommand.Model;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/RequestOpenPickerMessage.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Core.ViewModels.Models;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+public record RequestOpenPickerMessage(ExtensionObject<ICommandArgument> Argument)
+{
+}

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateParametersMessage.cs

@@ -4,6 +4,6 @@
 
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
-public record UpdateSuggestionMessage(string TextToSuggest)
+public record UpdateParametersMessage(IEnumerable<ArgumentItemViewModel>? Parameters)
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs

@@ -93,7 +93,7 @@ public partial class ShellViewModel : ObservableObject,
         _rootPage = _rootPageService.GetRootPage();
 
         // This sends a message to us to load the root page view model.
-        WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(new ExtensionObject<ICommand>(_rootPage)));
+        WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(new ExtensionObject<ICommand>(_rootPage), new ExtensionObject<ICommandContextItem>(null)));
 
         // Now that the root page is loaded, do any post-load work that the root page service needs to do.
         // This runs asynchronously, on a background thread.
@@ -217,6 +217,16 @@ public partial class ShellViewModel : ObservableObject,
                 // Note: Originally we set our page back in the ViewModel here, but that now happens in response to the Frame navigating triggered from the above
                 // See RootFrame_Navigated event handler.
             }
+            else if (command is IInvokableCommandWithParameters commandWithParams)
+            {
+                Logger.LogDebug($"Invoking command with args");
+
+                // var args = ArgumentsViewModel.Arguments;
+                // var aa = args.Select(a => a.Model.Unsafe).ToArray() ?? [];
+                // message.Arguments = aa;
+                WeakReferenceMessenger.Default.Send<BeginInvokeMessage>();
+                HandleInvokeCommandWithArgs(message, commandWithParams, host);
+            }
             else if (command is IInvokableCommand invokable)
             {
                 Logger.LogDebug($"Invoking command");
@@ -276,6 +286,44 @@ public partial class ShellViewModel : ObservableObject,
         }
     }
 
+    private void HandleInvokeCommandWithArgs(PerformCommandMessage message, IInvokableCommandWithParameters invokable, AppExtensionHost? host)
+    {
+        // TODO GH #525 This needs more better locking.
+        lock (_invokeLock)
+        {
+            if (_handleInvokeTask != null)
+            {
+                // do nothing - a command is already doing a thing
+            }
+            else
+            {
+                _handleInvokeTask = Task.Run(() =>
+                {
+                    try
+                    {
+                        // Call out to extension process.
+                        // * May fail!
+                        // * May never return!
+                        var result = invokable.InvokeWithArgs(message.Context, message.Arguments);
+
+                        // But if it did succeed, we need to handle the result.
+                        UnsafeHandleCommandResult(result);
+
+                        _handleInvokeTask = null;
+                    }
+                    catch (Exception ex)
+                    {
+                        _handleInvokeTask = null;
+
+                        // TODO: It would be better to do this as a page exception, rather
+                        // than a silent log message.
+                        host?.Log(ex.Message);
+                    }
+                });
+            }
+        }
+    }
+
     private void UnsafeHandleCommandResult(ICommandResult? result)
     {
         if (result == null)

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

@@ -21,12 +21,8 @@ public partial class AppStateModel : ObservableObject
 
     ///////////////////////////////////////////////////////////////////////////
     // STATE HERE
-    // Make sure that you make the setters public (JsonSerializer.Deserialize will fail silently otherwise)!
-    // Make sure that any new types you add are added to JsonSerializationContext!
     public RecentCommandsManager RecentCommands { get; set; } = new();
 
-    public List<string> RunHistory { get; set; } = [];
-
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -90,7 +86,7 @@ public partial class AppStateModel : ObservableObject
                 {
                     foreach (var item in newSettings)
                     {
-                        savedSettings[item.Key] = item.Value?.DeepClone();
+                        savedSettings[item.Key] = item.Value != null ? item.Value.DeepClone() : null;
                     }
 
                     var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
@@ -125,4 +121,20 @@ public partial class AppStateModel : ObservableObject
         // now, the settings is just next to the exe
         return Path.Combine(directory, "state.json");
     }
+
+    // [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
+    // private static readonly JsonSerializerOptions _serializerOptions = new()
+    // {
+    //    WriteIndented = true,
+    //    Converters = { new JsonStringEnumConverter() },
+    // };
+
+    // private static readonly JsonSerializerOptions _deserializerOptions = new()
+    // {
+    //    PropertyNameCaseInsensitive = true,
+    //    IncludeFields = true,
+    //    AllowTrailingCommas = true,
+    //    PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate,
+    //    ReadCommentHandling = JsonCommentHandling.Skip,
+    // };
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs

@@ -23,6 +23,12 @@ public partial class BuiltInsCommandProvider : CommandProvider
         [
             new CommandItem(openSettings) { Subtitle = Properties.Resources.builtin_open_settings_subtitle },
             new CommandItem(_newExtension) { Title = _newExtension.Title, Subtitle = Properties.Resources.builtin_new_extension_subtitle },
+            new ListItem(new CommandWithParams() { Name = "Invoke with params 2" })
+            {
+                Title = "Do a thing with a string",
+                Subtitle = "This command requires more input",
+                Icon = new IconInfo("\uE961"),
+            }
         ];
 
     public override IFallbackCommandItem[] FallbackCommands() =>
@@ -40,4 +46,46 @@ public partial class BuiltInsCommandProvider : CommandProvider
     }
 
     public override void InitializeWithHost(IExtensionHost host) => BuiltinsExtensionHost.Instance.Initialize(host);
+
+    internal sealed partial class CommandWithParams : InvokableCommand, IInvokableCommandWithParameters
+    {
+        public ICommandArgument[] Parameters => [new TextParam("Test")];
+
+        public ICommandResult InvokeWithArgs(object sender, ICommandArgument[] args)
+        {
+            if (args.Length > 0)
+            {
+                var arg = args[0];
+                var msg = $"Arg {arg.Name} = {arg.Value}";
+                var toast = new ToastStatusMessage(new StatusMessage() { Message = msg, State = MessageState.Success });
+                toast.Show();
+            }
+            else
+            {
+                var toast = new ToastStatusMessage(new StatusMessage() { Message = "didn't work homes", State = MessageState.Error });
+                toast.Show();
+            }
+
+            return CommandResult.KeepOpen();
+        }
+    }
+
+    internal sealed partial class TextParam(string name, bool required = true) : BaseObservable, ICommandArgument
+    {
+        public string Name => name;
+
+        public bool Required => required;
+
+        public ParameterType Type => ParameterType.Text;
+
+        public object? Value { get; set; }
+
+        public string DisplayName => string.Empty;
+
+        public IIconInfo? Icon => null;
+
+        public void ShowPicker(ulong hostHwnd)
+        {
+        }
+    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -263,7 +263,7 @@ public partial class MainListPage : DynamicListPage,
         {
              nameMatch,
              descriptionMatch,
-             isFallback ? 1 : 0, // Always give fallbacks a chance
+             isFallback ? 1 : 0, // Always give fallbacks a chance...
         };
         var max = scores.Max();
 
@@ -273,7 +273,8 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
-        var matchSomething = max
+        // ... but downweight them
+        var matchSomething = (max / (isFallback ? 3 : 1))
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 
         // If we matched title, subtitle, or alias (something real), then

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

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+// public partial class ParameterViewModel : ExtensionObjectViewModel
+// {
+//    public ExtensionObject<ICommandParameter> Model { get; private set; } = new(null);
+
+// protected bool IsInitialized { get; private set; }
+
+// // values from ICommandParameter
+//    public string Name { get; private set; } = string.Empty;
+
+// public ParameterType Type { get; private set; } = ParameterType.Text;
+
+// public bool Required { get; private set; } = true;
+
+// public ParameterViewModel(ICommandParameter? parameter, WeakReference<IPageContext> pageContext)
+//        : base(pageContext)
+//    {
+//        Model = new(parameter);
+//    }
+
+// public override void InitializeProperties()
+//    {
+//        if (IsInitialized)
+//        {
+//            return;
+//        }
+
+// var model = Model.Unsafe;
+//        if (model == null)
+//        {
+//            return;
+//        }
+
+// Name = model.Name ?? string.Empty;
+//        Type = model.Type;
+//        Required = model.Required;
+//    }
+// }

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -6,6 +6,7 @@ using ManagedCommon;
 using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.Ext.Actions;
 using Microsoft.CmdPal.Ext.Apps;
 using Microsoft.CmdPal.Ext.Bookmarks;
 using Microsoft.CmdPal.Ext.Calc;
@@ -98,13 +99,10 @@ public partial class App : Application
 
         // Built-in Commands. Order matters - this is the order they'll be presented by default.
         var allApps = new AllAppsCommandProvider();
-        var files = new IndexerCommandsProvider();
-        files.SuppressFallbackWhen(ShellCommandsProvider.SuppressFileFallbackIf);
         services.AddSingleton<ICommandProvider>(allApps);
-
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
-        services.AddSingleton<ICommandProvider>(files);
+        services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
         services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
@@ -136,6 +134,7 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
         services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
         services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();
+        services.AddSingleton<ICommandProvider, AgentsTestCommandsProvider>();
 
         // Models
         services.AddSingleton<TopLevelCommandManager>();
@@ -147,7 +146,6 @@ public partial class App : Application
         services.AddSingleton(state);
         services.AddSingleton<IExtensionService, ExtensionService>();
         services.AddSingleton<TrayIconService>();
-        services.AddSingleton<IRunHistoryService, RunHistoryService>();
 
         services.AddSingleton<IRootPageService, PowerToysRootPageService>();
         services.AddSingleton<IAppHostService, PowerToysAppHostService>();

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs

@@ -7,8 +7,6 @@ using Microsoft.CmdPal.UI.Deferred;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.UI.Controls;
@@ -51,12 +49,6 @@ public partial class IconBox : ContentControl
     /// </summary>
     public event TypedEventHandler<IconBox, SourceRequestedEventArgs>? SourceRequested;
 
-    public IconBox()
-    {
-        TabFocusNavigation = KeyboardNavigationMode.Once;
-        IsTabStop = false;
-    }
-
     private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is IconBox @this)

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml

@@ -16,17 +16,25 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <!--  Search box  -->
-    <TextBox
-        x:Name="FilterBox"
-        MinHeight="32"
-        VerticalAlignment="Stretch"
-        VerticalContentAlignment="Stretch"
-        KeyDown="FilterBox_KeyDown"
-        PlaceholderText="{x:Bind CurrentPageViewModel.PlaceholderText, Converter={StaticResource PlaceholderTextConverter}, Mode=OneWay}"
-        PreviewKeyDown="FilterBox_PreviewKeyDown"
-        PreviewKeyUp="FilterBox_PreviewKeyUp"
-        Style="{StaticResource SearchTextBoxStyle}"
-        TextChanged="FilterBox_TextChanged" />
-    <!--  Disabled Description="{x:Bind CurrentPageViewModel.TextToSuggest, Mode=OneWay}" for now, needs more work  -->
+    <StackPanel Orientation="Horizontal" x:Name="Root">
+
+        <!--  Search box  -->
+        <TextBox
+            x:Name="FilterBox"
+            MinHeight="32"
+            VerticalAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            KeyDown="FilterBox_KeyDown"
+            PlaceholderText="{x:Bind CurrentPageViewModel.PlaceholderText, Converter={StaticResource PlaceholderTextConverter}, Mode=OneWay}"
+            PreviewKeyDown="FilterBox_PreviewKeyDown"
+            PreviewKeyUp="FilterBox_PreviewKeyUp"
+            Style="{StaticResource SearchTextBoxStyle}"
+            TextChanged="FilterBox_TextChanged" />
+        <!--  Disabled Description="{x:Bind CurrentPageViewModel.TextToSuggest, Mode=OneWay}" for now, needs more work  -->
+
+        <StackPanel Orientation="Horizontal" x:Name="ParametersPanel">
+            <!-- Parameter text boxes will be added dynamically in code-behind and bound to ArgumentsViewModel -->
+        </StackPanel>
+        <!-- Add DataContext for ArgumentsViewModel if needed for future XAML binding -->
+    </StackPanel>
 </UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
@@ -20,7 +21,7 @@ namespace Microsoft.CmdPal.UI.Controls;
 public sealed partial class SearchBar : UserControl,
     IRecipient<GoHomeMessage>,
     IRecipient<FocusSearchBoxMessage>,
-    IRecipient<UpdateSuggestionMessage>,
+    IRecipient<UpdateParametersMessage>,
     ICurrentPageAware
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -31,10 +32,6 @@ public sealed partial class SearchBar : UserControl,
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
     private bool _isBackspaceHeld;
 
-    private bool _inSuggestion;
-    private string? _lastText;
-    private string? _deletedSuggestion;
-
     public PageViewModel? CurrentPageViewModel
     {
         get => (PageViewModel?)GetValue(CurrentPageViewModelProperty);
@@ -68,12 +65,17 @@ public sealed partial class SearchBar : UserControl,
         }
     }
 
+    public ArgumentsViewModel ArgumentsViewModel { get; private set; } = new ArgumentsViewModel();
+
+    public static readonly DependencyProperty ArgumentsViewModelProperty =
+        DependencyProperty.Register(nameof(ArgumentsViewModel), typeof(ArgumentsViewModel), typeof(SearchBar), new PropertyMetadata(null));
+
     public SearchBar()
     {
         this.InitializeComponent();
         WeakReferenceMessenger.Default.Register<GoHomeMessage>(this);
         WeakReferenceMessenger.Default.Register<FocusSearchBoxMessage>(this);
-        WeakReferenceMessenger.Default.Register<UpdateSuggestionMessage>(this);
+        WeakReferenceMessenger.Default.Register<UpdateParametersMessage>(this);
     }
 
     public void ClearSearch()
@@ -130,6 +132,15 @@ public sealed partial class SearchBar : UserControl,
             WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.Right)
+        {
+            if (CurrentPageViewModel != null && !string.IsNullOrEmpty(CurrentPageViewModel.TextToSuggest))
+            {
+                FilterBox.Text = CurrentPageViewModel.TextToSuggest;
+                FilterBox.Select(FilterBox.Text.Length, 0);
+                e.Handled = true;
+            }
+        }
         else if (e.Key == VirtualKey.Escape)
         {
             if (string.IsNullOrEmpty(FilterBox.Text))
@@ -196,65 +207,12 @@ public sealed partial class SearchBar : UserControl,
 
             e.Handled = true;
         }
-        else if (e.Key == VirtualKey.Right)
-        {
-            if (_inSuggestion)
-            {
-                _inSuggestion = false;
-                _lastText = null;
-                DoFilterBoxUpdate();
-            }
-        }
         else if (e.Key == VirtualKey.Down)
         {
             WeakReferenceMessenger.Default.Send<NavigateNextCommand>();
 
             e.Handled = true;
         }
-
-        if (_inSuggestion)
-        {
-            if (
-                 e.Key == VirtualKey.Back ||
-                 e.Key == VirtualKey.Delete
-                 )
-            {
-                _deletedSuggestion = FilterBox.Text;
-
-                FilterBox.Text = _lastText ?? string.Empty;
-                FilterBox.Select(FilterBox.Text.Length, 0);
-
-                // Logger.LogInfo("deleting suggestion");
-                _inSuggestion = false;
-                _lastText = null;
-
-                e.Handled = true;
-                return;
-            }
-
-            var ignoreLeave =
-
-                e.Key == VirtualKey.Up ||
-                e.Key == VirtualKey.Down ||
-
-                e.Key == VirtualKey.RightMenu ||
-                e.Key == VirtualKey.LeftMenu ||
-                e.Key == VirtualKey.Menu ||
-                e.Key == VirtualKey.Shift ||
-                e.Key == VirtualKey.RightShift ||
-                e.Key == VirtualKey.LeftShift ||
-                e.Key == VirtualKey.RightControl ||
-                e.Key == VirtualKey.LeftControl ||
-                e.Key == VirtualKey.Control;
-            if (ignoreLeave)
-            {
-                return;
-            }
-
-            // Logger.LogInfo("leaving suggestion");
-            _inSuggestion = false;
-            _lastText = null;
-        }
     }
 
     private void FilterBox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
@@ -268,7 +226,7 @@ public sealed partial class SearchBar : UserControl,
 
     private void FilterBox_TextChanged(object sender, TextChangedEventArgs e)
     {
-        // Logger.LogInfo($"FilterBox_TextChanged: {FilterBox.Text}");
+        Debug.WriteLine($"FilterBox_TextChanged: {FilterBox.Text}");
 
         // TERRIBLE HACK TODO GH #245
         // There's weird wacky bugs with debounce currently. We're trying
@@ -277,22 +235,23 @@ public sealed partial class SearchBar : UserControl,
         // (otherwise aliases just stop working)
         if (FilterBox.Text.Length == 1)
         {
-            DoFilterBoxUpdate();
+            if (CurrentPageViewModel != null)
+            {
+                CurrentPageViewModel.Filter = FilterBox.Text;
+            }
 
             return;
         }
 
-        if (_inSuggestion)
-        {
-            // Logger.LogInfo($"-- skipping, in suggestion --");
-            return;
-        }
-
         // TODO: We could encapsulate this in a Behavior if we wanted to bind to the Filter property.
         _debounceTimer.Debounce(
             () =>
             {
-                DoFilterBoxUpdate();
+                // Actually plumb Filtering to the view model
+                if (CurrentPageViewModel != null)
+                {
+                    CurrentPageViewModel.Filter = FilterBox.Text;
+                }
             },
             //// Couldn't find a good recommendation/resource for value here. PT uses 50ms as default, so that is a reasonable default
             //// This seems like a useful testing site for typing times: https://keyboardtester.info/keyboard-latency-test/
@@ -302,21 +261,6 @@ public sealed partial class SearchBar : UserControl,
             immediate: FilterBox.Text.Length <= 1);
     }
 
-    private void DoFilterBoxUpdate()
-    {
-        if (_inSuggestion)
-        {
-            // Logger.LogInfo($"--- skipping ---");
-            return;
-        }
-
-        // Actually plumb Filtering to the view model
-        if (CurrentPageViewModel != null)
-        {
-            CurrentPageViewModel.Filter = FilterBox.Text;
-        }
-    }
-
     // Used to handle the case when a ListPage's `SearchText` may have changed
     private void Page_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
@@ -354,95 +298,78 @@ public sealed partial class SearchBar : UserControl,
 
     public void Receive(FocusSearchBoxMessage message) => FilterBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
 
-    public void Receive(UpdateSuggestionMessage message)
+    public void Receive(UpdateParametersMessage message)
     {
-        var suggestion = message.TextToSuggest;
-
-        _queue.TryEnqueue(new(() =>
+        ParametersPanel.Children.Clear();
+        ArgumentsViewModel.Arguments.Clear();
+        if (message.Parameters != null)
         {
-            var clearSuggestion = string.IsNullOrEmpty(suggestion);
-
-            if (clearSuggestion && _inSuggestion)
+            foreach (var param in message.Parameters)
             {
-                // Logger.LogInfo($"Cleared suggestion \"{_lastText}\" to {suggestion}");
-                _inSuggestion = false;
-                FilterBox.Text = _lastText ?? string.Empty;
-                _lastText = null;
-                return;
-            }
+                // var argVm = new ArgumentItemViewModel { Name = param.Name };
+                ArgumentsViewModel.Arguments.Add(param);
 
-            if (clearSuggestion)
-            {
-                _deletedSuggestion = null;
-                return;
-            }
-
-            if (suggestion == _deletedSuggestion)
-            {
-                return;
-            }
-            else
-            {
-                _deletedSuggestion = null;
-            }
-
-            var currentText = _lastText ?? FilterBox.Text;
-
-            _lastText = currentText;
-
-            // if (_inSuggestion)
-            // {
-            //     Logger.LogInfo($"Suggestion from \"{_lastText}\" to {suggestion}");
-            // }
-            // else
-            // {
-            //     Logger.LogInfo($"Entering suggestion from \"{_lastText}\" to {suggestion}");
-            // }
-            _inSuggestion = true;
-
-            var matchedChars = 0;
-            var suggestionStartsWithQuote = suggestion.Length > 0 && suggestion[0] == '"';
-            var currentStartsWithQuote = currentText.Length > 0 && currentText[0] == '"';
-            var skipCheckingFirst = suggestionStartsWithQuote && !currentStartsWithQuote;
-            for (int i = skipCheckingFirst ? 1 : 0, j = 0;
-                 i < suggestion.Length && j < currentText.Length;
-                 i++, j++)
-            {
-                if (string.Equals(
-                    suggestion[i].ToString(),
-                    currentText[j].ToString(),
-                    StringComparison.OrdinalIgnoreCase))
+                if (param.Type == CommandPalette.Extensions.ParameterType.Text)
                 {
-                    matchedChars++;
+                    var textBox = new TextBox
+                    {
+                        MinHeight = 24,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        VerticalContentAlignment = VerticalAlignment.Stretch,
+                        PlaceholderText = param.Name,
+                        Margin = new Thickness(4, 0, 4, 0),
+                    };
+                    textBox.SetBinding(TextBox.TextProperty, new Microsoft.UI.Xaml.Data.Binding
+                    {
+                        Source = param,
+                        Path = new PropertyPath("Value"),
+                        Mode = Microsoft.UI.Xaml.Data.BindingMode.TwoWay,
+                        UpdateSourceTrigger = Microsoft.UI.Xaml.Data.UpdateSourceTrigger.PropertyChanged,
+                    });
+                    ParametersPanel.Children.Add(textBox);
                 }
-                else
+
+                // else if (param.Type == ParameterType.Enum)
+                // {
+                //     var comboBox = new ComboBox
+                //     {
+                //         MinHeight = 24,
+                //         VerticalAlignment = VerticalAlignment.Center,
+                //         VerticalContentAlignment = VerticalAlignment.Stretch,
+                //         PlaceholderText = param.Name,
+                //         Margin = new Thickness(4, 0, 4, 0),
+                //     };
+                //     comboBox.SetBinding(ComboBox.SelectedItemProperty, new Microsoft.UI.Xaml.Data.Binding
+                //     {
+                //         Source = param,
+                //         Path = new PropertyPath("Value"),
+                //         Mode = Microsoft.UI.Xaml.Data.BindingMode.TwoWay,
+                //         UpdateSourceTrigger = Microsoft.UI.Xaml.Data.UpdateSourceTrigger.PropertyChanged,
+                //     });
+                //     ParametersPanel.Children.Add(comboBox);
+                // }
+                else if (param.Type == CommandPalette.Extensions.ParameterType.Custom)
                 {
-                    break;
+                    // Add a button, and when they click it, trigger the custom action
+                    var button = new Button
+                    {
+                        Content = param.Name,
+                        Margin = new Thickness(4, 0, 4, 0),
+                    };
+                    button.Click += (s, e) =>
+                    {
+                        param.OpenPicker();
+                    };
+                    button.SetBinding(Button.ContentProperty, new Microsoft.UI.Xaml.Data.Binding
+                    {
+                        Source = param,
+                        Path = new PropertyPath("DisplayName"),
+                        Mode = Microsoft.UI.Xaml.Data.BindingMode.OneWay,
+                        UpdateSourceTrigger = Microsoft.UI.Xaml.Data.UpdateSourceTrigger.PropertyChanged,
+                    });
+                    ParametersPanel.Children.Add(button);
                 }
             }
-
-            var first = skipCheckingFirst ? "\"" : string.Empty;
-            var second = currentText.AsSpan(0, matchedChars);
-            var third = suggestion.AsSpan(matchedChars + (skipCheckingFirst ? 1 : 0));
-
-            var newText = string.Concat(
-                first,
-                second,
-                third);
-
-            FilterBox.Text = newText;
-
-            var wrappedInQuotes = suggestionStartsWithQuote && suggestion.Last() == '"';
-            if (wrappedInQuotes)
-            {
-                FilterBox.Select(
-                    (skipCheckingFirst ? 1 : 0) + matchedChars,
-                    Math.Max(0, suggestion.Length - matchedChars - 1 + (skipCheckingFirst ? -1 : 0)));
-            }
-            else
-            {
-                FilterBox.Select(matchedChars, suggestion.Length - matchedChars);
-            }
-        }));
+        }
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Events/FetchItemsMetrics.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.UI.Events;
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class FetchItemsMetrics : EventBase, IEvent
+{
+    public int ItemCount { get; init; }
+
+    public long GetItemsTime { get; init; }
+
+    public long InitializeItemsTime { get; init; }
+
+    public FetchItemsMetrics(int itemCount, long getItemsTime, long initializeItemsTime)
+    {
+        ItemCount = itemCount;
+        GetItemsTime = getItemsTime;
+        InitializeItemsTime = initializeItemsTime;
+    }
+
+    public new string EventName => "CmdPalFetchItemsMetrics";
+
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -265,13 +265,6 @@ public sealed partial class ListPage : Page,
         {
             ItemsList.SelectedIndex = 0;
         }
-
-        // Always reset the selected item when the top-level list page changes
-        // its items
-        if (!sender.IsNested)
-        {
-            ItemsList.SelectedIndex = 0;
-        }
     }
 
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs

@@ -20,12 +20,14 @@ namespace Microsoft.CmdPal.UI;
 /// </summary>
 internal sealed class TelemetryForwarder :
     IRecipient<BeginInvokeMessage>,
-    IRecipient<CmdPalInvokeResultMessage>
+    IRecipient<CmdPalInvokeResultMessage>,
+    IRecipient<FetchItemsMetricsMessage>
 {
     public TelemetryForwarder()
     {
         WeakReferenceMessenger.Default.Register<BeginInvokeMessage>(this);
         WeakReferenceMessenger.Default.Register<CmdPalInvokeResultMessage>(this);
+        WeakReferenceMessenger.Default.Register<FetchItemsMetricsMessage>(this);
     }
 
     public void Receive(CmdPalInvokeResultMessage message)
@@ -37,4 +39,9 @@ internal sealed class TelemetryForwarder :
     {
         PowerToysTelemetry.Log.WriteEvent(new BeginInvoke());
     }
+
+    public void Receive(FetchItemsMetricsMessage message)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new FetchItemsMetrics(message.ItemCount, message.GetItemsTime, message.InitializeItemsTime));
+    }
 }

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

@@ -22,6 +22,9 @@
 
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+
+    <!-- TODO!: I'm pretty sure this is just because my machine is on an old VS / .net SDK  -->
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);IL2059;</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(EnableCmdPalAOT)' == 'true'">
@@ -135,6 +138,7 @@
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj" />
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Actions\Microsoft.CmdPal.Ext.Actions.csproj" />
 
     <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
       <ReferenceOutputAssembly>True</ReferenceOutputAssembly>

src/modules/cmdpal/Microsoft.CmdPal.UI/Package-Dev.appxmanifest

@@ -85,5 +85,6 @@
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
+    <rescap:Capability Name="contacts" />
   </Capabilities>
 </Package>

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -8,6 +8,7 @@ using CommunityToolkit.WinUI;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.CmdPal.UI.Settings;
 using Microsoft.CmdPal.UI.ViewModels;
@@ -17,7 +18,6 @@ using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Animation;
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
@@ -42,6 +42,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     IRecipient<ShowConfirmationMessage>,
     IRecipient<ShowToastMessage>,
     IRecipient<NavigateToPageMessage>,
+    IRecipient<RequestOpenPickerMessage>,
     INotifyPropertyChanged
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -82,6 +83,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         WeakReferenceMessenger.Default.Register<ShowConfirmationMessage>(this);
         WeakReferenceMessenger.Default.Register<ShowToastMessage>(this);
         WeakReferenceMessenger.Default.Register<NavigateToPageMessage>(this);
+        WeakReferenceMessenger.Default.Register<RequestOpenPickerMessage>(this);
 
         AddHandler(PreviewKeyDownEvent, new KeyEventHandler(ShellPage_OnPreviewKeyDown), true);
         AddHandler(PointerPressedEvent, new PointerEventHandler(ShellPage_OnPointerPressed), true);
@@ -286,6 +288,19 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
     public void Receive(ClearSearchMessage message) => SearchBox.ClearSearch();
 
+    public void Receive(RequestOpenPickerMessage message)
+    {
+        _ = DispatcherQueue.TryEnqueue(() =>
+        {
+            var argument = message.Argument.Unsafe;
+            if (argument != null)
+            {
+                var hwnd = (ulong)WinRT.Interop.WindowNative.GetWindowHandle(App.Current.AppWindow).ToInt64();
+                argument.ShowPicker(hwnd);
+            }
+        });
+    }
+
     public void Receive(HotkeySummonMessage message)
     {
         _ = DispatcherQueue.TryEnqueue(() => SummonOnUiThread(message));
@@ -447,7 +462,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     {
         if (sender is Button button && button.DataContext is CommandViewModel commandViewModel)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(commandViewModel.Model));
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(commandViewModel.Model, new ExtensionObject<IListItem>(null)));
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs

@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Common.Services;
-using Microsoft.CmdPal.UI.ViewModels;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed class RunHistoryService : IRunHistoryService
-{
-    private readonly AppStateModel _appStateModel;
-
-    public RunHistoryService(AppStateModel appStateModel)
-    {
-        _appStateModel = appStateModel;
-    }
-
-    public IReadOnlyList<string> GetRunHistory()
-    {
-        if (_appStateModel.RunHistory.Count == 0)
-        {
-            var history = Microsoft.Terminal.UI.RunHistory.CreateRunHistory();
-            _appStateModel.RunHistory.AddRange(history);
-        }
-
-        return _appStateModel.RunHistory;
-    }
-
-    public void ClearRunHistory()
-    {
-        _appStateModel.RunHistory.Clear();
-    }
-
-    public void AddRunHistoryItem(string item)
-    {
-        // insert at the beginning of the list
-        if (string.IsNullOrWhiteSpace(item))
-        {
-            return; // Do not add empty or whitespace items
-        }
-
-        _appStateModel.RunHistory.Remove(item);
-
-        // Add the item to the front of the history
-        _appStateModel.RunHistory.Insert(0, item);
-
-        AppStateModel.SaveState(_appStateModel);
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -411,7 +411,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Back</value>
   </data>
   <data name="BackButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Back (Alt + Left arrow)</value>
+    <value>Back</value>
   </data>
   <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>

src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/TextBox.xaml

@@ -186,8 +186,6 @@
                             x:Load="False"
                             AutomationProperties.AccessibilityView="Raw"
                             CharacterSpacing="15"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
                             Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
                             Text="{TemplateBinding Description}"
                             TextWrapping="{TemplateBinding TextWrapping}" />

src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml

@@ -3,8 +3,5 @@
 		<Assembly Name="Microsoft.WinUI">
 			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
 		</Assembly>
-		<Assembly Name="Microsoft.CmdPal.UI">
-			<Type Name="Microsoft.CmdPal.UI.ContextItemTemplateSelector" Dynamic="Required All" />
-		</Assembly>
 	</Application>
 </Directives>

src/modules/cmdpal/Microsoft.CmdPal.UITests/BasicTests.cs

@@ -10,12 +10,33 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 namespace Microsoft.CmdPal.UITests;
 
 [TestClass]
-public class BasicTests : CommandPaletteTestBase
+public class BasicTests : UITestBase
 {
     public BasicTests()
+        : base(PowerToysModule.CommandPalette)
     {
     }
 
+    private void SetSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type here to search...").SetText(text, true).Text, text);
+    }
+
+    private void SetFilesExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search for files and folders...").SetText(text, true).Text, text);
+    }
+
+    private void SetCalculatorExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Type an equation...").SetText(text, true).Text, text);
+    }
+
+    private void SetTimeAndDaterExtensionSearchBox(string text)
+    {
+        Assert.AreEqual(this.Find<TextBox>("Search values or type a custom time stamp...").SetText(text, true).Text, text);
+    }
+
     [TestMethod]
     public void BasicFileSearchTest()
     {

src/modules/cmdpal/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs

@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.UITests;
-
-public class CommandPaletteTestBase : UITestBase
-{
-    public CommandPaletteTestBase()
-        : base(PowerToysModule.CommandPalette)
-    {
-    }
-
-    protected void SetSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Type here to search...").SetText(text, true).Text, text);
-    }
-
-    protected void SetFilesExtensionSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Search for files and folders...").SetText(text, true).Text, text);
-    }
-
-    protected void SetCalculatorExtensionSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Type an equation...").SetText(text, true).Text, text);
-    }
-
-    protected void SetTimeAndDaterExtensionSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Search values or type a custom time stamp...").SetText(text, true).Text, text);
-    }
-
-    protected void OpenContextMenu()
-    {
-        var contextMenuButton = this.Find<Button>("More");
-        Assert.IsNotNull(contextMenuButton, "Context menu button not found.");
-        contextMenuButton.Click();
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UITests/IndexerTests.cs

@@ -1,226 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.UITests;
-
-[TestClass]
-public class IndexerTests : CommandPaletteTestBase
-{
-    private const string TestFileContent = "This is Indexer UI test sample";
-    private const string TestFileName = "indexer_test_item.txt";
-    private const string TestFolderName = "Downloads";
-
-    public IndexerTests()
-        : base()
-    {
-        // create a empty file in Downloads folder
-        // to ensure that the indexer has something to search for
-        var downloadsPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\Downloads";
-        var emptyFilePath = System.IO.Path.Combine(downloadsPath, TestFileName);
-        if (!System.IO.File.Exists(emptyFilePath))
-        {
-            using (var fileStream = System.IO.File.Create(emptyFilePath))
-            {
-                var content = TestFileContent;
-                var contentBytes = Encoding.UTF8.GetBytes(content);
-                fileStream.Write(contentBytes, 0, contentBytes.Length);
-            }
-        }
-    }
-
-    public void EnterIndexerExtension()
-    {
-        SetSearchBox("files");
-
-        var searchFileItem = this.Find<NavigationViewItem>("Search files");
-        Assert.AreEqual(searchFileItem.Name, "Search files");
-        searchFileItem.DoubleClick();
-    }
-
-    [TestMethod]
-    public void BasicIndexerSearchTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox("Downloads");
-        Assert.IsNotNull(this.Find<NavigationViewItem>("Downloads"));
-    }
-
-    [TestMethod]
-    public void IndexerOpenFileTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-
-        Assert.IsNotNull(searchItem);
-
-        searchItem.Click();
-
-        var openButton = this.Find<Button>("Open");
-        Assert.IsNotNull(openButton);
-
-        openButton.Click();
-        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
-
-        Assert.IsNotNull(notepadWindow);
-    }
-
-    [TestMethod]
-    public void IndexerDoubleClickOpenFileTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-
-        Assert.IsNotNull(searchItem);
-
-        searchItem.DoubleClick();
-
-        var notepadWindow = this.Find<Window>($"{TestFileName} - Notepad", global: true);
-
-        Assert.IsNotNull(notepadWindow);
-    }
-
-    [TestMethod]
-    public void IndexerOpenFolderTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFolderName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        var openButton = this.Find<Button>("Open");
-        Assert.IsNotNull(openButton);
-
-        openButton.Click();
-        var notepadWindow = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
-
-        Assert.IsNotNull(notepadWindow);
-    }
-
-    [TestMethod]
-    public void IndexerDoubleClickOpenFolderTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFolderName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
-        Assert.IsNotNull(searchItem);
-        searchItem.DoubleClick();
-
-        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true);
-
-        Assert.IsNotNull(fileExplorer);
-    }
-
-    [TestMethod]
-    public void IndexerBrowseFolderTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFolderName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFolderName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        var openButton = this.Find<Button>("Browse");
-        Assert.IsNotNull(openButton);
-
-        openButton.Click();
-
-        var testItem = this.Find<NavigationViewItem>(TestFileName);
-        Assert.IsNotNull(testItem);
-    }
-
-    [STATestMethod]
-    [TestMethod]
-    public void IndexerCopyPathTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        OpenContextMenu();
-        var copyPathButton = this.Find<NavigationViewItem>("Copy path");
-        Assert.IsNotNull(copyPathButton);
-        copyPathButton.Click();
-
-        var clipboardContent = System.Windows.Forms.Clipboard.GetText();
-        Assert.IsTrue(clipboardContent.Contains(TestFileName), $"Clipboard content does not contain the expected file name. clipboard: {clipboardContent}");
-    }
-
-    [TestMethod]
-    public void IndexerShowInFolderTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        OpenContextMenu();
-        var showInFolderButton = this.Find<NavigationViewItem>("Show in folder");
-        Assert.IsNotNull(showInFolderButton);
-        showInFolderButton.Click();
-
-        var fileExplorer = this.Find<Window>($"{TestFolderName} - File Explorer", global: true, timeoutMS: 20000);
-
-        Assert.IsNotNull(fileExplorer);
-    }
-
-    [TestMethod]
-    public void IndexerOpenPathInConsoleTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        OpenContextMenu();
-        var copyPathButton = this.Find<NavigationViewItem>("Open path in console");
-        Assert.IsNotNull(copyPathButton);
-        copyPathButton.Click();
-
-        var textItem = this.Find<Window>("C:\\Windows\\system32\\cmd.exe", global: true);
-        Assert.IsNotNull(textItem, "The console did not open with the expected path.");
-    }
-
-    [TestMethod]
-    public void IndexerOpenPropertiesTest()
-    {
-        EnterIndexerExtension();
-        SetFilesExtensionSearchBox(TestFileName);
-
-        var searchItem = this.Find<NavigationViewItem>(TestFileName);
-        Assert.IsNotNull(searchItem);
-        searchItem.Click();
-
-        OpenContextMenu();
-        var copyPathButton = this.Find<NavigationViewItem>("Properties");
-        Assert.IsNotNull(copyPathButton);
-        copyPathButton.Click();
-
-        var propertiesWindow = this.Find<Window>($"{TestFileName} Properties", global: true);
-        Assert.IsNotNull(propertiesWindow, "The properties window did not open for the selected file.");
-    }
-}

src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.cpp

@@ -383,5 +383,4 @@ namespace winrt::Microsoft::Terminal::UI::implementation
         icon.Height(targetSize);
         return icon;
     }
-
 }

src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.h

@@ -13,7 +13,6 @@ namespace winrt::Microsoft::Terminal::UI::implementation
         static Microsoft::UI::Xaml::Controls::IconSource IconSourceMUX(const winrt::hstring& iconPath, bool convertToGrayscale, const int targetSize=24);
         static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath);
         static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath, const int targetSize);
-
     };
 }
 

src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -153,9 +153,6 @@
     <ClInclude Include="IconPathConverter.h">
       <DependentUpon>IconPathConverter.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="RunHistory.h">
-      <DependentUpon>RunHistory.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="ResourceString.h">
       <DependentUpon>ResourceString.idl</DependentUpon>
     </ClInclude>
@@ -171,9 +168,6 @@
     <ClCompile Include="IconPathConverter.cpp">
       <DependentUpon>IconPathConverter.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="RunHistory.cpp">
-      <DependentUpon>RunHistory.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="ResourceString.cpp">
       <DependentUpon>ResourceString.idl</DependentUpon>
     </ClCompile>
@@ -182,7 +176,6 @@
   <ItemGroup>
     <Midl Include="Converters.idl" />
     <Midl Include="IconPathConverter.idl" />
-    <Midl Include="RunHistory.idl" />
     <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="ResourceString.idl" />
   </ItemGroup>

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.cpp

@@ -1,87 +0,0 @@
-#include "pch.h"
-#include "RunHistory.h"
-#include "RunHistory.g.cpp"
-
-
-using namespace winrt::Windows;
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    // Run history
-    // Largely copied from the Run work circa 2022.
-
-    winrt::Windows::Foundation::Collections::IVector<hstring> RunHistory::CreateRunHistory()
-    {
-        // Load MRU history
-        std::vector<hstring> history;
-
-        wil::unique_hmodule _comctl;
-        HANDLE(WINAPI* _createMRUList)(MRUINFO* lpmi);
-        int(WINAPI* _enumMRUList)(HANDLE hMRU,int nItem,void* lpData,UINT uLen);
-        void(WINAPI *_freeMRUList)(HANDLE hMRU);
-        int(WINAPI *_addMRUString)(HANDLE hMRU, LPCWSTR szString);
-
-        // Lazy load comctl32.dll
-        // Theoretically, we could cache this into a magic static, but we shouldn't need to actually do this more than once in CmdPal
-        _comctl.reset(LoadLibraryExW(L"comctl32.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32));
-
-        _createMRUList = reinterpret_cast<decltype(_createMRUList)>(GetProcAddress(_comctl.get(), "CreateMRUListW"));
-        FAIL_FAST_LAST_ERROR_IF(!_createMRUList);
-
-        _enumMRUList = reinterpret_cast<decltype(_enumMRUList)>(GetProcAddress(_comctl.get(), "EnumMRUListW"));
-        FAIL_FAST_LAST_ERROR_IF(!_enumMRUList);
-
-        _freeMRUList = reinterpret_cast<decltype(_freeMRUList)>(GetProcAddress(_comctl.get(), "FreeMRUList"));
-        FAIL_FAST_LAST_ERROR_IF(!_freeMRUList);
-
-        _addMRUString = reinterpret_cast<decltype(_addMRUString)>(GetProcAddress(_comctl.get(), "AddMRUStringW"));
-        FAIL_FAST_LAST_ERROR_IF(!_addMRUString);
-
-        static const WCHAR c_szRunMRU[] = REGSTR_PATH_EXPLORER L"\\RunMRU";
-        MRUINFO mi = {
-            sizeof(mi),
-            26,
-            MRU_CACHEWRITE,
-            HKEY_CURRENT_USER,
-            c_szRunMRU,
-            NULL // NOTE: use default string compare
-            // since this is a GLOBAL MRU
-        };
-
-        if (const auto hMruList = _createMRUList(&mi))
-        {
-            auto freeMRUList = wil::scope_exit([=]() {
-                _freeMRUList(hMruList);
-            });
-
-            for (int nMax = _enumMRUList(hMruList, -1, NULL, 0), i = 0; i < nMax; ++i)
-            {
-                WCHAR szCommand[MAX_PATH + 2];
-
-                const auto length = _enumMRUList(hMruList, i, szCommand, ARRAYSIZE(szCommand));
-                if (length > 1)
-                {
-                    // clip off the null-terminator
-                    std::wstring_view text{ szCommand, wil::safe_cast<size_t>(length - 1) };
-//#pragma disable warning(C26493)
-#pragma warning( push )
-#pragma warning( disable : 26493 )
-                    if (text.back() == L'\\')
-                    {
-                        // old MRU format has a slash at the end with the show cmd
-                        text = { szCommand, wil::safe_cast<size_t>(length - 2) };
-#pragma warning( pop )
-                        if (text.empty())
-                        {
-                            continue;
-                        }
-                    }
-                    history.emplace_back(text);
-                }
-            }
-        }
-
-        // Update dropdown & initial value
-        return winrt::single_threaded_observable_vector<winrt::hstring>(std::move(history));
-    }
-}

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "RunHistory.g.h"
-#include "types.h"
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    struct RunHistory
-    {
-        RunHistory() = default;
-        static winrt::Windows::Foundation::Collections::IVector<hstring> CreateRunHistory();
-
-    private:
-        winrt::Windows::Foundation::Collections::IVector<hstring> _mruHistory;
-    };
-}
-
-namespace winrt::Microsoft::Terminal::UI::factory_implementation
-{
-    BASIC_FACTORY(RunHistory);
-}

src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.idl

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.UI
-{
-    static runtimeclass RunHistory
-    {
-        static Windows.Foundation.Collections.IVector<String> CreateRunHistory();
-    };
-
-}

src/modules/cmdpal/Microsoft.Terminal.UI/pch.h

@@ -64,8 +64,6 @@
 
 // WIL
 #include <wil/com.h>
-#include <wil/resource.h>
-#include <wil/safecast.h>
 #include <wil/stl.h>
 #include <wil/filesystem.h>
 // Due to the use of RESOURCE_SUPPRESS_STL in result.h, we need to include resource.h first, which happens
@@ -92,7 +90,6 @@
 
 #include <winrt/Windows.ApplicationModel.Resources.h>
 #include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
 
 #include <winrt/Windows.Graphics.Imaging.h>
 #include <Windows.Graphics.Imaging.Interop.h>

src/modules/cmdpal/Microsoft.Terminal.UI/types.h

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#define MRU_CACHEWRITE 0x0002
-#define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
-
-// https://learn.microsoft.com/en-us/windows/win32/shell/mrucmpproc
-typedef int(CALLBACK* MRUCMPPROC)(
-    LPCTSTR pString1,
-    LPCTSTR pString2);
-
-// https://learn.microsoft.com/en-us/windows/win32/shell/mruinfo
-struct MRUINFO
-{
-    DWORD cbSize;
-    UINT uMax;
-    UINT fFlags;
-    HKEY hKey;
-    LPCTSTR lpszSubKey;
-    MRUCMPPROC lpfnCompare;
-};

src/modules/cmdpal/README.md

@@ -2,15 +2,16 @@
 
 Windows Command Palette ("CmdPal") is the next iteration of PowerToys Run. With extensibility at its core, the Command Palette is your one-stop launcher to start _anything_.
 
-By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>.
+By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>. 
+
 
 ## Creating an extension
 
-The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂.
+The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂. 
 
 The official API documentation can be found [on this docs site](https://learn.microsoft.com/windows/powertoys/command-palette/extensibility-overview).
 
-We've also got samples, so that you can see how the APIs in-action.
+We've also got samples, so that you can see how the APIs in-action. 
 
 * We've got [generic samples] in the repo
 * We've got [real samples] in the repo too
@@ -21,22 +22,14 @@ We've also got samples, so that you can see how the APIs in-action.
 
 ## Building CmdPal
 
-### Install & Build PowerToys
-
-1. Follow the install and build instructions for [PowerToys](https://github.com/microsoft/PowerToys/tree/main/doc/devdocs#compiling-powertoys)
-
-### Load & Build
-
-1. In Visual Studio, in the Solution Explorer Pane, confirm that all of the files/projects in `src\modules\CommandPalette` and `src\common\CalculatorEngineCommon` do not have `(unloaded)` on the right side
-    1. If any file has `(unloaded)`, right click on file and select `Reload Project`
-1. Now you can right click on one of the project below to `Build` and then `Deploy`:
+The Command Palette is included as a part of PowerToys. To get started building, open up the root `PowerToys.sln`, to get started building. 
 
 Projects of interest are:
 * `Microsoft.CmdPal.UI`: This is the main project for CmdPal. Build and run this to get the CmdPal.
 * `Microsoft.CommandPalette.Extensions`: This is the official extension interface. 
   * This is designed to be language-agnostic. Any programming language which supports implementing WinRT interfaces should be able to implement the WinRT interface. 
 * `Microsoft.CommandPalette.Extensions.Toolkit`: This is a C# helper library for creating extensions. This makes writing extensions easier.
-* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works.
+* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works. 
 
 ### Footnotes and other links
 

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/BracketHelperTests.cs

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class BracketHelperTests
-{
-    [DataTestMethod]
-    [DataRow(null)]
-    [DataRow("")]
-    [DataRow("\t \r\n")]
-    [DataRow("none")]
-    [DataRow("()")]
-    [DataRow("(())")]
-    [DataRow("()()")]
-    [DataRow("(()())")]
-    [DataRow("([][])")]
-    [DataRow("([(()[])[](([]()))])")]
-    public void IsBracketComplete_TestValid_WhenCalled(string input)
-    {
-        // Arrange
-
-        // Act
-        var result = BracketHelper.IsBracketComplete(input);
-
-        // Assert
-        Assert.IsTrue(result);
-    }
-
-    [DataTestMethod]
-    [DataRow("((((", "only opening brackets")]
-    [DataRow("]]]", "only closing brackets")]
-    [DataRow("([)(])", "inner bracket mismatch")]
-    [DataRow(")(", "opening and closing reversed")]
-    [DataRow("(]", "mismatch in bracket type")]
-    public void IsBracketComplete_TestInvalid_WhenCalled(string input, string invalidReason)
-    {
-        // Arrange
-
-        // Act
-        var result = BracketHelper.IsBracketComplete(input);
-
-        // Assert
-        Assert.IsFalse(result, invalidReason);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/ExtendedCalculatorParserTests.cs

@@ -1,389 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class ExtendedCalculatorParserTests
-{
-    [DataTestMethod]
-    [DataRow(null)]
-    [DataRow("")]
-    [DataRow("  ")]
-    public void InputValid_ThrowError_WhenCalledNullOrEmpty(string input)
-    {
-        // Act
-        Assert.IsTrue(!CalculateHelper.InputValid(input));
-    }
-
-    [DataTestMethod]
-    [DataRow("test")]
-    [DataRow("[10,10]")] // '[10,10]' is interpreted as array by mages engine
-    public void Interpret_NoResult_WhenCalled(string input)
-    {
-        var settings = new SettingsManager();
-
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.CurrentCulture, out _);
-
-        // Assert
-        Assert.AreEqual(default(CalculateResult), result);
-    }
-
-    private static IEnumerable<object[]> Interpret_NoErrors_WhenCalledWithRounding_Data =>
-        [
-            ["2 * 2", 4M],
-            ["-2 ^ 2", -4M],
-            ["-(2 ^ 2)", -4M],
-            ["2 * pi", 6.28318530717959M],
-            ["round(2 * pi)", 6M],
-
-            // ["1 == 2", default(decimal)],
-            ["pi * ( sin ( cos ( 2)))", -1.26995475603563M],
-            ["5.6/2", 2.8M],
-            ["123 * 4.56", 560.88M],
-            ["1 - 9.0 / 10", 0.1M],
-            ["0.5 * ((2*-395.2)+198.2)", -296.1M],
-            ["2+2.11", 4.11M],
-            ["8.43 + 4.43 - 12.86", 0M],
-            ["8.43 + 4.43 - 12.8", 0.06M],
-            ["exp(5)", 148.413159102577M],
-            ["e^5", 148.413159102577M],
-            ["e*2", 5.43656365691809M],
-            ["ln(3)", 1.09861228866811M],
-            ["log(3)", 0.47712125471966M],
-            ["log2(3)", 1.58496250072116M],
-            ["log10(3)", 0.47712125471966M],
-            ["ln(e)", 1M],
-            ["cosh(0)", 1M],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_NoErrors_WhenCalledWithRounding_Data))]
-    public void Interpret_NoErrors_WhenCalledWithRounding(string input, decimal expectedResult)
-    {
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(CalculateEngine.FormatMax15Digits(expectedResult, new CultureInfo("en-US")), result.RoundedResult);
-    }
-
-    private static IEnumerable<object[]> Interpret_GreaterPrecision_WhenCalled_Data =>
-        [
-            ["0.100000000000000000000", 0.1M],
-            ["0.200000000000000000000000", 0.2M],
-        ];
-
-    [DynamicData(nameof(Interpret_GreaterPrecision_WhenCalled_Data))]
-    [DataTestMethod]
-    public void Interpret_GreaterPrecision_WhenCalled(string input, decimal expectedResult)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_DifferentCulture_WhenCalled_Data =>
-        [
-            ["4.5/3", 1.5M, "nl-NL"],
-            ["4.5/3", 1.5M, "en-EN"],
-            ["4.5/3", 1.5M, "de-DE"],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_DifferentCulture_WhenCalled_Data))]
-    public void Interpret_DifferentCulture_WhenCalled(string input, decimal expectedResult, string cultureName)
-    {
-        // Arrange
-        var cultureInfo = CultureInfo.GetCultureInfo(cultureName);
-        var settings = new SettingsManager();
-
-        // Act
-        var result = CalculateEngine.Interpret(settings, input, cultureInfo, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(CalculateEngine.Round(expectedResult), result.RoundedResult);
-    }
-
-    [DataTestMethod]
-    [DataRow("log(3)", true)]
-    [DataRow("ln(3)", true)]
-    [DataRow("log2(3)", true)]
-    [DataRow("log10(3)", true)]
-    [DataRow("log2", false)]
-    [DataRow("log10", false)]
-    [DataRow("log", false)]
-    [DataRow("ln", false)]
-    [DataRow("ceil(2 * (pi ^ 2))", true)]
-    [DataRow("((1 * 2)", false)]
-    [DataRow("(1 * 2)))", false)]
-    [DataRow("abcde", false)]
-    [DataRow("1 + 2 +", false)]
-    [DataRow("1+2*", false)]
-    [DataRow("1+2/", false)]
-    [DataRow("1+2%", false)]
-    [DataRow("1 && 3 &&", false)]
-    [DataRow("sqrt( 36)", true)]
-    [DataRow("max 4", false)]
-    [DataRow("sin(0)", true)]
-    [DataRow("sinh(1)", true)]
-    [DataRow("tanh(0)", true)]
-    [DataRow("artanh(pi/2)", true)]
-    [DataRow("cosh", false)]
-    [DataRow("cos", false)]
-    [DataRow("abs", false)]
-    [DataRow("1+1.1e3", true)]
-    [DataRow("randi(8)", true)]
-    [DataRow("randi()", false)]
-    [DataRow("randi(0.5)", true)]
-    [DataRow("rand()", true)]
-    [DataRow("rand(0.5)", false)]
-    [DataRow("0X78AD+0o123", true)]
-    [DataRow("0o9", false)]
-    public void InputValid_TestValid_WhenCalled(string input, bool valid)
-    {
-        // Act
-        var result = CalculateHelper.InputValid(input);
-
-        // Assert
-        Assert.AreEqual(valid, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("1-1")]
-    [DataRow("sin(0)")]
-    [DataRow("sinh(0)")]
-    public void Interpret_MustReturnResult_WhenResultIsZero(string input)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using InvariantCulture since this is internal
-        var result = CalculateEngine.Interpret(settings, input, CultureInfo.InvariantCulture, out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0.0M, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_MustReturnExpectedResult_WhenCalled_Data =>
-        [
-
-            // ["factorial(5)", 120M], ToDo: this don't support now
-            // ["sign(-2)", -1M],
-            // ["sign(2)", +1M],
-            ["abs(-2)", 2M],
-            ["abs(2)", 2M],
-            ["0+(1*2)/(0+1)", 2M], // Validate that division by "(0+1)" is not interpret as division by zero.
-            ["0+(1*2)/0.5", 4M], // Validate that division by number with decimal digits is not interpret as division by zero.
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_MustReturnExpectedResult_WhenCalled_Data))]
-    public void Interpret_MustReturnExpectedResult_WhenCalled(string input, decimal expectedResult)
-    {
-        // Arrange
-        var settings = new SettingsManager();
-
-        // Act
-        // Using en-us culture to have a fixed number style
-        var result = CalculateEngine.Interpret(settings, input, new CultureInfo("en-us", false), out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    private static IEnumerable<object[]> Interpret_TestScientificNotation_WhenCalled_Data =>
-        [
-            ["0.2E1", "en-US", 2M],
-            ["0,2E1", "pt-PT", 2M],
-        ];
-
-    [DataTestMethod]
-    [DynamicData(nameof(Interpret_TestScientificNotation_WhenCalled_Data))]
-    public void Interpret_TestScientificNotation_WhenCalled(string input, string sourceCultureName, decimal expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-        var settings = new SettingsManager();
-
-        // Act
-        // Using en-us culture to have a fixed number style
-        var translatedInput = translator.Translate(input);
-        var result = CalculateEngine.Interpret(settings, translatedInput, new CultureInfo("en-US", false), out _);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result.Result);
-    }
-
-    [DataTestMethod]
-    [DataRow("sin(90)", "sin((pi / 180) * (90))")]
-    [DataRow("arcsin(0.5)", "(180 / pi) * (arcsin(0.5))")]
-    [DataRow("sin(sin(30))", "sin((pi / 180) * (sin((pi / 180) * (30))))")]
-    [DataRow("cos(tan(45))", "cos((pi / 180) * (tan((pi / 180) * (45))))")]
-    [DataRow("arctan(sin(30))", "(180 / pi) * (arctan(sin((pi / 180) * (30))))")]
-    [DataRow("sin(cos(tan(30)))", "sin((pi / 180) * (cos((pi / 180) * (tan((pi / 180) * (30))))))")]
-    [DataRow("sin(arcsin(0.5))", "sin((pi / 180) * ((180 / pi) * (arcsin(0.5))))")]
-    [DataRow("sin(30) + cos(60)", "sin((pi / 180) * (30)) + cos((pi / 180) * (60))")]
-    [DataRow("sin(30 + 15)", "sin((pi / 180) * (30 + 15))")]
-    [DataRow("sin(45) * cos(45) - tan(30)", "sin((pi / 180) * (45)) * cos((pi / 180) * (45)) - tan((pi / 180) * (30))")]
-    [DataRow("arcsin(arccos(0.5))", "(180 / pi) * (arcsin((180 / pi) * (arccos(0.5))))")]
-    [DataRow("sin(sin(sin(30)))", "sin((pi / 180) * (sin((pi / 180) * (sin((pi / 180) * (30))))))")]
-    [DataRow("log(10)", "log(10)")]
-    [DataRow("sin(30) + pi", "sin((pi / 180) * (30)) + pi")]
-    [DataRow("sin(-30)", "sin((pi / 180) * (-30))")]
-    [DataRow("sin((30))", "sin((pi / 180) * ((30)))")]
-    [DataRow("arcsin(1) * 2", "(180 / pi) * (arcsin(1)) * 2")]
-    [DataRow("cos(1/2)", "cos((pi / 180) * (1/2))")]
-    [DataRow("sin ( 90 )", "sin ((pi / 180) * ( 90 ))")]
-    [DataRow("cos(arcsin(sin(45)))", "cos((pi / 180) * ((180 / pi) * (arcsin(sin((pi / 180) * (45))))))")]
-    public void UpdateTrigFunctions_Degrees(string input, string expectedResult)
-    {
-        // Call UpdateTrigFunctions in degrees mode
-        var result = CalculateHelper.UpdateTrigFunctions(input, CalculateEngine.TrigMode.Degrees);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("sin(90)", "sin((pi / 200) * (90))")]
-    [DataRow("arcsin(0.5)", "(200 / pi) * (arcsin(0.5))")]
-    [DataRow("sin(sin(30))", "sin((pi / 200) * (sin((pi / 200) * (30))))")]
-    [DataRow("cos(tan(45))", "cos((pi / 200) * (tan((pi / 200) * (45))))")]
-    [DataRow("arctan(sin(30))", "(200 / pi) * (arctan(sin((pi / 200) * (30))))")]
-    [DataRow("sin(cos(tan(30)))", "sin((pi / 200) * (cos((pi / 200) * (tan((pi / 200) * (30))))))")]
-    [DataRow("sin(arcsin(0.5))", "sin((pi / 200) * ((200 / pi) * (arcsin(0.5))))")]
-    [DataRow("sin(30) + cos(60)", "sin((pi / 200) * (30)) + cos((pi / 200) * (60))")]
-    [DataRow("sin(30 + 15)", "sin((pi / 200) * (30 + 15))")]
-    [DataRow("sin(45) * cos(45) - tan(30)", "sin((pi / 200) * (45)) * cos((pi / 200) * (45)) - tan((pi / 200) * (30))")]
-    [DataRow("arcsin(arccos(0.5))", "(200 / pi) * (arcsin((200 / pi) * (arccos(0.5))))")]
-    [DataRow("sin(sin(sin(30)))", "sin((pi / 200) * (sin((pi / 200) * (sin((pi / 200) * (30))))))")]
-    [DataRow("log(10)", "log(10)")]
-    [DataRow("sin(30) + pi", "sin((pi / 200) * (30)) + pi")]
-    [DataRow("sin(-30)", "sin((pi / 200) * (-30))")]
-    [DataRow("sin((30))", "sin((pi / 200) * ((30)))")]
-    [DataRow("arcsin(1) * 2", "(200 / pi) * (arcsin(1)) * 2")]
-    [DataRow("cos(1/2)", "cos((pi / 200) * (1/2))")]
-    [DataRow("sin ( 90 )", "sin ((pi / 200) * ( 90 ))")]
-    [DataRow("cos(arcsin(sin(45)))", "cos((pi / 200) * ((200 / pi) * (arcsin(sin((pi / 200) * (45))))))")]
-    public void UpdateTrigFunctions_Gradians(string input, string expectedResult)
-    {
-        // Call UpdateTrigFunctions in gradians mode
-        var result = CalculateHelper.UpdateTrigFunctions(input, CalculateEngine.TrigMode.Gradians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(180 / pi) * (30)")]
-    [DataRow("rad( 30 )", "(180 / pi) * ( 30 )")]
-    [DataRow("deg(30)", "(30)")]
-    [DataRow("grad(30)", "(9 / 10) * (30)")]
-    [DataRow("rad(  30)", "(180 / pi) * (  30)")]
-    [DataRow("rad(30  )", "(180 / pi) * (30  )")]
-    [DataRow("rad(  30  )", "(180 / pi) * (  30  )")]
-    [DataRow("rad(deg(30))", "(180 / pi) * ((30))")]
-    [DataRow("deg(rad(30))", "((180 / pi) * (30))")]
-    [DataRow("grad(rad(30))", "(9 / 10) * ((180 / pi) * (30))")]
-    [DataRow("rad(grad(30))", "(180 / pi) * ((9 / 10) * (30))")]
-    [DataRow("rad(30) + deg(45)", "(180 / pi) * (30) + (45)")]
-    [DataRow("sin(rad(30))", "sin((180 / pi) * (30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( (180 / pi) * ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan((180 / pi) * ((9 / 10) * (90)))")]
-    [DataRow("rad(30) + rad(45)", "(180 / pi) * (30) + (180 / pi) * (45)")]
-    [DataRow("rad(30) * grad(90)", "(180 / pi) * (30) * (9 / 10) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(180 / pi) * (30)/(180 / pi) * (45)")]
-    public void ExpandTrigConversions_Degrees(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in degrees mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Degrees);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(30)")]
-    [DataRow("rad( 30 )", "( 30 )")]
-    [DataRow("deg(30)", "(pi / 180) * (30)")]
-    [DataRow("grad(30)", "(pi / 200) * (30)")]
-    [DataRow("rad(  30)", "(  30)")]
-    [DataRow("rad(30  )", "(30  )")]
-    [DataRow("rad(  30  )", "(  30  )")]
-    [DataRow("rad(deg(30))", "((pi / 180) * (30))")]
-    [DataRow("deg(rad(30))", "(pi / 180) * ((30))")]
-    [DataRow("grad(rad(30))", "(pi / 200) * ((30))")]
-    [DataRow("rad(grad(30))", "((pi / 200) * (30))")]
-    [DataRow("rad(30) + deg(45)", "(30) + (pi / 180) * (45)")]
-    [DataRow("sin(rad(30))", "sin((30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan(((pi / 200) * (90)))")]
-    [DataRow("rad(30) + rad(45)", "(30) + (45)")]
-    [DataRow("rad(30) * grad(90)", "(30) * (pi / 200) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(30)/(45)")]
-    public void ExpandTrigConversions_Radians(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in radians mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Radians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("rad(30)", "(200 / pi) * (30)")]
-    [DataRow("rad( 30 )", "(200 / pi) * ( 30 )")]
-    [DataRow("deg(30)", "(10 / 9) * (30)")]
-    [DataRow("grad(30)", "(30)")]
-    [DataRow("rad(  30)", "(200 / pi) * (  30)")]
-    [DataRow("rad(30  )", "(200 / pi) * (30  )")]
-    [DataRow("rad(  30  )", "(200 / pi) * (  30  )")]
-    [DataRow("rad(deg(30))", "(200 / pi) * ((10 / 9) * (30))")]
-    [DataRow("deg(rad(30))", "(10 / 9) * ((200 / pi) * (30))")]
-    [DataRow("grad(rad(30))", "((200 / pi) * (30))")]
-    [DataRow("rad(grad(30))", "(200 / pi) * ((30))")]
-    [DataRow("rad(30) + deg(45)", "(200 / pi) * (30) + (10 / 9) * (45)")]
-    [DataRow("sin(rad(30))", "sin((200 / pi) * (30))")]
-    [DataRow("cos( rad( 45 ) )", "cos( (200 / pi) * ( 45 ) )")]
-    [DataRow("tan(rad(grad(90)))", "tan((200 / pi) * ((90)))")]
-    [DataRow("rad(30) + rad(45)", "(200 / pi) * (30) + (200 / pi) * (45)")]
-    [DataRow("rad(30) * grad(90)", "(200 / pi) * (30) * (90)")]
-    [DataRow("rad(30)/rad(45)", "(200 / pi) * (30)/(200 / pi) * (45)")]
-    public void ExpandTrigConversions_Gradians(string input, string expectedResult)
-    {
-        // Call ExpandTrigConversions in gradians mode
-        var result = CalculateHelper.ExpandTrigConversions(input, CalculateEngine.TrigMode.Gradians);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/Microsoft.CmdPal.Ext.Calc.UnitTests.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-		<RootNamespace>Microsoft.CmdPal.Ext.Calc.UnitTests</RootNamespace>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Moq" />
-		<PackageReference Include="MSTest" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
-	</ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/NumberTranslatorTests.cs

@@ -1,185 +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.Globalization;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class NumberTranslatorTests
-{
-    [DataTestMethod]
-    [DataRow(null, "en-US")]
-    [DataRow("de-DE", null)]
-    public void Create_ThrowError_WhenCalledNullOrEmpty(string sourceCultureName, string targetCultureName)
-    {
-        // Arrange
-        CultureInfo sourceCulture = sourceCultureName != null ? new CultureInfo(sourceCultureName) : null;
-        CultureInfo targetCulture = targetCultureName != null ? new CultureInfo(targetCultureName) : null;
-
-        // Act
-        Assert.ThrowsException<ArgumentNullException>(() => NumberTranslator.Create(sourceCulture, targetCulture));
-    }
-
-    [DataTestMethod]
-    [DataRow("en-US", "en-US")]
-    [DataRow("en-EN", "en-US")]
-    [DataRow("de-DE", "en-US")]
-    public void Create_WhenCalled(string sourceCultureName, string targetCultureName)
-    {
-        // Arrange
-        CultureInfo sourceCulture = new CultureInfo(sourceCultureName);
-        CultureInfo targetCulture = new CultureInfo(targetCultureName);
-
-        // Act
-        var translator = NumberTranslator.Create(sourceCulture, targetCulture);
-
-        // Assert
-        Assert.IsNotNull(translator);
-    }
-
-    [DataTestMethod]
-    [DataRow(null)]
-    public void Translate_ThrowError_WhenCalledNull(string input)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        Assert.ThrowsException<ArgumentNullException>(() => translator.Translate(input));
-    }
-
-    [DataTestMethod]
-    [DataRow("")]
-    [DataRow(" ")]
-    public void Translate_WhenCalledEmpty(string input)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.AreEqual(input, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("2,0 * 2", "2.0 * 2")]
-    [DataRow("4 * 3,6 + 9", "4 * 3.6 + 9")]
-    [DataRow("5,2+6", "5.2+6")]
-    [DataRow("round(2,5)", "round(2.5)")]
-    [DataRow("3,3333", "3.3333")]
-    [DataRow("max(2;3)", "max(2,3)")]
-    public void Translate_NoErrors_WhenCalled(string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("2.0 * 2", "2,0 * 2")]
-    [DataRow("4 * 3.6 + 9", "4 * 3,6 + 9")]
-    [DataRow("5.2+6", "5,2+6")]
-    [DataRow("round(2.5)", "round(2,5)")]
-    [DataRow("3.3333", "3,3333")]
-    public void TranslateBack_NoErrors_WhenCalled(string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo("de-DE", false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.TranslateBack(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow(".", ",", "2,000,000", "2000000")]
-    [DataRow(".", ",", "2,000,000.6", "2000000.6")]
-    [DataRow(",", ".", "2.000.000", "2000000")]
-    [DataRow(",", ".", "2.000.000,6", "2000000.6")]
-    public void Translate_RemoveNumberGroupSeparator_WhenCalled(string decimalSeparator, string groupSeparator, string input, string expectedResult)
-    {
-        // Arrange
-        var sourceCulture = new CultureInfo("en-US", false)
-        {
-            NumberFormat =
-            {
-                NumberDecimalSeparator = decimalSeparator,
-                NumberGroupSeparator = groupSeparator,
-            },
-        };
-        var translator = NumberTranslator.Create(sourceCulture, new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("de-DE", "12,0004", "12.0004")]
-    [DataRow("de-DE", "0xF000", "61440")]
-    [DataRow("de-DE", "0", "0")]
-    [DataRow("de-DE", "00", "0")]
-    [DataRow("de-DE", "12.004", "12004")] // . is the group separator in de-DE
-    [DataRow("de-DE", "12.04", "1204")]
-    [DataRow("de-DE", "12.4", "124")]
-    [DataRow("de-DE", "3.004.044.444,05", "3004044444.05")]
-    [DataRow("de-DE", "123.01 + 52.30", "12301 + 5230")]
-    [DataRow("de-DE", "123.001 + 52.30", "123001 + 5230")]
-    [DataRow("fr-FR", "0", "0")]
-    [DataRow("fr-FR", "00", "0")]
-    [DataRow("fr-FR", "12.004", "12.004")] // . is not decimal or group separator in fr-FR
-    [DataRow("fr-FR", "12.04", "12.04")]
-    [DataRow("fr-FR", "12.4", "12.4")]
-    [DataRow("fr-FR", "12.0004", "12.0004")]
-
-    // [DataRow("fr-FR", "123.01 + 52.30", "123.01 + 52.30")]
-    // [DataRow("fr-FR", "123.001 + 52.30", "123.001 + 52.30")] passed locally, failed in CI
-    public void Translate_NoRemovalOfLeadingZeroesOnEdgeCases(string sourceCultureName, string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-
-    [DataTestMethod]
-    [DataRow("en-US", "0xF000", "61440")]
-    [DataRow("en-US", "0xf4572220", "4099351072")]
-    [DataRow("en-US", "0x12345678", "305419896")]
-    public void Translate_LargeHexadecimalNumbersToDecimal(string sourceCultureName, string input, string expectedResult)
-    {
-        // Arrange
-        var translator = NumberTranslator.Create(new CultureInfo(sourceCultureName, false), new CultureInfo("en-US", false));
-
-        // Act
-        var result = translator.Translate(input);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(expectedResult, result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/BasicStructureTest.cs

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class BasicStructureTest
-{
-    [TestMethod]
-    public void CanCreateTestClass()
-    {
-        // This is a basic test to verify the test project structure is correct
-        Assert.IsTrue(true);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/KeyNameTest.cs

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Ext.Registry.Constants;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class KeyNameTest
-{
-    [TestMethod]
-    [DataRow("HKEY", KeyName.FirstPart)]
-    [DataRow("HKEY_", KeyName.FirstPartUnderscore)]
-    [DataRow("HKCR", KeyName.ClassRootShort)]
-    [DataRow("HKCC", KeyName.CurrentConfigShort)]
-    [DataRow("HKCU", KeyName.CurrentUserShort)]
-    [DataRow("HKLM", KeyName.LocalMachineShort)]
-    [DataRow("HKPD", KeyName.PerformanceDataShort)]
-    [DataRow("HKU", KeyName.UsersShort)]
-    public void TestConstants(string shortName, string baseName)
-    {
-        Assert.AreEqual(shortName, baseName);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/Microsoft.CmdPal.Ext.Registry.UnitTests.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.Registry.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/QueryHelperTest.cs

@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class QueryHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKLM", false, @"HKLM", "")]
-    [DataRow(@"HKLM\", false, @"HKLM\", "")]
-    [DataRow(@"HKLM\\", true, @"HKLM", "")]
-    [DataRow(@"HKLM\\Test", true, @"HKLM", "Test")]
-    [DataRow(@"HKLM\Test\\TestTest", true, @"HKLM\Test", "TestTest")]
-    [DataRow(@"HKLM\Test\\\TestTest", true, @"HKLM\Test", @"\TestTest")]
-    [DataRow("HKLM/\"Software\"/", false, @"HKLM\Software\", "")]
-    [DataRow("HKLM/\"Software\"//test", true, @"HKLM\Software", "test")]
-    [DataRow("HKLM/\"Software\"//test/123", true, @"HKLM\Software", "test/123")]
-    [DataRow("HKLM/\"Software\"//test\\123", true, @"HKLM\Software", @"test\123")]
-    [DataRow("HKLM/\"Software\"/test", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\Software\\\"test\"", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"", false, @"HKLM\Software\test", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test/software\"", false, @"HKLM\Software\test/software", "")]
-    [DataRow("HKLM\\\"Software\"/\"test\"\\hello", false, @"HKLM\Software\test\hello", "")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"\\hello\\\\\"some/value\"", true, @"HKLM\Software\test\hello", "some/value")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"/hello\\\\\"some/value\"", true, @"HKLM\Software\test\hello", "some/value")]
-    [DataRow("HKLM\\\"Software\"\\\"test\"\\hello\\\\some\\value", true, @"HKLM\Software\test\hello", @"some\value")]
-    public void GetQueryPartsTest(string query, bool expectedHasValueName, string expectedQueryKey, string expectedQueryValueName)
-    {
-        var hasValueName = QueryHelper.GetQueryParts(query, out var queryKey, out var queryValueName);
-
-        Assert.AreEqual(expectedHasValueName, hasValueName);
-        Assert.AreEqual(expectedQueryKey, queryKey);
-        Assert.AreEqual(expectedQueryValueName, queryValueName);
-    }
-
-    [TestMethod]
-    [DataRow(@"HKCR\*\OpenWithList", @"HKEY_CLASSES_ROOT\*\OpenWithList")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", @"HKEY_CURRENT_USER\Control Panel\Accessibility")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", @"HKEY_LOCAL_MACHINE\HARDWARE\UEFI")]
-    [DataRow(@"HKU\.DEFAULT\Environment", @"HKEY_USERS\.DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control")]
-    [DataRow(@"HKPD\???", @"HKEY_PERFORMANCE_DATA\???")]
-    public void GetShortBaseKeyTest(string registryKeyShort, string registryKeyFull)
-    {
-        Assert.AreEqual(registryKeyShort, QueryHelper.GetKeyWithShortBaseKey(registryKeyFull));
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/RegistryHelperTest.cs

@@ -1,75 +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.Linq;
-
-using Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class RegistryHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", "HKEY_CURRENT_CONFIG")]
-    [DataRow(@"HKCR\*\OpenWithList", "HKEY_CLASSES_ROOT")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", "HKEY_CURRENT_USER")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", "HKEY_LOCAL_MACHINE")]
-    [DataRow(@"HKPD\???", "HKEY_PERFORMANCE_DATA")]
-    [DataRow(@"HKU\.DEFAULT\Environment", "HKEY_USERS")]
-    public void GetRegistryBaseKeyTestOnlyOneBaseKey(string query, string expectedBaseKey)
-    {
-        var (baseKeyList, _) = RegistryHelper.GetRegistryBaseKey(query);
-        Assert.IsNotNull(baseKeyList);
-        Assert.IsTrue(baseKeyList.Count() == 1);
-        Assert.AreEqual(expectedBaseKey, baseKeyList.First().Name);
-    }
-
-    [TestMethod]
-    public void GetRegistryBaseKeyTestMoreThanOneBaseKey()
-    {
-        var (baseKeyList, _) = RegistryHelper.GetRegistryBaseKey("HKC\\Control Panel\\Accessibility"); /* #no-spell-check-line */
-
-        Assert.IsNotNull(baseKeyList);
-        Assert.IsTrue(baseKeyList.Count() > 1);
-
-        var list = baseKeyList.Select(found => found.Name);
-        Assert.IsTrue(list.Contains("HKEY_CLASSES_ROOT"));
-        Assert.IsTrue(list.Contains("HKEY_CURRENT_CONFIG"));
-        Assert.IsTrue(list.Contains("HKEY_CURRENT_USER"));
-    }
-
-    [TestMethod]
-    [DataRow(@"HKCR\*\OpenWithList", @"*\OpenWithList")]
-    [DataRow(@"HKCU\Control Panel\Accessibility", @"Control Panel\Accessibility")]
-    [DataRow(@"HKLM\HARDWARE\UEFI", @"HARDWARE\UEFI")]
-    [DataRow(@"HKU\.DEFAULT\Environment", @".DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"System\CurrentControlSet\Control")]
-    [DataRow(@"HKPD\???", @"???")]
-    public void GetRegistryBaseKeyTestSubKey(string query, string expectedSubKey)
-    {
-        var (_, subKey) = RegistryHelper.GetRegistryBaseKey(query);
-        Assert.AreEqual(expectedSubKey, subKey);
-    }
-
-    [TestMethod]
-    public void GetAllBaseKeysTest()
-    {
-        var list = RegistryHelper.GetAllBaseKeys();
-
-        CollectionAssert.AllItemsAreNotNull((ICollection)list);
-        CollectionAssert.AllItemsAreUnique((ICollection)list);
-
-        var keys = list.Select(found => found.Key).ToList() as ICollection;
-
-        CollectionAssert.Contains(keys, Win32.Registry.ClassesRoot);
-        CollectionAssert.Contains(keys, Win32.Registry.CurrentConfig);
-        CollectionAssert.Contains(keys, Win32.Registry.CurrentUser);
-        CollectionAssert.Contains(keys, Win32.Registry.LocalMachine);
-        CollectionAssert.Contains(keys, Win32.Registry.PerformanceData);
-        CollectionAssert.Contains(keys, Win32.Registry.Users);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Registry.UnitTests/ResultHelperTest.cs

@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CmdPal.Ext.Registry.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Registry.UnitTests;
-
-[TestClass]
-public class ResultHelperTest
-{
-    [TestMethod]
-    [DataRow(@"HKEY_CLASSES_ROOT\*\OpenWithList", @"HKEY_CLASSES_ROOT\*\OpenWithList")]
-    [DataRow(@"HKEY_CURRENT_USER\Control Panel\Accessibility", @"HKEY_CURRENT_USER\Control Panel\Accessibility")]
-    [DataRow(@"HKEY_LOCAL_MACHINE\HARDWARE\UEFI", @"HKEY_LOCAL_MACHINE\HARDWARE\UEFI")]
-    [DataRow(@"HKEY_USERS\.DEFAULT\Environment", @"HKEY_USERS\.DEFAULT\Environment")]
-    [DataRow(@"HKCC\System\CurrentControlSet\Control", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control")]
-    [DataRow(@"HKEY_PERFORMANCE_DATA\???", @"HKEY_PERFORMANCE_DATA\???")]
-    [DataRow(@"HKCR\*\shell\Open with VS Code\command", @"HKEY_CLASSES_ROOT\*\shell\Open with VS Code\command")]
-    [DataRow(@"...ndows\CurrentVersion\Explorer\StartupApproved", @"HKEY_CURRENT_USER\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved")]
-    [DataRow(@"...p\Upgrade\NetworkDriverBackup\Control\Network", @"HKEY_LOCAL_MACHINE\SYSTEM\Setup\Upgrade\NetworkDriverBackup\Control\Network")]
-    [DataRow(@"...anel\International\User Profile System Backup", @"HKEY_USERS\.DEFAULT\Control Panel\International\User Profile System Backup")]
-    [DataRow(@"...stem\CurrentControlSet\Control\Print\Printers", @"HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control\Print\Printers")]
-    public void GetTruncatedTextTest_StandardCases(string registryKeyShort, string registryKeyFull)
-    {
-        Assert.AreEqual(registryKeyShort, ResultHelper.GetTruncatedText(registryKeyFull, 45));
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/BasicTests.cs

@@ -1,84 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class BasicTests
-{
-    [TestMethod]
-    public void CommandsHelperTest()
-    {
-        // Setup & Act
-        var commands = Commands.GetSystemCommands(false, false, false, false);
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Count > 0);
-    }
-
-    [TestMethod]
-    public void IconsHelperTest()
-    {
-        // Assert
-        Assert.IsNotNull(Icons.FirmwareSettingsIcon);
-        Assert.IsNotNull(Icons.LockIcon);
-        Assert.IsNotNull(Icons.LogoffIcon);
-        Assert.IsNotNull(Icons.NetworkAdapterIcon);
-        Assert.IsNotNull(Icons.RecycleBinIcon);
-        Assert.IsNotNull(Icons.RestartIcon);
-        Assert.IsNotNull(Icons.RestartShellIcon);
-        Assert.IsNotNull(Icons.ShutdownIcon);
-        Assert.IsNotNull(Icons.SleepIcon);
-    }
-
-    [TestMethod]
-    public void Win32HelpersTest()
-    {
-        // Setup & Act
-        // These methods should not throw exceptions
-        var firmwareType = Win32Helpers.GetSystemFirmwareType();
-
-        // Assert
-        // Just testing that they don't throw exceptions
-        Assert.IsTrue(Enum.IsDefined(typeof(FirmwareType), firmwareType));
-    }
-
-    [TestMethod]
-    public void NetworkConnectionPropertiesTest()
-    {
-        // Test that network connection properties can be accessed without throwing exceptions
-        try
-        {
-            var networkPropertiesList = NetworkConnectionProperties.GetList();
-
-            // If we have network connections, test accessing their properties
-            if (networkPropertiesList.Count > 0)
-            {
-                var networkProperties = networkPropertiesList[0];
-
-                // Access properties (these used to be methods)
-                var ipv4 = networkProperties.IPv4;
-                var ipv6 = networkProperties.IPv6Primary;
-                var macAddress = networkProperties.PhysicalAddress;
-
-                // Test passes if no exceptions are thrown
-                Assert.IsTrue(true);
-            }
-            else
-            {
-                // If no network connections, test still passes
-                Assert.IsTrue(true);
-            }
-        }
-        catch
-        {
-            Assert.Fail("Network properties should not throw exceptions");
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/ImageTests.cs

@@ -1,72 +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.Linq;
-using System.Reflection;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.CmdPal.Ext.System.Pages;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class ImageTests
-{
-    [DataTestMethod]
-    [DataRow("shutdown", "ShutdownIcon")]
-    [DataRow("restart", "RestartIcon")]
-    [DataRow("sign out", "LogoffIcon")]
-    [DataRow("lock", "LockIcon")]
-    [DataRow("sleep", "SleepIcon")]
-    [DataRow("hibernate", "SleepIcon")]
-    [DataRow("recycle bin", "RecycleBinIcon")]
-    [DataRow("uefi firmware settings", "FirmwareSettingsIcon")]
-    [DataRow("IPv4 addr", "NetworkAdapterIcon")]
-    [DataRow("IPV6 addr", "NetworkAdapterIcon")]
-    [DataRow("MAC addr", "NetworkAdapterIcon")]
-    public void IconThemeDarkTest(string typedString, string expectedIconPropertyName)
-    {
-        var systemPage = new SystemCommandPage(new SettingsManager());
-
-        foreach (var item in systemPage.GetItems())
-        {
-            if (item.Title.Contains(typedString, StringComparison.OrdinalIgnoreCase) || item.Subtitle.Contains(typedString, StringComparison.OrdinalIgnoreCase))
-            {
-                var icon = item.Icon;
-                Assert.IsNotNull(icon, $"Icon for '{typedString}' should not be null.");
-                Assert.IsNotEmpty(icon.Dark.Icon, $"Icon for '{typedString}' should not be empty.");
-            }
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow("shutdown", "ShutdownIcon")]
-    [DataRow("restart", "RestartIcon")]
-    [DataRow("sign out", "LogoffIcon")]
-    [DataRow("lock", "LockIcon")]
-    [DataRow("sleep", "SleepIcon")]
-    [DataRow("hibernate", "SleepIcon")]
-    [DataRow("recycle bin", "RecycleBinIcon")]
-    [DataRow("uefi firmware settings", "FirmwareSettingsIcon")]
-    [DataRow("IPv4 addr", "NetworkAdapterIcon")]
-    [DataRow("IPV6 addr", "NetworkAdapterIcon")]
-    [DataRow("MAC addr", "NetworkAdapterIcon")]
-    public void IconThemeLightTest(string typedString, string expectedIconPropertyName)
-    {
-        var systemPage = new SystemCommandPage(new SettingsManager());
-
-        foreach (var item in systemPage.GetItems())
-        {
-            if (item.Title.Contains(typedString, StringComparison.OrdinalIgnoreCase) || item.Subtitle.Contains(typedString, StringComparison.OrdinalIgnoreCase))
-            {
-                var icon = item.Icon;
-                Assert.IsNotNull(icon, $"Icon for '{typedString}' should not be null.");
-                Assert.IsNotEmpty(icon.Light.Icon, $"Icon for '{typedString}' should not be empty.");
-            }
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/Microsoft.CmdPal.Ext.System.UnitTests.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.System.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
-    <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs

@@ -1,105 +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.Linq;
-using Microsoft.CmdPal.Ext.System.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.System.UnitTests;
-
-[TestClass]
-public class QueryTests
-{
-    [DataTestMethod]
-    [DataRow("shutdown", "Shutdown")]
-    [DataRow("restart", "Restart")]
-    [DataRow("sign out", "Sign out")]
-    [DataRow("lock", "Lock")]
-    [DataRow("sleep", "Sleep")]
-    [DataRow("hibernate", "Hibernate")]
-    public void SystemCommandsTest(string typedString, string expectedCommand)
-    {
-        // Setup
-        var commands = Commands.GetSystemCommands(false, false, false, false);
-
-        // Act
-        var result = commands.Where(c => c.Title.Contains(expectedCommand, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.IsTrue(result.Title.Contains(expectedCommand, StringComparison.OrdinalIgnoreCase));
-    }
-
-    [TestMethod]
-    public void RecycleBinCommandTest()
-    {
-        // Setup
-        var commands = Commands.GetSystemCommands(false, false, false, false);
-
-        // Act
-        var result = commands.Where(c => c.Title.Contains("Recycle", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-        // Assert
-        Assert.IsNotNull(result);
-    }
-
-    [TestMethod]
-    public void NetworkCommandsTest()
-    {
-        // Test that network commands can be retrieved
-        try
-        {
-            var networkPropertiesList = NetworkConnectionProperties.GetList();
-            Assert.IsTrue(networkPropertiesList.Count >= 0); // Should not throw exceptions
-        }
-        catch (Exception ex)
-        {
-            Assert.Fail($"Network commands should not throw exceptions: {ex.Message}");
-        }
-    }
-
-    [TestMethod]
-    public void UefiCommandIsAvailableTest()
-    {
-        // Setup
-        var firmwareType = Win32Helpers.GetSystemFirmwareType();
-        var isUefiMode = firmwareType == FirmwareType.Uefi;
-
-        // Act
-        var commands = Commands.GetSystemCommands(isUefiMode, false, false, false);
-        var uefiCommand = commands.Where(c => c.Title.Contains("UEFI", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-        // Assert
-        if (isUefiMode)
-        {
-            Assert.IsNotNull(uefiCommand);
-        }
-        else
-        {
-            // UEFI command may still exist but be disabled on non-UEFI systems
-            Assert.IsTrue(true); // Test environment independent
-        }
-    }
-
-    [TestMethod]
-    public void FirmwareTypeTest()
-    {
-        // Test that GetSystemFirmwareType returns a valid enum value
-        var firmwareType = Win32Helpers.GetSystemFirmwareType();
-        Assert.IsTrue(Enum.IsDefined(typeof(FirmwareType), firmwareType));
-    }
-
-    [TestMethod]
-    public void EmptyRecycleBinCommandTest()
-    {
-        // Test that empty recycle bin command exists
-        var commands = Commands.GetSystemCommands(false, false, false, false);
-        var result = commands.Where(c => c.Title.Contains("Empty", StringComparison.OrdinalIgnoreCase) &&
-                                         c.Title.Contains("Recycle", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-
-        // Empty recycle bin command should exist
-        Assert.IsNotNull(result);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/AvailableResultsListTests.cs

@@ -1,494 +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.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class AvailableResultsListTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void CleanUp()
-    {
-        // Set culture to original value
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    private DateTime GetDateTimeForTest(bool embedUtc = false)
-    {
-        var dateTime = new DateTime(2022, 03, 02, 22, 30, 45);
-        if (embedUtc)
-        {
-            return DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
-        }
-        else
-        {
-            return dateTime;
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30 PM")]
-    [DataRow("date", "3/2/2022")]
-    [DataRow("date and time", "3/2/2022 10:30 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithShortTimeAndShortDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, false, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value, $"Culture {CultureInfo.CurrentCulture.Name}, Culture UI: {CultureInfo.CurrentUICulture.Name}, Calendar: {CultureInfo.CurrentCulture.Calendar}, Region: {RegionInfo.CurrentRegion.Name}");
-    }
-
-    [TestMethod]
-    public void GetList_WithKeywordSearch_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return at least some results for keyword search");
-    }
-
-    [TestMethod]
-    public void GetList_WithoutKeywordSearch_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(false, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return at least some results for non-keyword search");
-    }
-
-    [TestMethod]
-    public void GetList_WithSpecificDateTime_ReturnsFormattedResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var specificDateTime = GetDateTimeForTest();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings, null, null, specificDateTime);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should return results for specific datetime");
-
-        // Verify that all results have values
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.Label, "Result label should not be null");
-            Assert.IsNotNull(result.Value, "Result value should not be null");
-        }
-    }
-
-    [TestMethod]
-    public void GetList_ResultsHaveRequiredProperties()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsTrue(results.Count > 0, "Should have results");
-
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.Label, "Each result should have a label");
-            Assert.IsNotNull(result.Value, "Each result should have a value");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.Label), "Label should not be empty");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.Value), "Value should not be empty");
-        }
-    }
-
-    [TestMethod]
-    public void GetList_WithDifferentCalendarSettings_ReturnsResults()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act & Assert - Test with different settings
-        var results1 = AvailableResultsList.GetList(true, settings);
-        Assert.IsNotNull(results1);
-        Assert.IsTrue(results1.Count > 0);
-
-        // Test that the method can handle different calendar settings
-        var results2 = AvailableResultsList.GetList(false, settings);
-        Assert.IsNotNull(results2);
-        Assert.IsTrue(results2.Count > 0);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30 PM")]
-    [DataRow("date", "Wednesday, March 2, 2022")]
-    [DataRow("date and time", "Wednesday, March 2, 2022 10:30 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithShortTimeAndLongDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, true, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30:45 PM")]
-    [DataRow("date", "3/2/2022")]
-    [DataRow("date and time", "3/2/2022 10:30:45 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithLongTimeAndShortDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, false, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "10:30:45 PM")]
-    [DataRow("date", "Wednesday, March 2, 2022")]
-    [DataRow("date and time", "Wednesday, March 2, 2022 10:30:45 PM")]
-    [DataRow("hour", "22")]
-    [DataRow("minute", "30")]
-    [DataRow("second", "45")]
-    [DataRow("millisecond", "0")]
-    [DataRow("day (week day)", "Wednesday")]
-    [DataRow("day of the week (week day)", "4")]
-    [DataRow("day of the month", "2")]
-    [DataRow("day of the year", "61")]
-    [DataRow("week of the month", "1")]
-    [DataRow("week of the year (calendar week, week number)", "10")]
-    [DataRow("month", "March")]
-    [DataRow("month of the year", "3")]
-    [DataRow("month and day", "March 2")]
-    [DataRow("year", "2022")]
-    [DataRow("month and year", "March 2022")]
-    [DataRow("ISO 8601", "2022-03-02T22:30:45")]
-    [DataRow("ISO 8601 with time zone", "2022-03-02T22:30:45")]
-    [DataRow("RFC1123", "Wed, 02 Mar 2022 22:30:45 GMT")]
-    [DataRow("Date and time in filename-compatible format", "2022-03-02_22-30-45")]
-    public void LocalFormatsWithLongTimeAndLongDate(string formatLabel, string expectedResult)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, true, GetDateTimeForTest());
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "t")]
-    [DataRow("date and time utc", "g")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithShortTimeAndShortDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, false, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "t")]
-    [DataRow("date and time utc", "f")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithShortTimeAndLongDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, false, true, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "T")]
-    [DataRow("date and time utc", "G")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithLongTimeAndShortDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, false, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow("time utc", "T")]
-    [DataRow("date and time utc", "F")]
-    [DataRow("ISO 8601 UTC", "yyyy-MM-ddTHH:mm:ss")]
-    [DataRow("ISO 8601 UTC with time zone", "yyyy-MM-ddTHH:mm:ss'Z'")]
-    [DataRow("Universal time format: YYYY-MM-DD hh:mm:ss", "u")]
-    [DataRow("Date and time in filename-compatible format", "yyyy-MM-dd_HH-mm-ss")]
-    public void UtcFormatsWithLongTimeAndLongDate(string formatLabel, string expectedFormat)
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, true, true, GetDateTimeForTest(true));
-        var expectedResult = GetDateTimeForTest().ToString(expectedFormat, CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void UnixTimestampSecondsFormat()
-    {
-        // Setup
-        string formatLabel = "Unix epoch time";
-        DateTime timeValue = DateTime.Now.ToUniversalTime();
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = (long)timeValue.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult.ToString(CultureInfo.CurrentCulture), result?.Value);
-    }
-
-    [TestMethod]
-    public void UnixTimestampMillisecondsFormat()
-    {
-        // Setup
-        string formatLabel = "Unix epoch time in milliseconds";
-        DateTime timeValue = DateTime.Now.ToUniversalTime();
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = (long)timeValue.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult.ToString(CultureInfo.CurrentCulture), result?.Value);
-    }
-
-    [TestMethod]
-    public void WindowsFileTimeFormat()
-    {
-        // Setup
-        string formatLabel = "Windows file time (Int64 number)";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = timeValue.ToFileTime().ToString(CultureInfo.CurrentCulture);
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void ValidateEraResult()
-    {
-        // Setup
-        string formatLabel = "Era";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = DateTimeFormatInfo.CurrentInfo.GetEraName(CultureInfo.CurrentCulture.Calendar.GetEra(timeValue));
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [TestMethod]
-    public void ValidateEraAbbreviationResult()
-    {
-        // Setup
-        string formatLabel = "Era abbreviation";
-        DateTime timeValue = DateTime.Now;
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue);
-        var expectedResult = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedEraName(CultureInfo.CurrentCulture.Calendar.GetEra(timeValue));
-
-        // Act
-        var result = helperResults.FirstOrDefault(x => x.Label.Equals(formatLabel, StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedResult, result?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow(CalendarWeekRule.FirstDay, "3")]
-    [DataRow(CalendarWeekRule.FirstFourDayWeek, "2")]
-    [DataRow(CalendarWeekRule.FirstFullWeek, "2")]
-    public void DifferentFirstWeekSettingConfigurations(CalendarWeekRule weekRule, string expectedWeekOfYear)
-    {
-        // Setup
-        DateTime timeValue = new DateTime(2021, 1, 12);
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue, weekRule, DayOfWeek.Sunday);
-
-        // Act
-        var resultWeekOfYear = helperResults.FirstOrDefault(x => x.Label.Equals("week of the year (calendar week, week number)", StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedWeekOfYear, resultWeekOfYear?.Value);
-    }
-
-    [DataTestMethod]
-    [DataRow(DayOfWeek.Monday, "2", "2", "5")]
-    [DataRow(DayOfWeek.Tuesday, "3", "3", "4")]
-    [DataRow(DayOfWeek.Wednesday, "3", "3", "3")]
-    [DataRow(DayOfWeek.Thursday, "3", "3", "2")]
-    [DataRow(DayOfWeek.Friday, "3", "3", "1")]
-    [DataRow(DayOfWeek.Saturday, "2", "2", "7")]
-    [DataRow(DayOfWeek.Sunday, "2", "2", "6")]
-    public void DifferentFirstDayOfWeekSettingConfigurations(DayOfWeek dayOfWeek, string expectedWeekOfYear, string expectedWeekOfMonth, string expectedDayInWeek)
-    {
-        // Setup
-        DateTime timeValue = new DateTime(2024, 1, 12); // Friday
-        var settings = new SettingsManager();
-        var helperResults = AvailableResultsList.GetList(true, settings, null, null, timeValue, CalendarWeekRule.FirstDay, dayOfWeek);
-
-        // Act
-        var resultWeekOfYear = helperResults.FirstOrDefault(x => x.Label.Equals("week of the year (calendar week, week number)", StringComparison.OrdinalIgnoreCase));
-        var resultWeekOfMonth = helperResults.FirstOrDefault(x => x.Label.Equals("week of the month", StringComparison.OrdinalIgnoreCase));
-        var resultDayInWeek = helperResults.FirstOrDefault(x => x.Label.Equals("day of the week (week day)", StringComparison.OrdinalIgnoreCase));
-
-        // Assert
-        Assert.AreEqual(expectedWeekOfYear, resultWeekOfYear?.Value);
-        Assert.AreEqual(expectedWeekOfMonth, resultWeekOfMonth?.Value);
-        Assert.AreEqual(expectedDayInWeek, resultDayInWeek?.Value);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/BasicTests.cs

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class BasicTests
-{
-    [TestMethod]
-    public void BasicTest()
-    {
-        // This is a basic test to verify the test project can run
-        Assert.IsTrue(true);
-    }
-
-    [TestMethod]
-    public void DateTimeTest()
-    {
-        // Test basic DateTime functionality
-        var now = DateTime.Now;
-        Assert.IsNotNull(now);
-        Assert.IsTrue(now > DateTime.MinValue);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/FallbackTimeDateItemTests.cs

@@ -1,86 +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.Globalization;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class FallbackTimeDateItemTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void Cleanup()
-    {
-        // Restore original culture
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    [DataTestMethod]
-    [DataRow("time", "12:00 PM")]
-    [DataRow("date", "7/1/2025")]
-    [DataRow("week", "27")]
-    public void FallbackQueryTests(string query, string expectedTitle)
-    {
-        // Setup
-        var settingsManager = new SettingsManager();
-        DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
-        var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
-
-        // Act & Assert - Test that UpdateQuery doesn't throw exceptions
-        try
-        {
-            fallbackItem.UpdateQuery(query);
-            Assert.IsTrue(
-                fallbackItem.Title.Contains(expectedTitle, StringComparison.OrdinalIgnoreCase),
-                $"Expected title to contain '{expectedTitle}', but got '{fallbackItem.Title}'");
-            Assert.IsNotNull(fallbackItem.Subtitle, "Subtitle should not be null");
-            Assert.IsNotNull(fallbackItem.Icon, "Icon should not be null");
-        }
-        catch (Exception ex)
-        {
-            Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow(null)]
-    [DataRow("invalid input")]
-    public void InvalidQueryTests(string query)
-    {
-        // Setup
-        var settingsManager = new SettingsManager();
-        DateTime now = new DateTime(2025, 7, 1, 12, 0, 0); // Fixed date for testing
-        var fallbackItem = new FallbackTimeDateItem(settingsManager, now);
-
-        // Act & Assert - Test that UpdateQuery doesn't throw exceptions
-        try
-        {
-            fallbackItem.UpdateQuery(query);
-
-            Assert.AreEqual(string.Empty, fallbackItem.Title, "Title should be empty for invalid queries");
-            Assert.AreEqual(string.Empty, fallbackItem.Subtitle, "Subtitle should be empty for invalid queries");
-        }
-        catch (Exception ex)
-        {
-            Assert.Fail($"UpdateQuery should not throw exceptions: {ex.Message}");
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/IconTests.cs

@@ -1,127 +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.Globalization;
-using Microsoft.CmdPal.Ext.TimeDate.Helpers;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests;
-
-[TestClass]
-public class IconTests
-{
-    private CultureInfo originalCulture;
-    private CultureInfo originalUiCulture;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        // Set culture to 'en-us'
-        originalCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("en-us", false);
-        originalUiCulture = CultureInfo.CurrentUICulture;
-        CultureInfo.CurrentUICulture = new CultureInfo("en-us", false);
-    }
-
-    [TestCleanup]
-    public void CleanUp()
-    {
-        // Set culture to original value
-        CultureInfo.CurrentCulture = originalCulture;
-        CultureInfo.CurrentUICulture = originalUiCulture;
-    }
-
-    [TestMethod]
-    public void TimeDateCommandsProvider_HasIcon()
-    {
-        // Setup
-        var provider = new TimeDateCommandsProvider();
-
-        // Act
-        var icon = provider.Icon;
-
-        // Assert
-        Assert.IsNotNull(icon, "Provider should have an icon");
-    }
-
-    [TestMethod]
-    public void TimeDateCommandsProvider_TopLevelCommands_HaveIcons()
-    {
-        // Setup
-        var provider = new TimeDateCommandsProvider();
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Length > 0, "Should have at least one top-level command");
-
-        foreach (var command in commands)
-        {
-            Assert.IsNotNull(command.Icon, "Each command should have an icon");
-        }
-    }
-
-    [TestMethod]
-    public void AvailableResults_HaveIcons()
-    {
-        // Setup
-        var settings = new SettingsManager();
-
-        // Act
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Assert
-        Assert.IsNotNull(results);
-        Assert.IsTrue(results.Count > 0, "Should have results");
-
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
-        }
-    }
-
-    [DataTestMethod]
-    [DataRow(ResultIconType.Time, "\uE823")]
-    [DataRow(ResultIconType.Date, "\uE787")]
-    [DataRow(ResultIconType.DateTime, "\uEC92")]
-    public void ResultHelper_CreateListItem_PreservesIcon(ResultIconType resultIconType, string expectedIcon)
-    {
-        // Setup
-        var availableResult = new AvailableResult
-        {
-            Label = "Test Label",
-            Value = "Test Value",
-            IconType = resultIconType,
-        };
-
-        // Act
-        var listItem = availableResult.ToListItem();
-
-        var icon = listItem.Icon;
-
-        // Assert
-        Assert.IsNotNull(listItem);
-        Assert.IsNotNull(listItem.Icon, "ListItem should preserve the icon from AvailableResult");
-        Assert.AreEqual(expectedIcon, icon.Dark.Icon, $"Icon for {resultIconType} should match expected value");
-    }
-
-    [TestMethod]
-    public void Icons_AreNotEmpty()
-    {
-        // Setup
-        var settings = new SettingsManager();
-        var results = AvailableResultsList.GetList(true, settings);
-
-        // Act & Assert
-        foreach (var result in results)
-        {
-            Assert.IsNotNull(result.GetIconInfo(), $"Result '{result.Label}' should have an icon");
-            Assert.IsFalse(string.IsNullOrWhiteSpace(result.GetIconInfo().ToString()), $"Icon for '{result.Label}' should not be empty");
-        }
-    }
-}