Merge branch 'main' into user/yeelam/IncludeUnitTestDlls

Try to see how UnitTest pass/failure rate
2026-01-25 05:27:07 +01:00 · 2025-06-13 11:17:43 +08:00 · 2025-06-13 07:53:20 +08:00
169 changed files with 707 additions and 53384 deletions
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -91,7 +91,6 @@ Hemmerlein
 hlaueriksson
 Horvalds
 Howett
-hotkidfamily
 htcfreek
 Huynh
 Ionut
@@ -99,7 +98,6 @@ jamrobot
 Jaswal
 Jaylyn
 jefflord
-Jeremic
 Jordi
 jyuwono
 kai
@@ -224,7 +222,6 @@ openai
 Quickime
 regedit
 roslyn
-Skia
 Spotify
 Vanara
 wangyi
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -126,4 +126,3 @@
 ^src/common/sysinternals/Eula/
 ^tools/Verification scripts/Check preview handler registration\.ps1$
 ignore$
-^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -69,7 +69,6 @@ appwiz
 APSTUDIO
 AQS
 ARandom
-Arash
 ARCHITEW
 ARemapped
 ARPINSTALLLOCATION
@@ -156,7 +155,6 @@ builttoroam
 BVal
 BValue
 byapp
-BYCOMMAND
 BYPOSITION
 CALCRECT
 CALG
@@ -203,7 +201,6 @@ CLIPSIBLINGS
 closesocket
 clp
 CLSCTX
-CLSCTXLOCALSERVER
 clsids
 Clusion
 cmder
@@ -472,7 +469,6 @@ EXPCMDFLAGS
 EXPCMDSTATE
 explr
 exppowertoys
-exprtk
 exptas
 exsb
 exstyle
@@ -817,7 +813,6 @@ LOCALDISPLAY
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKTYPE
 LOGFONT
 LOGFONTW
 logon
@@ -913,7 +908,6 @@ metafile
 mfc
 Mgmt
 Microwaved
-middleclickaction
 midl
 mii
 mindaro
@@ -1156,7 +1150,6 @@ PARTIALCONFIRMATIONDIALOGTITLE
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
-partow
 PATPAINT
 pbc
 pbi
@@ -1255,7 +1248,6 @@ prg
 prgh
 prgms
 pri
-primaryclickaction
 PRINTCLIENT
 printmanagement
 prm
@@ -1431,7 +1423,6 @@ SDKDDK
 sdns
 searchterm
 SEARCHUI
-secondaryclickaction
 SECONDARYDISPLAY
 secpol
 securestring
@@ -1516,7 +1507,6 @@ SICHINT
 SIDs
 siex
 sigdn
-Signedness
 SIGNINGSCENARIO
 signtool
 SINGLEKEY
@@ -1666,7 +1656,6 @@ TDefault
 TDevice
 telephon
 templatenamespace
-TESTONLY
 testprocess
 TEXCOORD
 TEXTBOXNEWLINE
@@ -1719,7 +1708,6 @@ trx
 tsa
 TSender
 TServer
-tskill
 tstoi
 TStr
 tweakme
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -3,227 +3,226 @@
    "UseMinimatch": false,
    "SignBatches": [
        {
-          "MatchedPath": [
-            "*.resources.dll",
+            "MatchedPath": [
+                "*.resources.dll",
+                
+                "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",

-            "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",
+                "PowerToys.ActionRunner.exe",
+                "PowerToys.Update.exe",
+                "PowerToys.BackgroundActivatorDLL.dll",
+                "Notifications.dll",
+                "os-detection.dll",
+                "PowerToys.exe",
+                "PowerToys.FilePreviewCommon.dll",
+                "PowerToys.Interop.dll",
+                "Tools\\PowerToys.BugReportTool.exe",
+                "StylesReportTool\\PowerToys.StylesReportTool.exe",
+                "Telemetry.dll",
+                "PowerToys.ManagedTelemetry.dll",
+                "PowerToys.ManagedCommon.dll",
+                "PowerToys.Common.UI.dll",
+                "PowerToys.Settings.UI.Lib.dll",
+                "PowerToys.GPOWrapper.dll",
+                "PowerToys.GPOWrapperProjection.dll",
+                "PowerToys.AllExperiments.dll",

-            "PowerToys.ActionRunner.exe",
-            "PowerToys.Update.exe",
-            "PowerToys.BackgroundActivatorDLL.dll",
-            "Notifications.dll",
-            "os-detection.dll",
-            "PowerToys.exe",
-            "PowerToys.FilePreviewCommon.dll",
-            "PowerToys.Interop.dll",
-            "Tools\\PowerToys.BugReportTool.exe",
-            "StylesReportTool\\PowerToys.StylesReportTool.exe",
-            "Telemetry.dll",
-            "CalculatorEngineCommon.dll",
-            "PowerToys.ManagedTelemetry.dll",
-            "PowerToys.ManagedCommon.dll",
-            "PowerToys.Common.UI.dll",
-            "PowerToys.Settings.UI.Lib.dll",
-            "PowerToys.GPOWrapper.dll",
-            "PowerToys.GPOWrapperProjection.dll",
-            "PowerToys.AllExperiments.dll",
+                "PowerToys.AlwaysOnTop.exe",
+                "PowerToys.AlwaysOnTopModuleInterface.dll",

-            "PowerToys.AlwaysOnTop.exe",
-            "PowerToys.AlwaysOnTopModuleInterface.dll",
+                "PowerToys.CmdNotFoundModuleInterface.dll",
+                "PowerToys.CmdNotFound.dll",

-            "PowerToys.CmdNotFoundModuleInterface.dll",
-            "PowerToys.CmdNotFound.dll",
+                "PowerToys.ColorPicker.dll",
+                "PowerToys.ColorPickerUI.dll",
+                "PowerToys.ColorPickerUI.exe",

-            "PowerToys.ColorPicker.dll",
-            "PowerToys.ColorPickerUI.dll",
-            "PowerToys.ColorPickerUI.exe",
+                "PowerToys.CropAndLockModuleInterface.dll",
+                "PowerToys.CropAndLock.exe",

-            "PowerToys.CropAndLockModuleInterface.dll",
-            "PowerToys.CropAndLock.exe",
+                "PowerToys.PowerOCRModuleInterface.dll",
+                "PowerToys.PowerOCR.dll",
+                "PowerToys.PowerOCR.exe",

-            "PowerToys.PowerOCRModuleInterface.dll",
-            "PowerToys.PowerOCR.dll",
-            "PowerToys.PowerOCR.exe",
+                "PowerToys.AdvancedPasteModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.AdvancedPaste.exe",
+                "WinUI3Apps\\PowerToys.AdvancedPaste.dll",

-            "PowerToys.AdvancedPasteModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.AdvancedPaste.exe",
-            "WinUI3Apps\\PowerToys.AdvancedPaste.dll",
+                "PowerToys.AwakeModuleInterface.dll",
+                "PowerToys.Awake.exe",
+                "PowerToys.Awake.dll",

-            "PowerToys.AwakeModuleInterface.dll",
-            "PowerToys.Awake.exe",
-            "PowerToys.Awake.dll",
+                "fancyzones.dll",
+                "PowerToys.FancyZonesEditor.exe",
+                "PowerToys.FancyZonesEditor.dll",
+                "PowerToys.FancyZonesEditorCommon.dll",
+                "PowerToys.FancyZonesModuleInterface.dll",
+                "PowerToys.FancyZones.exe",

-            "fancyzones.dll",
-            "PowerToys.FancyZonesEditor.exe",
-            "PowerToys.FancyZonesEditor.dll",
-            "PowerToys.FancyZonesEditorCommon.dll",
-            "PowerToys.FancyZonesModuleInterface.dll",
-            "PowerToys.FancyZones.exe",
+                "PowerToys.GcodePreviewHandler.dll",
+                "PowerToys.GcodePreviewHandler.exe",
+                "PowerToys.GcodePreviewHandlerCpp.dll",
+                "PowerToys.GcodeThumbnailProvider.dll",
+                "PowerToys.GcodeThumbnailProvider.exe",
+                "PowerToys.GcodeThumbnailProviderCpp.dll",
+                "PowerToys.ManagedTelemetry.dll",
+                "PowerToys.MarkdownPreviewHandler.dll",
+                "PowerToys.MarkdownPreviewHandler.exe",
+                "PowerToys.MarkdownPreviewHandlerCpp.dll",
+                "PowerToys.MonacoPreviewHandler.dll",
+                "PowerToys.MonacoPreviewHandler.exe",
+                "PowerToys.MonacoPreviewHandlerCpp.dll",
+                "PowerToys.PdfPreviewHandler.dll",
+                "PowerToys.PdfPreviewHandler.exe",
+                "PowerToys.PdfPreviewHandlerCpp.dll",
+                "PowerToys.PdfThumbnailProvider.dll",
+                "PowerToys.PdfThumbnailProvider.exe",
+                "PowerToys.PdfThumbnailProviderCpp.dll",
+                "PowerToys.powerpreview.dll",
+                "PowerToys.PreviewHandlerCommon.dll",
+                "PowerToys.QoiPreviewHandler.dll",
+                "PowerToys.QoiPreviewHandler.exe",
+                "PowerToys.QoiPreviewHandlerCpp.dll",
+                "PowerToys.QoiThumbnailProvider.dll",
+                "PowerToys.QoiThumbnailProvider.exe",
+                "PowerToys.QoiThumbnailProviderCpp.dll",
+                "PowerToys.StlThumbnailProvider.dll",
+                "PowerToys.StlThumbnailProvider.exe",
+                "PowerToys.StlThumbnailProviderCpp.dll",
+                "PowerToys.SvgPreviewHandler.dll",
+                "PowerToys.SvgPreviewHandler.exe",
+                "PowerToys.SvgPreviewHandlerCpp.dll",
+                "PowerToys.SvgThumbnailProvider.dll",
+                "PowerToys.SvgThumbnailProvider.exe",
+                "PowerToys.SvgThumbnailProviderCpp.dll",

-            "PowerToys.GcodePreviewHandler.dll",
-            "PowerToys.GcodePreviewHandler.exe",
-            "PowerToys.GcodePreviewHandlerCpp.dll",
-            "PowerToys.GcodeThumbnailProvider.dll",
-            "PowerToys.GcodeThumbnailProvider.exe",
-            "PowerToys.GcodeThumbnailProviderCpp.dll",
-            "PowerToys.ManagedTelemetry.dll",
-            "PowerToys.MarkdownPreviewHandler.dll",
-            "PowerToys.MarkdownPreviewHandler.exe",
-            "PowerToys.MarkdownPreviewHandlerCpp.dll",
-            "PowerToys.MonacoPreviewHandler.dll",
-            "PowerToys.MonacoPreviewHandler.exe",
-            "PowerToys.MonacoPreviewHandlerCpp.dll",
-            "PowerToys.PdfPreviewHandler.dll",
-            "PowerToys.PdfPreviewHandler.exe",
-            "PowerToys.PdfPreviewHandlerCpp.dll",
-            "PowerToys.PdfThumbnailProvider.dll",
-            "PowerToys.PdfThumbnailProvider.exe",
-            "PowerToys.PdfThumbnailProviderCpp.dll",
-            "PowerToys.powerpreview.dll",
-            "PowerToys.PreviewHandlerCommon.dll",
-            "PowerToys.QoiPreviewHandler.dll",
-            "PowerToys.QoiPreviewHandler.exe",
-            "PowerToys.QoiPreviewHandlerCpp.dll",
-            "PowerToys.QoiThumbnailProvider.dll",
-            "PowerToys.QoiThumbnailProvider.exe",
-            "PowerToys.QoiThumbnailProviderCpp.dll",
-            "PowerToys.StlThumbnailProvider.dll",
-            "PowerToys.StlThumbnailProvider.exe",
-            "PowerToys.StlThumbnailProviderCpp.dll",
-            "PowerToys.SvgPreviewHandler.dll",
-            "PowerToys.SvgPreviewHandler.exe",
-            "PowerToys.SvgPreviewHandlerCpp.dll",
-            "PowerToys.SvgThumbnailProvider.dll",
-            "PowerToys.SvgThumbnailProvider.exe",
-            "PowerToys.SvgThumbnailProviderCpp.dll",
+                "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.HostsUILib.dll",
+                "WinUI3Apps\\PowerToys.Hosts.dll",
+                "WinUI3Apps\\PowerToys.Hosts.exe",

-            "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.HostsUILib.dll",
-            "WinUI3Apps\\PowerToys.Hosts.dll",
-            "WinUI3Apps\\PowerToys.Hosts.exe",
+                "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithExt.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.exe",
+                "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
+                "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
+                "FileLocksmithContextMenuPackage.msix",

-            "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithExt.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithUI.exe",
-            "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
-            "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
-            "FileLocksmithContextMenuPackage.msix",
+                "WinUI3Apps\\Peek.Common.dll",
+                "WinUI3Apps\\Peek.FilePreviewer.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.dll",
+                "WinUI3Apps\\Powertoys.Peek.UI.exe",
+                "WinUI3Apps\\Powertoys.Peek.dll",

-            "WinUI3Apps\\Peek.Common.dll",
-            "WinUI3Apps\\Peek.FilePreviewer.dll",
-            "WinUI3Apps\\Powertoys.Peek.UI.dll",
-            "WinUI3Apps\\Powertoys.Peek.UI.exe",
-            "WinUI3Apps\\Powertoys.Peek.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariables.dll",
+                "WinUI3Apps\\PowerToys.EnvironmentVariables.exe",

-            "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariables.dll",
-            "WinUI3Apps\\PowerToys.EnvironmentVariables.exe",
+                "PowerToys.ImageResizer.exe",
+                "PowerToys.ImageResizer.dll",
+                "PowerToys.ImageResizerExt.dll",
+                "PowerToys.ImageResizerContextMenu.dll",
+                "ImageResizerContextMenuPackage.msix",

-            "PowerToys.ImageResizer.exe",
-            "PowerToys.ImageResizer.dll",
-            "PowerToys.ImageResizerExt.dll",
-            "PowerToys.ImageResizerContextMenu.dll",
-            "ImageResizerContextMenuPackage.msix",
+                "PowerToys.KeyboardManager.dll",
+                "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
+                "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
+                "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",

-            "PowerToys.KeyboardManager.dll",
-            "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
-            "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
-            "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",
+                "PowerToys.Launcher.dll",
+                "PowerToys.PowerLauncher.dll",
+                "PowerToys.PowerLauncher.exe",
+                "PowerToys.PowerLauncher.Telemetry.dll",
+                "Wox.dll",
+                "Wox.Infrastructure.dll",
+                "Wox.Plugin.dll",
+                "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
+                "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll",
+                "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
+                "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
+                "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
+                "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
+                "RunPlugins\\Program\\Microsoft.Plugin.Program.dll",
+                "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
+                "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
+                "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll",
+                "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll",
+                "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
+                "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
+                "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
+                "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
+                "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
+                "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
+                "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll",
+                "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
+                "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
+                
+                "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
+                "WinUI3Apps\\PowerToys.MeasureToolUI.exe",

-            "PowerToys.Launcher.dll",
-            "PowerToys.PowerLauncher.dll",
-            "PowerToys.PowerLauncher.exe",
-            "PowerToys.PowerLauncher.Telemetry.dll",
-            "Wox.dll",
-            "Wox.Infrastructure.dll",
-            "Wox.Plugin.dll",
-            "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll",
-            "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll",
-            "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll",
-            "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll",
-            "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll",
-            "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll",
-            "RunPlugins\\Program\\Microsoft.Plugin.Program.dll",
-            "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll",
-            "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll",
-            "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll",
-            "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll",
-            "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll",
-            "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll",
-            "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll",
-            "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll",
-            "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll",
-            "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll",
-            "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll",
-            "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
-            "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",
+                "PowerToys.FindMyMouse.dll",
+                "PowerToys.MouseHighlighter.dll",
+                "PowerToys.MouseJump.dll",
+                "PowerToys.MouseJump.Common.dll",
+                "PowerToys.MousePointerCrosshairs.dll",
+                "PowerToys.MouseJumpUI.dll",
+                "PowerToys.MouseJumpUI.exe",

-            "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
-            "WinUI3Apps\\PowerToys.MeasureToolUI.exe",
+                "PowerToys.MouseWithoutBorders.dll",
+                "PowerToys.MouseWithoutBorders.exe",
+                "PowerToys.MouseWithoutBordersModuleInterface.dll",
+                "PowerToys.MouseWithoutBordersService.dll",
+                "PowerToys.MouseWithoutBordersService.exe",
+                "PowerToys.MouseWithoutBordersHelper.dll",
+                "PowerToys.MouseWithoutBordersHelper.exe",

-            "PowerToys.FindMyMouse.dll",
-            "PowerToys.MouseHighlighter.dll",
-            "PowerToys.MouseJump.dll",
-            "PowerToys.MouseJump.Common.dll",
-            "PowerToys.MousePointerCrosshairs.dll",
-            "PowerToys.MouseJumpUI.dll",
-            "PowerToys.MouseJumpUI.exe",
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
+                "WinUI3Apps\\NewPlusPackage.msix",
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",

-            "PowerToys.MouseWithoutBorders.dll",
-            "PowerToys.MouseWithoutBorders.exe",
-            "PowerToys.MouseWithoutBordersModuleInterface.dll",
-            "PowerToys.MouseWithoutBordersService.dll",
-            "PowerToys.MouseWithoutBordersService.exe",
-            "PowerToys.MouseWithoutBordersHelper.dll",
-            "PowerToys.MouseWithoutBordersHelper.exe",
+                "PowerAccent.Core.dll",
+                "PowerToys.PowerAccent.dll",
+                "PowerToys.PowerAccent.exe",
+                "PowerToys.PowerAccentModuleInterface.dll",
+                "PowerToys.PowerAccentKeyboardService.dll",

-            "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
-            "WinUI3Apps\\NewPlusPackage.msix",
-            "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.win10.dll",
+                "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
+                "WinUI3Apps\\PowerToys.PowerRename.exe",
+                "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
+                "WinUI3Apps\\PowerRenameContextMenuPackage.msix",

-            "PowerAccent.Core.dll",
-            "PowerToys.PowerAccent.dll",
-            "PowerToys.PowerAccent.exe",
-            "PowerToys.PowerAccentModuleInterface.dll",
-            "PowerToys.PowerAccentKeyboardService.dll",
+                "PowerToys.WorkspacesSnapshotTool.exe",
+                "PowerToys.WorkspacesLauncher.exe",
+                "PowerToys.WorkspacesWindowArranger.exe",
+                "PowerToys.WorkspacesEditor.exe",
+                "PowerToys.WorkspacesEditor.dll",
+                "PowerToys.WorkspacesLauncherUI.exe",
+                "PowerToys.WorkspacesLauncherUI.dll",
+                "PowerToys.WorkspacesModuleInterface.dll",
+                "PowerToys.WorkspacesCsharpLibrary.dll",

-            "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
-            "WinUI3Apps\\PowerToys.PowerRename.exe",
-            "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
-            "WinUI3Apps\\PowerRenameContextMenuPackage.msix",
+                "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.dll",
+                "WinUI3Apps\\PowerToys.RegistryPreview.exe",

-            "PowerToys.WorkspacesSnapshotTool.exe",
-            "PowerToys.WorkspacesLauncher.exe",
-            "PowerToys.WorkspacesWindowArranger.exe",
-            "PowerToys.WorkspacesEditor.exe",
-            "PowerToys.WorkspacesEditor.dll",
-            "PowerToys.WorkspacesLauncherUI.exe",
-            "PowerToys.WorkspacesLauncherUI.dll",
-            "PowerToys.WorkspacesModuleInterface.dll",
-            "PowerToys.WorkspacesCsharpLibrary.dll",
+                "PowerToys.ShortcutGuide.exe",
+                "PowerToys.ShortcutGuideModuleInterface.dll",

-            "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreview.dll",
-            "WinUI3Apps\\PowerToys.RegistryPreview.exe",
+                "PowerToys.ZoomIt.exe",
+                "PowerToys.ZoomItModuleInterface.dll",
+                "PowerToys.ZoomItSettingsInterop.dll",

-            "PowerToys.ShortcutGuide.exe",
-            "PowerToys.ShortcutGuideModuleInterface.dll",
+                "WinUI3Apps\\PowerToys.Settings.dll",
+                "WinUI3Apps\\PowerToys.Settings.exe",

-            "PowerToys.ZoomIt.exe",
-            "PowerToys.ZoomItModuleInterface.dll",
-            "PowerToys.ZoomItSettingsInterop.dll",
-
-            "WinUI3Apps\\PowerToys.Settings.dll",
-            "WinUI3Apps\\PowerToys.Settings.exe",
-
-            "PowerToys.CmdPalModuleInterface.dll",
-            "CmdPalKeyboardService.dll",
-            "*Microsoft.CmdPal.UI_*.msix"
-          ],
+                "PowerToys.CmdPalModuleInterface.dll",
+                "CmdPalKeyboardService.dll",
+                "*Microsoft.CmdPal.UI_*.msix"
+            ],
            "SigningInfo": {
                "Operations": [
                    {
--- a/.pipelines/applyXamlStyling.ps1
+++ b/.pipelines/applyXamlStyling.ps1
@@ -41,9 +41,6 @@ Write-Output ""
 Write-Output "Restoring dotnet tools..."
 dotnet tool restore --disable-parallel --no-cache

-# Use Regex syntax
-$PathExcludes = "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\RegistryPreviewUILib\\Controls\\HexBox\\)"
-
 if (-not $Passive)
 {
    # Look for unstaged changed files by default
@@ -90,7 +87,7 @@ if (-not $Passive)
    }

    Write-Output "Running Git Diff: $gitDiffCommand"
-    $files = Invoke-Expression $gitDiffCommand | Select-String -Pattern "\.xaml$" | Where-Object { $_ -notmatch $PathExcludes }
+    $files = Invoke-Expression $gitDiffCommand | Select-String -Pattern "\.xaml$"

    if (-not $Passive -and -not $Main -and -not $Unstaged -and -not $Staged -and -not $LastCommit)
    {
@@ -110,7 +107,7 @@ if (-not $Passive)
 else 
 {
    Write-Output "Checking all files (passively)"
-    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch $PathExcludes }
+    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)" }

    if ($files.count -gt 0)
    {
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -99,7 +99,7 @@ jobs:
            ${{ else }}:
              OutputBuildPlatform: ${{ platform }}
  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
+    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
    # Azure DevOps abhors a vacuum
    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
@@ -332,7 +332,6 @@ jobs:
          /p:VCRTForwarders-IncludeDebugCRT=false
          /p:PowerToysRoot=$(Build.SourcesDirectory)
          /p:PublishProfile=InstallationPublishProfile.pubxml
-          /p:TargetFramework=net9.0-windows10.0.26100.0
          /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
          $(RestoreAdditionalProjectSourcesArg)
        platform: $(BuildPlatform)
--- a/.pipelines/versionAndSignCheck.ps1
+++ b/.pipelines/versionAndSignCheck.ps1
@@ -28,8 +28,6 @@ $versionExceptions = @(
    "ObjectModelCsProjection.dll",
    "RendererCsProjection.dll") -join '|';
 $nullVersionExceptions = @(
-    "SkiaSharp.Views.WinUI.Native.dll",
-    "libSkiaSharp.dll",
    "codicon.ttf",
    "e_sqlite3.dll",
    "getfilesiginforedist.dll",
--- a/.vsconfig
+++ b/.vsconfig
@@ -9,7 +9,6 @@
    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
-    "Microsoft.VisualStudio.Component.Windows10SDK.26100",
    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -181,6 +181,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 ## PowerToys core team

 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
+- [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
 - [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
@@ -212,7 +213,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
 - [@plante-msft](https://github.com/plante-msft) - Connor Plante - Product Manager
 - [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie - Product Manager
- [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@enricogior](https://github.com/enricogior) - Enrico Giordani - Dev Lead
 - [@bzoz](https://github.com/bzoz) - Bartosz Sosnowski - Dev
 - [@ivan100sic](https://github.com/ivan100sic) - Ivan Stošić - Dev
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -96,8 +96,8 @@

  <!-- Global props OverrideWindowsTargetPlatformVersion-->
  <PropertyGroup Label="Globals">
-    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -47,14 +47,14 @@
    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.6" />
    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
    <!-- 
      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
@@ -69,8 +69,6 @@
    <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
    <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. -->
-    <PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.9" />
    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -79,43 +79,6 @@ For more information, please refer to <http://unlicense.org/>

 ### Calculator

-#### exprtk
-
-We use the exprtk library (exprtk.hpp) to evaluate mathematical expressions.
-
-**Source**: [https://github.com/ArashPartow/exprtk](https://github.com/ArashPartow/exprtk)
-
-```
-MIT License
-
-Copyright (c) 1999-2024 Arash Partow
-
-https://www.partow.net/programming/exprtk/index.html
-
-Permission is hereby granted, free of charge, to any person  obtaining
-a  copy  of  this software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software  without restriction, including
-without limitation the  rights to use,  copy, modify, merge,  publish,
-distribute, sublicense,  and/or sell  copies of  the Software,  and to
-permit persons to whom the Software is furnished to do so, subject  to
-the following conditions:
-
-The  above  copyright  notice  and  this  permission  notice  shall be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT  LIMITED TO  THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS  OR COPYRIGHT HOLDERS BE LIABLE FOR  ANY
-CLAIM, DAMAGES OR OTHER LIABILITY,  WHETHER IN AN ACTION OF  CONTRACT,
-TORT OR  OTHERWISE, ARISING  FROM, OUT  OF OR  IN CONNECTION  WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
-## Utility: PowerToys Run Built-in Extensions
-
-### Calculator
-
 #### Mages

 We use the Mages NuGet package for calculating the result of expression.
@@ -1427,37 +1390,6 @@ EXHIBIT A -Mozilla Public License.

 ## Utility: Registry Preview

-### HexBox.WinUI
-
-We use HexBox.WinUI to show a preview of binary values.
-
-**Source**: https://github.com/hotkidfamily/HexBox.WinUI
-
-```
-MIT License
-
-Copyright (c) 2019 Filip Jeremic
-Copyright (c) 2024~2025 hotkidfamily@gmail.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ### Monaco Editor

 **Source**: https://github.com/Microsoft/monaco-editor
@@ -1488,7 +1420,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```

-
 ## NuGet Packages used by PowerToys

 - AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
@@ -1533,9 +1464,9 @@ SOFTWARE.
 - Microsoft.Web.WebView2 1.0.2903.40
 - Microsoft.Win32.SystemEvents 9.0.6
 - Microsoft.Windows.Compatibility 9.0.6
- Microsoft.Windows.CsWin32 0.3.183
+- Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
- Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
+- Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
 - Microsoft.WindowsAppSDK 1.7.250513003
 - Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
@@ -1549,7 +1480,6 @@ SOFTWARE.
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
- SkiaSharp.Views.WinUI 2.88.9
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
 - System.CodeDom 9.0.6
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -717,8 +717,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorEngineCommon", "src\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2621,14 +2619,6 @@ Global
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.Build.0 = Debug|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|ARM64.Build.0 = Release|ARM64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.ActiveCfg = Release|x64
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2903,7 +2893,6 @@ Global
 		{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} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
-		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/installer/PowerToysSetup/publish.cmd
+++ b/installer/PowerToysSetup/publish.cmd
@@ -8,10 +8,10 @@ SET VCToolsVersion=!VCToolsVersion!
 SET ClearDevCommandPromptEnvVars=false

 rem In case of Release we should not use Debug CRT in VCRT forwarders
-msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml

-msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -4,8 +4,8 @@
  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />

  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
--- a/src/codeAnalysis/GlobalSuppressions.cs
+++ b/src/codeAnalysis/GlobalSuppressions.cs
@@ -76,47 +76,3 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "type", Target = "~T:Peek.UI.Views.TitleBar")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
-
-// HexBox control in RegistryPreviewUILib (We decided to copy the original code and not fix all theses problems for easier updating.)
-[assembly: SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("Naming", "CA1720:Identifiers should not contain type names", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("Performance", "CA1805:Do not initialize unnecessarily", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:Property summary documentation should match accessors", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1642:Constructor summary documentation should begin with standard text", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1648:<inheritdoc> has been used on an element that doesn't inherit from a base class or implement an interface.", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1500:Braces for multi-line statements should not share line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1502:Element should not be on a single line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1503:Braces should not be omitted", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1505:Opening braces should not be followed by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1507:Code should not contain multiple blank lines in a row", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1508:Closing braces should not be preceded by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1509:Opening braces should not be preceded by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1512:Single-line comments should not be followed by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1513:Closing brace should be followed by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1514:Element documentation header should be preceded by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1515:Single-line comment should be preceded by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1516:Elements should be separated by blank line", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1119:Statement should not use unnecessary parenthesis", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1407:Arithmetic expressions should declare precedence", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1413:Use trailing comma in multi-line initializers", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1312:Variable names should begin with lower-case letter", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1313:Parameter names should begin with lower-case letter", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:Using directives should be placed correctly", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1108:Block statements should not contain embedded comments", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1116:Split parameters should start on line after declaration", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1117:Parameters should be on same line or separate lines", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1129:Do not use default value type constructor", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1000:Keywords should be spaced correctly", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1003:Symbols should be spaced correctly", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1005:Single line comments should begin with single space", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1024:Colons Should Be Spaced Correctly", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1025:Code should not contain multiple whitespace in a row", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1028:Code should not contain trailing whitespace", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
-[assembly: SuppressMessage("Usage", "CsWinRT1028:Class is not marked partial", Justification = "<Code port with style preservation>", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib.HexBox")]
--- a/src/common/CalculatorEngineCommon/Calculator.cpp
+++ b/src/common/CalculatorEngineCommon/Calculator.cpp
@@ -1,24 +0,0 @@
-#include "pch.h"
-#include "Calculator.h"
-#include "Calculator.g.cpp"
-#include "ExprtkEvaluator.h"
-
-namespace winrt::CalculatorEngineCommon::implementation
-{
-    Calculator::Calculator(winrt::Windows::Foundation::Collections::IPropertySet const& constants)
-    {
-        for (auto const& pair : constants)
-        {
-            auto key = pair.Key();
-            auto value = winrt::unbox_value<double>(pair.Value());
-            m_constants.emplace(winrt::to_string(key), value);
-        }
-    }
-
-    hstring Calculator::EvaluateExpression(hstring const& expression)
-    {
-        auto result = ExprtkCalculator::internal::EvaluateExpression(winrt::to_string(expression), m_constants);
-
-        return hstring(result);
-    }
-}
--- a/src/common/CalculatorEngineCommon/Calculator.h
+++ b/src/common/CalculatorEngineCommon/Calculator.h
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Calculator.g.h"
-
-namespace winrt::CalculatorEngineCommon::implementation
-{
-    struct Calculator : CalculatorT<Calculator>
-    {
-        Calculator() = default;
-
-        Calculator(winrt::Windows::Foundation::Collections::IPropertySet const& constants);
-
-        winrt::hstring EvaluateExpression(winrt::hstring const& expression);
-
-    private:
-        std::unordered_map<std::string, double> m_constants;
-    };
-}
-
-namespace winrt::CalculatorEngineCommon::factory_implementation
-{
-    struct Calculator : CalculatorT<Calculator, implementation::Calculator>
-    {
-    };
-}
--- a/src/common/CalculatorEngineCommon/Calculator.idl
+++ b/src/common/CalculatorEngineCommon/Calculator.idl
@@ -1,10 +0,0 @@
-namespace CalculatorEngineCommon
-{
-    [default_interface]
-    runtimeclass Calculator
-    {
-        Calculator();
-        Calculator(Windows.Foundation.Collections.IPropertySet constants);
-        String EvaluateExpression(String expression);
-    }
-}
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.def
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.def
@@ -1,3 +0,0 @@
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.rc
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.rc
@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../version/version.h"
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN 
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <PropertyGroup Label="Globals">
-    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
-    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
-    <ProjectGuid>{2cf78cf7-8feb-4be1-9591-55fa25b48fc6}</ProjectGuid>
-    <ProjectName>CalculatorEngineCommon</ProjectName>
-    <RootNamespace>CalculatorEngineCommon</RootNamespace>
-    <AppxPackage>false</AppxPackage>
-  </PropertyGroup>
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
-  <!-- BEGIN cppwinrt.build.pre.props -->
-  <PropertyGroup Label="Globals">
-    <CppWinRTEnabled>true</CppWinRTEnabled>
-    <CppWinRTOptimized>true</CppWinRTOptimized>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
-    <WindowsStoreApp>true</WindowsStoreApp>
-    <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference>
-    <!-- The SDK reference breaks the Hybrid CRT -->
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
-    <_VC_Target_Library_Platform>Desktop</_VC_Target_Library_Platform>
-    <_NoWinAPIFamilyApp>true</_NoWinAPIFamilyApp>
-  </PropertyGroup>
-  <!-- END cppwinrt.build.pre.props -->
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="PropertySheet.props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <TargetName>CalculatorEngineCommon</TargetName>
-    <OutDir>..\..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
-      <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>CalculatorEngineCommon.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Shell32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\version\version.vcxproj">
-      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ExprtkEvaluator.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="exprtk.hpp" />
-    <ClInclude Include="Calculator.h">
-      <DependentUpon>Calculator.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ExprtkEvaluator.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Calculator.cpp">
-      <DependentUpon>Calculator.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="Calculator.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="CalculatorEngineCommon.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CalculatorEngineCommon.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
-</Project>
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj.filters
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj.filters
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resources">
-      <UniqueIdentifier>accd3aa8-1ba0-4223-9bbe-0c431709210b</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{926ab91d-31b4-48c3-b9a4-e681349f27f0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp" />
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="Calculator.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CalculatorEngineCommon.def" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </ItemGroup>
-</Project>
--- a/src/common/CalculatorEngineCommon/ExprtkEvaluator.cpp
+++ b/src/common/CalculatorEngineCommon/ExprtkEvaluator.cpp
@@ -1,50 +0,0 @@
-#include "ExprtkEvaluator.h"
-#include "exprtk.hpp"
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-namespace ExprtkCalculator::internal
-{
-
-    std::wstring ToWStringFullPrecision(double value)
-    {
-        std::wostringstream oss;
-        oss << std::fixed << std::setprecision(15) << value;
-        return oss.str();
-    }
-
-    std::wstring EvaluateExpression(
-        const std::string& expressionText,
-        const std::unordered_map<std::string, double>& constants)
-    {
-        exprtk::symbol_table<double> symbol_table;
-
-        for (auto const& [name, value] : constants)
-        {
-            symbol_table.add_constant(name, value);
-        }
-
-        exprtk::expression<double> expression;
-        expression.register_symbol_table(symbol_table);
-
-        exprtk::parser<double> parser;
-
-        // Enable all base functions and arithmetic operators
-        parser.settings().enable_all_base_functions(); // Enable all base functions like sin, cos, log, etc.
-        parser.settings().enable_all_arithmetic_ops(); // Enable all arithmetic operators like +, -, *, /, etc.
-
-        // Disable all control structures and assignment operators to ensure only expressions are evaluated
-        parser.settings().disable_all_control_structures(); // Disable control structures like if, for, while, etc.
-        parser.settings().disable_all_assignment_ops(); // Disable assignment operators like =, +=, -=, etc.
-
-        // Disabled for now, but can be enabled later for enhanced functionality
-        parser.settings().disable_all_logic_ops(); // Disable logical operators like &&, ||, !, etc.
-        parser.settings().disable_all_inequality_ops(); // Disable inequality operators like <, >, <=, >=, !=, etc.
-
-        if (!parser.compile(expressionText, expression))
-            return L"NaN";
-
-        return ToWStringFullPrecision(expression.value());
-    }
-}
--- a/src/common/CalculatorEngineCommon/ExprtkEvaluator.h
+++ b/src/common/CalculatorEngineCommon/ExprtkEvaluator.h
@@ -1,10 +0,0 @@
-#pragma once
-#include <string>
-#include <unordered_map>
-
-namespace ExprtkCalculator::internal
-{
-    std::wstring EvaluateExpression(
-        const std::string& expression,
-        const std::unordered_map<std::string, double>& constants);
-}
--- a/src/common/CalculatorEngineCommon/PropertySheet.props
+++ b/src/common/CalculatorEngineCommon/PropertySheet.props
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <!--
-    To customize common C++/WinRT project properties: 
-    * right-click the project node
-    * expand the Common Properties item
-    * select the C++/WinRT property page
-
-    For more advanced scenarios, and complete documentation, please see:
-    https://github.com/Microsoft/cppwinrt/tree/master/nuget 
-    -->
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-</Project>
--- a/src/common/CalculatorEngineCommon/exprtk.hpp
+++ b/src/common/CalculatorEngineCommon/exprtk.hpp
--- a/src/common/CalculatorEngineCommon/packages.config
+++ b/src/common/CalculatorEngineCommon/packages.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-	<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>
--- a/src/common/CalculatorEngineCommon/pch.cpp
+++ b/src/common/CalculatorEngineCommon/pch.cpp
@@ -1 +0,0 @@
-#include "pch.h"
--- a/src/common/CalculatorEngineCommon/pch.h
+++ b/src/common/CalculatorEngineCommon/pch.h
@@ -1,4 +0,0 @@
-#pragma once
-#include <unknwn.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
--- a/src/common/CalculatorEngineCommon/readme.md
+++ b/src/common/CalculatorEngineCommon/readme.md
@@ -1,29 +0,0 @@
-# C++/WinRT CalculatorEngine Project Overview
-
-This project wraps the exprtk expression parsing library with a C++/WinRT component,  
-making advanced mathematical evaluation capabilities available to Windows applications.  
-It is designed specifically to provide calculation support for the CmdPal calculator extension.
-
-## Using exprtk
-
-This project uses [exprtk](https://github.com/ArashPartow/exprtk) as the 
-expression parsing and evaluation engine.
-
-How to use exprtk in this project:
- The exprtk header file (`exprtk.hpp`) is included in the project source.
- You can use exprtk to parse and evaluate mathematical expressions in your 
-  C++ code. For example:
-
-    ```cpp
-    #include "exprtk.hpp"
-    exprtk::expression<double> expression;
-    exprtk::parser<double> parser;
-    std::string formula = "3 + 4 * 2";
-    parser.compile(formula, expression);
-    double result = expression.value();
-    ```
-
-How to update exprtk:
-1. Download the latest `exprtk.hpp` from the [official repository](https://github.com/ArashPartow/exprtk).
-2. Replace the existing `exprtk.hpp` file in the project with the new version.
-3. Rebuild the project to ensure compatibility and take advantage of any updates.
--- a/src/common/CalculatorEngineCommon/resource.h
+++ b/src/common/CalculatorEngineCommon/resource.h
@@ -1,13 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by CalculatorEngineCommon.rc
-
-//////////////////////////////
-// Non-localizable
-
-#define FILE_DESCRIPTION "CalculatorEngineCommon"
-#define INTERNAL_NAME "CalculatorEngineCommon"
-#define ORIGINAL_FILENAME "CalculatorEngineCommon.dll"
-
-// Non-localizable
-//////////////////////////////
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -10,7 +10,7 @@
    <ProjectGuid>{f5e1146e-b7b3-4e11-85fd-270a500bd78c}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CropAndLock</RootNamespace>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.26100.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -154,9 +154,6 @@
    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\Themes\Themes.vcxproj">
-      <Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Import Project="..\..\..\..\deps\spdlog.props" />
--- a/src/modules/CropAndLock/CropAndLock/main.cpp
+++ b/src/modules/CropAndLock/CropAndLock/main.cpp
@@ -17,9 +17,6 @@

 #include <common/Telemetry/EtwTrace/EtwTrace.h>

-#include <common/Themes/theme_helpers.h>
-#include <common/Themes/theme_listener.h>
-
 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")

 namespace winrt
@@ -38,23 +35,6 @@ namespace util
 const std::wstring instanceMutexName = L"Local\\PowerToys_CropAndLock_InstanceMutex";
 bool m_running = true;

-// Theming
-ThemeListener theme_listener{};
-// Keep a list of our cropped windows
-std::vector<std::shared_ptr<CropAndLockWindow>> croppedWindows;
-
-void handleTheme()
-{
-    auto theme = theme_listener.AppTheme;
-    auto isDark = theme == Theme::Dark;
-    Logger::info(L"Theme is now {}", isDark ? L"Dark" : L"Light");
-    for (auto&& croppedWindow : croppedWindows)
-    {
-        ThemeHelpers::SetImmersiveDarkMode(croppedWindow->Handle(), isDark);
-    }
-}
-
-
 int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _In_ int)
 {
    // Initialize COM
@@ -62,8 +42,6 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I

    Trace::CropAndLock::RegisterProvider();

-    theme_listener.AddChangedHandler(handleTheme);
-
    Shared::Trace::ETWTrace trace;
    trace.UpdateState(true);

@@ -129,6 +107,8 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
    // Create our overlay window
    std::unique_ptr<OverlayWindow> overlayWindow;

+    // Keep a list of our cropped windows
+    std::vector<std::shared_ptr<CropAndLockWindow>> croppedWindows;

    // Handles and thread for the events sent from runner
    HANDLE m_reparent_event_handle;
@@ -187,7 +167,6 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
            croppedWindow->CropAndLock(targetWindow, cropRect);
            croppedWindow->OnClosed(removeWindowCallback);
            croppedWindows.push_back(croppedWindow);
-            handleTheme();
        };

        overlayWindow.reset();
--- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>
--- a/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
+++ b/src/modules/Hosts/Hosts.FuzzTests/Hosts.FuzzTests.csproj
@@ -6,7 +6,6 @@
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<DefineConstants>TESTONLY</DefineConstants>
 	</PropertyGroup>
 	
 	<PropertyGroup>
--- a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
+++ b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
@@ -611,7 +611,6 @@
        <ContentDialog
            x:Name="EntryDialog"
            x:Uid="EntryDialog"
-            x:DataType="models:Entry"
            IsPrimaryButtonEnabled="{Binding Valid, Mode=OneWay}"
            Loaded="ContentDialog_Loaded_ApplyMargin"
            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
--- a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml.cs
+++ b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml.cs
@@ -139,23 +139,10 @@ namespace HostsUILib.Views
                dialog.XamlRoot = XamlRoot;
                dialog.Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style;
                dialog.Title = resourceLoader.GetString("WarningDialog_Title");
-                dialog.Content = new StackPanel
+                dialog.Content = new TextBlock
                {
-                    Children =
-                    {
-                        new TextBlock
-                        {
-                            Text = resourceLoader.GetString("WarningDialog_Text"),
-                            TextWrapping = TextWrapping.Wrap,
-                        },
-                        new HyperlinkButton
-                        {
-                            Content = resourceLoader.GetString("WarningDialog_LearnMore"),
-                            NavigateUri = new Uri("https://aka.ms/PowerToysOverview_HostsFileEditor"),
-                            Padding = new Thickness(0),
-                            Margin = new Thickness(0, 5, 0, 5),
-                        },
-                    },
+                    Text = resourceLoader.GetString("WarningDialog_Text"),
+                    TextWrapping = TextWrapping.Wrap,
                };
                dialog.PrimaryButtonText = resourceLoader.GetString("WarningDialog_AcceptBtn");
                dialog.PrimaryButtonStyle = Application.Current.Resources["AccentButtonStyle"] as Style;
--- a/src/modules/Hosts/HostsUILib/Models/Entry.cs
+++ b/src/modules/Hosts/HostsUILib/Models/Entry.cs
@@ -11,9 +11,6 @@ using HostsUILib.Helpers;

 namespace HostsUILib.Models
 {
-#if !TESTONLY
-    [Microsoft.UI.Xaml.Data.Bindable]
-#endif
    public partial class Entry : ObservableObject
    {
        private static readonly char[] _spaceCharacters = new char[] { ' ', '\t' };
--- a/src/modules/Hosts/HostsUILib/Strings/en-us/Resources.resw
+++ b/src/modules/Hosts/HostsUILib/Strings/en-us/Resources.resw
@@ -331,9 +331,6 @@
  <data name="WarningDialog_Title" xml:space="preserve">
    <value>Warning</value>
  </data>
-  <data name="WarningDialog_LearnMore" xml:space="preserve">
-    <value>Learn more</value>
-  </data>
  <data name="WindowAdminTitle" xml:space="preserve">
    <value>Administrator: Hosts File Editor</value>
    <comment>Title of the window when running as administrator. "Hosts File Editor" is the name of the utility. "Hosts" refers to the system hosts file, do not loc</comment>
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -139,7 +139,7 @@
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
@@ -150,8 +150,8 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
@@ -9,7 +9,7 @@
    <Keyword>Win32Proj</Keyword>
    <ProjectGuid>{0db0f63a-d2f8-4da3-a650-2d0b8724218e}</ProjectGuid>
    <RootNamespace>NewPlusShellExtensionWin10</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
--- a/src/modules/Workspaces/WorkspacesEditor/Data/ProjectData.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/Data/ProjectData.cs
@@ -49,8 +49,6 @@ namespace WorkspacesEditor.Data
            public WindowPositionWrapper Position { get; set; }

            public int Monitor { get; set; }
-
-            public string Version { get; set; }
        }

        public struct MonitorConfigurationWrapper
--- a/src/modules/Workspaces/WorkspacesEditor/Models/Application.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/Models/Application.cs
@@ -41,7 +41,6 @@ namespace WorkspacesEditor.Models
            Maximized = other.Maximized;
            Position = other.Position;
            MonitorNumber = other.MonitorNumber;
-            Version = other.Version;

            Parent = other.Parent;
            IsNotFound = other.IsNotFound;
@@ -275,7 +274,5 @@ namespace WorkspacesEditor.Models
            CommandLineArguments = newCommandLineValue;
            OnPropertyChanged(new PropertyChangedEventArgs(nameof(AppMainParams)));
        }
-
-        public string Version { get; set; }
    }
 }
--- a/src/modules/Workspaces/WorkspacesEditor/Models/Project.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/Models/Project.cs
@@ -246,7 +246,6 @@ namespace WorkspacesEditor.Models
                    AppPath = app.ApplicationPath,
                    AppTitle = app.Title,
                    PwaAppId = string.IsNullOrEmpty(app.PwaAppId) ? string.Empty : app.PwaAppId,
-                    Version = string.IsNullOrEmpty(app.Version) ? string.Empty : app.Version,
                    PackageFullName = app.PackageFullName,
                    AppUserModelId = app.AppUserModelId,
                    Parent = this,
--- a/src/modules/Workspaces/WorkspacesEditor/Utils/WorkspacesEditorIO.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/Utils/WorkspacesEditorIO.cs
@@ -107,7 +107,6 @@ namespace WorkspacesEditor.Utils
                        CommandLineArguments = app.CommandLineArguments,
                        IsElevated = app.IsElevated,
                        CanLaunchElevated = app.CanLaunchElevated,
-                        Version = app.Version,
                        Maximized = app.Maximized,
                        Minimized = app.Minimized,
                        Position = new ProjectData.ApplicationWrapper.WindowPositionWrapper
--- a/src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp
+++ b/src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp
@@ -165,52 +165,16 @@ namespace AppLauncher

        if (!launched && !app.pwaAppId.empty())
        {
-            int version = 0;
-
-            if (app.version != L"")
+            std::filesystem::path appPath(app.path);
+            if (appPath.filename() == NonLocalizable::EdgeFilename)
            {
-                try
-                {
-                    version = std::stoi(app.version);
-                }
-                catch (const std::invalid_argument&)
-                {
-                    Logger::error(L"Invalid version format: {}", app.version);
-                    version = 0;
-                }
-                catch (const std::out_of_range&)
-                {
-                    Logger::error(L"Version out of range: {}", app.version);
-                    version = 0;
-                }
+                appPathFinal = appPath.parent_path() / NonLocalizable::EdgePwaFilename;
+                commandLineArgsFinal = NonLocalizable::PwaCommandLineAddition + app.pwaAppId + L" " + app.commandLineArgs;
            }
-
-            if (version >= 1)
+            if (appPath.filename() == NonLocalizable::ChromeFilename)
            {
-                auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
-                if (res.isOk())
-                {
-                    launched = true;
-                }
-                else
-                {
-                    launchErrors.push_back({ app.appUserModelId, res.error() });
-                }
-            }
-
-            if (!launched)
-            {
-                std::filesystem::path appPath(app.path);
-                if (appPath.filename() == NonLocalizable::EdgeFilename)
-                {
-                    appPathFinal = appPath.parent_path() / NonLocalizable::EdgePwaFilename;
-                    commandLineArgsFinal = NonLocalizable::PwaCommandLineAddition + app.pwaAppId + L" " + app.commandLineArgs;
-                }
-                if (appPath.filename() == NonLocalizable::ChromeFilename)
-                {
-                    appPathFinal = appPath.parent_path() / NonLocalizable::ChromePwaFilename;
-                    commandLineArgsFinal = NonLocalizable::PwaCommandLineAddition + app.pwaAppId + L" " + app.commandLineArgs;
-                }
+                appPathFinal = appPath.parent_path() / NonLocalizable::ChromePwaFilename;
+                commandLineArgsFinal = NonLocalizable::PwaCommandLineAddition + app.pwaAppId + L" " + app.commandLineArgs;
            }
        }

--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/PwaHelperTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/PwaHelperTests.cpp
@@ -76,6 +76,19 @@ namespace WorkspacesLibUnitTests
            Assert::IsTrue(result == nonExistentWindowAumid);
        }

+        TEST_METHOD (PwaHelper_GetAUMIDFromWindow_InvalidWindow_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            HWND invalidWindow = nullptr;
+
+            // Act
+            std::wstring result = helper.GetAUMIDFromWindow(invalidWindow);
+
+            // Assert
+            Assert::IsTrue(result.empty());
+        }
+
        TEST_METHOD (PwaHelper_GetEdgeAppId_ValidConstruction_DoesNotCrash)
        {
            // Arrange
--- a/src/modules/Workspaces/WorkspacesLib/PwaHelper.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/PwaHelper.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "PwaHelper.h"
-#include "WindowUtils.h"

 #include <filesystem>

@@ -52,7 +51,7 @@ namespace Utils
                localFolder = L""; // Ensure it is explicitly set to empty on failure
            }
        }
-
+        
        return localFolder;
    }

@@ -194,7 +193,7 @@ namespace Utils

        return std::nullopt;
    }
-
+    
    std::optional<std::wstring> PwaHelper::GetChromeAppId(const std::wstring& windowAumid) const
    {
        const auto appIdIndexStart = windowAumid.find(NonLocalizable::ChromeAppIdIdentifier);
@@ -257,4 +256,85 @@ namespace Utils

        return result;
    }
+
+    std::wstring PwaHelper::GetAUMIDFromWindow(HWND hwnd) const
+    {
+        std::wstring result{};
+        if (hwnd == NULL)
+        {
+            return result;
+        }
+
+        Microsoft::WRL::ComPtr<IPropertyStore> propertyStore;
+        HRESULT hr = SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(&propertyStore));
+        if (FAILED(hr))
+        {
+            return result;
+        }
+
+        PROPVARIANT propVariant;
+        PropVariantInit(&propVariant);
+
+        hr = propertyStore->GetValue(PKEY_AppUserModel_ID, &propVariant);
+        if (SUCCEEDED(hr) && propVariant.vt == VT_LPWSTR && propVariant.pwszVal != nullptr)
+        {
+            result = propVariant.pwszVal;
+        }
+
+        PropVariantClear(&propVariant);
+
+        Logger::info(L"Found a window with aumid {}", result);
+        return result;
+    }
+
+    std::wstring PwaHelper::GetAUMIDFromProcessId(DWORD processId) const
+    {
+        HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+        if (hProcess == NULL)
+        {
+            Logger::error(L"Failed to open process handle. Error: {}", get_last_error_or_default(GetLastError()));
+            return {};
+        }
+
+        // Get the package full name for the process
+        UINT32 packageFullNameLength = 0;
+        LONG rc = GetPackageFullName(hProcess, &packageFullNameLength, nullptr);
+        if (rc != ERROR_INSUFFICIENT_BUFFER)
+        {
+            Logger::error(L"Failed to get package full name length. Error code: {}", rc);
+            CloseHandle(hProcess);
+            return {};
+        }
+
+        std::vector<wchar_t> packageFullName(packageFullNameLength);
+        rc = GetPackageFullName(hProcess, &packageFullNameLength, packageFullName.data());
+        if (rc != ERROR_SUCCESS)
+        {
+            Logger::error(L"Failed to get package full name. Error code: {}", rc);
+            CloseHandle(hProcess);
+            return {};
+        }
+
+        // Get the AUMID for the package
+        UINT32 appModelIdLength = 0;
+        rc = GetApplicationUserModelId(hProcess, &appModelIdLength, nullptr);
+        if (rc != ERROR_INSUFFICIENT_BUFFER)
+        {
+            Logger::error(L"Failed to get AppUserModelId length. Error code: {}", rc);
+            CloseHandle(hProcess);
+            return {};
+        }
+
+        std::vector<wchar_t> appModelId(appModelIdLength);
+        rc = GetApplicationUserModelId(hProcess, &appModelIdLength, appModelId.data());
+        if (rc != ERROR_SUCCESS)
+        {
+            Logger::error(L"Failed to get AppUserModelId. Error code: {}", rc);
+            CloseHandle(hProcess);
+            return {};
+        }
+
+        CloseHandle(hProcess);
+        return std::wstring(appModelId.data());
+    }
 }
--- a/src/modules/Workspaces/WorkspacesLib/PwaHelper.h
+++ b/src/modules/Workspaces/WorkspacesLib/PwaHelper.h
@@ -12,16 +12,19 @@ namespace Utils
        PwaHelper();
        ~PwaHelper() = default;

-        std::optional<std::wstring> GetEdgeAppId(const std::wstring& windowAumid) const;
-        std::optional<std::wstring> GetChromeAppId(const std::wstring& windowAumid) const;
-        std::wstring SearchPwaName(const std::wstring& pwaAppId, const std::wstring& windowAumid) const;
+        std::wstring GetAUMIDFromWindow(HWND hWnd) const;

+        std::optional<std::wstring> GetEdgeAppId(const std::wstring& windowAumid) const;
+        std::optional<std::wstring> GetChromeAppId(const std::wstring& windowAumid) const;   
+        std::wstring SearchPwaName(const std::wstring& pwaAppId, const std::wstring& windowAumid) const;
+        
    private:
        void InitAppIds(const std::wstring& browserDataFolder, const std::wstring& browserDirPrefix, const std::function<void(const std::wstring&)>& addingAppIdCallback);
        void InitEdgeAppIds();
        void InitChromeAppIds();

        std::wstring GetAppIdFromCommandLineArgs(const std::wstring& commandLineArgs) const;
+        std::wstring GetAUMIDFromProcessId(DWORD processId) const;

        std::map<std::wstring, std::wstring> m_edgeAppIds;
        std::vector<std::wstring> m_chromeAppIds;
--- a/src/modules/Workspaces/WorkspacesLib/StringUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/StringUtils.cpp
@@ -1,18 +0,0 @@
-#include "pch.h"
-
-#include "StringUtils.h"
-
-namespace StringUtils
-{
-    bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
-    {
-        if (str1.size() != str2.size())
-        {
-            return false;
-        }
-
-        return std::equal(str1.begin(), str1.end(), str2.begin(), [](wchar_t ch1, wchar_t ch2) {
-            return towupper(ch1) == towupper(ch2);
-        });
-    }
-}
--- a/src/modules/Workspaces/WorkspacesLib/StringUtils.h
+++ b/src/modules/Workspaces/WorkspacesLib/StringUtils.h
@@ -6,5 +6,15 @@

 namespace StringUtils
 {
-    bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2);
+    inline bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
+    {
+        if (str1.size() != str2.size())
+        {
+            return false;
+        }
+
+        return std::equal(str1.begin(), str1.end(), str2.begin(), [](wchar_t ch1, wchar_t ch2) {
+            return towupper(ch1) == towupper(ch2);
+        });
+    }
 }
--- a/src/modules/Workspaces/WorkspacesLib/WindowUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/WindowUtils.cpp
@@ -1,105 +0,0 @@
-#include "pch.h"
-#include "WindowUtils.h"
-#include <filesystem>
-
-#include <appmodel.h>
-
-#include <shellapi.h>
-#include <ShlObj.h>
-#include <shobjidl.h>
-#include <tlhelp32.h>
-#include <wrl.h>
-#include <propkey.h>
-
-#include <wil/com.h>
-
-#include <common/logger/logger.h>
-#include <common/utils/winapi_error.h>
-
-#include <WorkspacesLib/AppUtils.h>
-#include <WorkspacesLib/CommandLineArgsHelper.h>
-#include <WorkspacesLib/StringUtils.h>
-
-namespace Utils
-{
-    std::wstring GetAUMIDFromProcessId(DWORD processId)
-    {
-        HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
-        if (hProcess == NULL)
-        {
-            Logger::error(L"Failed to open process handle. Error: {}", get_last_error_or_default(GetLastError()));
-            return {};
-        }
-
-        // Get the package full name for the process
-        UINT32 packageFullNameLength = 0;
-        LONG rc = GetPackageFullName(hProcess, &packageFullNameLength, nullptr);
-        if (rc != ERROR_INSUFFICIENT_BUFFER)
-        {
-            Logger::error(L"Failed to get package full name length. Error code: {}", rc);
-            CloseHandle(hProcess);
-            return {};
-        }
-
-        std::vector<wchar_t> packageFullName(packageFullNameLength);
-        rc = GetPackageFullName(hProcess, &packageFullNameLength, packageFullName.data());
-        if (rc != ERROR_SUCCESS)
-        {
-            Logger::error(L"Failed to get package full name. Error code: {}", rc);
-            CloseHandle(hProcess);
-            return {};
-        }
-
-        // Get the AUMID for the package
-        UINT32 appModelIdLength = 0;
-        rc = GetApplicationUserModelId(hProcess, &appModelIdLength, nullptr);
-        if (rc != ERROR_INSUFFICIENT_BUFFER)
-        {
-            Logger::error(L"Failed to get AppUserModelId length. Error code: {}", rc);
-            CloseHandle(hProcess);
-            return {};
-        }
-
-        std::vector<wchar_t> appModelId(appModelIdLength);
-        rc = GetApplicationUserModelId(hProcess, &appModelIdLength, appModelId.data());
-        if (rc != ERROR_SUCCESS)
-        {
-            Logger::error(L"Failed to get AppUserModelId. Error code: {}", rc);
-            CloseHandle(hProcess);
-            return {};
-        }
-
-        CloseHandle(hProcess);
-        return std::wstring(appModelId.data());
-    }
-
-    std::wstring GetAUMIDFromWindow(HWND hwnd)
-    {
-        std::wstring result{};
-        if (hwnd == NULL)
-        {
-            return result;
-        }
-
-        Microsoft::WRL::ComPtr<IPropertyStore> propertyStore;
-        HRESULT hr = SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(&propertyStore));
-        if (FAILED(hr))
-        {
-            return result;
-        }
-
-        PROPVARIANT propVariant;
-        PropVariantInit(&propVariant);
-
-        hr = propertyStore->GetValue(PKEY_AppUserModel_ID, &propVariant);
-        if (SUCCEEDED(hr) && propVariant.vt == VT_LPWSTR && propVariant.pwszVal != nullptr)
-        {
-            result = propVariant.pwszVal;
-        }
-
-        PropVariantClear(&propVariant);
-
-        Logger::info(L"Found a window with aumid {}", result);
-        return result;
-    }
-}
--- a/src/modules/Workspaces/WorkspacesLib/WindowUtils.h
+++ b/src/modules/Workspaces/WorkspacesLib/WindowUtils.h
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <functional>
-
-#include <WorkspacesLib/AppUtils.h>
-#include <wtypes.h>
-
-namespace Utils
-{
-    std::wstring GetAUMIDFromWindow(HWND hWnd);
-    std::wstring GetAUMIDFromProcessId(DWORD processId);
-};
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesData.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesData.cpp
@@ -87,7 +87,6 @@ namespace WorkspacesData
                const static wchar_t* MaximizedID = L"maximized";
                const static wchar_t* PositionID = L"position";
                const static wchar_t* MonitorID = L"monitor";
-                const static wchar_t* VersionID = L"version";
            }

            json::JsonObject ToJson(const WorkspacesProject::Application& data)
@@ -107,7 +106,6 @@ namespace WorkspacesData
                json.SetNamedValue(NonLocalizable::MaximizedID, json::value(data.isMaximized));
                json.SetNamedValue(NonLocalizable::PositionID, PositionJSON::ToJson(data.position));
                json.SetNamedValue(NonLocalizable::MonitorID, json::value(data.monitor));
-                json.SetNamedValue(NonLocalizable::VersionID, json::value(data.version));

                return json;
            }
@@ -170,11 +168,6 @@ namespace WorkspacesData

                        result.position = position.value();
                    }
-
-                    if (json.HasKey(NonLocalizable::VersionID))
-                    {
-                        result.version = json.GetNamedString(NonLocalizable::VersionID);
-                    }
                }
                catch (const winrt::hresult_error&)
                {
@@ -293,7 +286,6 @@ namespace WorkspacesData
            const static wchar_t* MoveExistingWindowsID = L"move-existing-windows";
            const static wchar_t* MonitorConfigurationID = L"monitor-configuration";
            const static wchar_t* AppsID = L"applications";
-            const static wchar_t* Version = L"version";
        }

        json::JsonObject ToJson(const WorkspacesProject& data)
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesData.h
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesData.h
@@ -33,9 +33,6 @@ namespace WorkspacesData
            std::wstring appUserModelId;
            std::wstring pwaAppId;
            std::wstring commandLineArgs;
-
-            // empty to 1,
-            std::wstring version;
            bool isElevated{};
            bool canLaunchElevated{};
            bool isMinimized{};
@@ -89,7 +86,7 @@ namespace WorkspacesData
    {
        WorkspacesData::WorkspacesProject::Application application;
        HWND window{};
-        LaunchingState state{ LaunchingState::Waiting };
+        LaunchingState state { LaunchingState::Waiting };
    };

    using LaunchingAppStateMap = std::map<WorkspacesData::WorkspacesProject::Application, LaunchingAppState>;
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
@@ -45,7 +45,6 @@
    <ClInclude Include="StringUtils.h" />
    <ClInclude Include="utils.h" />
    <ClInclude Include="WbemHelper.h" />
-    <ClInclude Include="WindowUtils.h" />
    <ClInclude Include="WorkspacesData.h" />
    <ClInclude Include="trace.h" />
  </ItemGroup>
@@ -60,10 +59,8 @@
    </ClCompile>
    <ClCompile Include="PwaHelper.cpp" />
    <ClCompile Include="SteamGameHelper.cpp" />
-    <ClCompile Include="StringUtils.cpp" />
    <ClCompile Include="two_way_pipe_message_ipc.cpp" />
    <ClCompile Include="WbemHelper.cpp" />
-    <ClCompile Include="WindowUtils.cpp" />
    <ClCompile Include="WorkspacesData.cpp" />
    <ClCompile Include="trace.cpp" />
  </ItemGroup>
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
@@ -56,9 +56,6 @@
    <ClInclude Include="SteamHelper.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="WindowUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="pch.cpp">
@@ -97,12 +94,6 @@
    <ClCompile Include="SteamGameHelper.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="WindowUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StringUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
@@ -11,7 +11,6 @@

 #include <WorkspacesLib/AppUtils.h>
 #include <WorkspacesLib/PwaHelper.h>
-#include <WorkspacesLib/WindowUtils.h>
 #include <WindowProperties/WorkspacesWindowPropertyUtils.h>

 #include "Generated Files/resource.h"
@@ -140,7 +139,7 @@ namespace SnapshotUtils
            bool isChrome = appData.IsChrome();
            if (isEdge || isChrome)
            {
-                auto windowAumid = Utils::GetAUMIDFromWindow(window);
+                auto windowAumid = pwaHelper.GetAUMIDFromWindow(window);
                std::optional<std::wstring> pwaAppId{};

                if (isEdge)
@@ -159,8 +158,6 @@ namespace SnapshotUtils

                    appData.pwaAppId = pwaAppId.value();
                    appData.name = pwaName + L" (" + appData.name + L")";
-                    // If it's pwa app, appUserModelId should be their own pwa id.
-                    appData.appUserModelId = windowAumid;
                }
            }

@@ -188,7 +185,6 @@ namespace SnapshotUtils
                .appUserModelId = appData.appUserModelId,
                .pwaAppId = appData.pwaAppId,
                .commandLineArgs = L"",
-                .version = L"1",
                .isElevated = IsProcessElevated(pid),
                .canLaunchElevated = appData.canLaunchElevated,
                .isMinimized = isMinimized,
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp
+++ b/src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp
@@ -13,7 +13,6 @@

 #include <WindowProperties/WorkspacesWindowPropertyUtils.h>
 #include <WorkspacesLib/PwaHelper.h>
-#include <WorkspacesLib/WindowUtils.h>

 namespace NonLocalizable
 {
@@ -204,7 +203,7 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa

        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
        {
-            // Only care about steam games if it has no thick frame to remain consistent with
+            // Only care about steam games if it has no thick frame to remain consistent with 
            // the behavior as before.
            continue;
        }
@@ -221,7 +220,7 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
        bool isChrome = appData.IsChrome();
        if (isEdge || isChrome)
        {
-            auto windowAumid = Utils::GetAUMIDFromWindow(window);
+            auto windowAumid = pwaHelper.GetAUMIDFromWindow(window);
            std::optional<std::wstring> pwaAppId{};

            if (isEdge)
--- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
+++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
@@ -117,18 +117,16 @@ private:

        for (DWORD pid : processIds)
        {
-            HANDLE hProcess = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, FALSE, pid);
+            HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid);

            if (hProcess != NULL)
            {
                SetEvent(m_hTerminateEvent);

-                // Wait for 1.5 seconds for the process to end correctly, allowing time for ETW tracer and extensions to stop
-                if (WaitForSingleObject(hProcess, 1500) == WAIT_TIMEOUT)
-                {
-                    TerminateProcess(hProcess, 0);
-                }
+                // Wait for 1.5 seconds for the process to end correctly and stop etw tracer
+                WaitForSingleObject(hProcess, 1500);

+                TerminateProcess(hProcess, 0);
                CloseHandle(hProcess);
            }
        }
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -8,7 +8,7 @@
    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
@@ -4,8 +4,8 @@
    <RootNamespace>TemplateCmdPalExtension</RootNamespace>
    <ApplicationManifest>app.manifest</ApplicationManifest>

-    <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -102,8 +102,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
            }

            HandleChangeAlias();
-            OnPropertyChanged(nameof(AliasText));
-            OnPropertyChanged(nameof(IsDirectAlias));
        }
    }

@@ -118,7 +116,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
            }

            HandleChangeAlias();
-            OnPropertyChanged(nameof(IsDirectAlias));
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
@@ -67,7 +67,6 @@ public partial class App : Application
            "Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd", () =>
            {
                EtwTrace?.Dispose();
-                AppWindow?.Close();
                Environment.Exit(0);
            });
    }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -57,11 +57,7 @@ public sealed partial class MainWindow : WindowEx,
        InitializeComponent();

        _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
-
-        unsafe
-        {
-            CommandPaletteHost.SetHostHwnd((ulong)_hwnd.Value);
-        }
+        CommandPaletteHost.SetHostHwnd((ulong)_hwnd.Value);

        _keyboardListener = new KeyboardListener();
        _keyboardListener.Start();
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -105,10 +105,6 @@
    <ProjectCapability Include="Msix" />
  </ItemGroup>

-  <ItemGroup>
-	<RdXmlFile Include="rd.xml" />
-  </ItemGroup>
-
  <ItemGroup>
    <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Page
    x:Class="Microsoft.CmdPal.UI.Settings.ExtensionPage"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -92,11 +92,12 @@

                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_Alias_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE8AC;}">
                                                        <StackPanel Orientation="Vertical">
-                                                            <TextBox Text="{x:Bind AliasText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                                            <TextBox Text="{x:Bind AliasText, Mode=TwoWay}" />
                                                            <ToggleSwitch
-                                                                x:Uid="Settings_ExtensionPage_Alias_ToggleSwitch"
                                                                IsEnabled="{x:Bind AliasText, Converter={StaticResource StringEmptyToBoolConverter}, Mode=OneWay}"
-                                                                IsOn="{x:Bind IsDirectAlias, Mode=TwoWay}" />
+                                                                IsOn="{x:Bind IsDirectAlias, Mode=TwoWay}"
+                                                                OffContent="Indirect"
+                                                                OnContent="Direct" />
                                                        </StackPanel>
                                                    </controls:SettingsCard>

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -418,10 +418,4 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
  <data name="TrayMenu_Exit" xml:space="preserve">
    <value>Exit</value>
  </data>
-  <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OnContent" xml:space="preserve">
-    <value>Direct</value>
-  </data>
-  <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OffContent" xml:space="preserve">
-    <value>Indirect</value>
-  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml
@@ -1,7 +0,0 @@
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-	<Application>
-		<Assembly Name="Microsoft.WinUI">
-			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
-		</Assembly>
-	</Application>
-</Directives>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -19,7 +19,7 @@
    <AppContainerApplication>false</AppContainerApplication>
    <ApplicationType>Windows Store</ApplicationType>
    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.26100.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/CopyPathCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/CopyPathCommand.cs
@@ -1,49 +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.Text;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class CopyPathCommand : InvokableCommand
-{
-    private static readonly IconInfo TheIcon = new("\ue8c8");
-
-    private readonly string _target;
-
-    public CopyPathCommand(string target)
-    {
-        Name = Resources.copy_path;
-        Icon = TheIcon;
-
-        _target = target;
-    }
-
-    private static readonly CompositeFormat CopyFailedFormat = CompositeFormat.Parse(Resources.copy_failed);
-
-    public override CommandResult Invoke()
-    {
-        try
-        {
-            ClipboardHelper.SetText(_target);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Copy failed: " + ex.Message);
-            return CommandResult.ShowToast(
-                new ToastArgs
-                {
-                    Message = string.Format(CultureInfo.CurrentCulture, CopyFailedFormat, ex.Message),
-                    Result = CommandResult.KeepOpen(),
-                });
-        }
-
-        return CommandResult.ShowToast(Resources.copied_to_clipboard);
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
@@ -85,10 +85,6 @@ public class UWPApplication : IProgram
            // We don't add context menu to 'run as different user', because UWP applications normally installed per user and not for all users.
        }

-        commands.Add(
-            new CommandContextItem(
-                new CopyPathCommand(Location)));
-
        commands.Add(
            new CommandContextItem(
                new OpenPathCommand(Location)
@@ -221,10 +217,11 @@ public class UWPApplication : IProgram
            var capacity = 1024U;
            PWSTR outBuffer = new PWSTR((char*)(void*)Marshal.AllocHGlobal((int)capacity * sizeof(char)));
            var source = $"@{{{packageFullName}? {parsed}}}";
+            void* reserved = null;

            try
            {
-                PInvoke.SHLoadIndirectString(source, outBuffer.AsSpan()).ThrowOnFailure();
+                PInvoke.SHLoadIndirectString(source, outBuffer, capacity, ref reserved).ThrowOnFailure();

                var loaded = outBuffer.ToString();
                return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
@@ -234,7 +231,7 @@ public class UWPApplication : IProgram
                try
                {
                    var sourceFallback = $"@{{{packageFullName}?{parsedFallback}}}";
-                    PInvoke.SHLoadIndirectString(sourceFallback, outBuffer.AsSpan()).ThrowOnFailure();
+                    PInvoke.SHLoadIndirectString(sourceFallback, outBuffer, capacity, ref reserved).ThrowOnFailure();
                    var loaded = outBuffer.ToString();
                    return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
                }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
@@ -198,9 +198,6 @@ public class Win32Program : IProgram
                    new RunAsUserCommand(!string.IsNullOrEmpty(LnkFilePath) ? LnkFilePath : FullPath, ParentDirectory)));
        }

-        commands.Add(new CommandContextItem(
-                    new CopyPathCommand(FullPath)));
-
        commands.Add(new CommandContextItem(
                    new OpenPathCommand(ParentDirectory)));

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs
@@ -78,33 +78,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Copied to clipboard!.
-        /// </summary>
-        internal static string copied_to_clipboard {
-            get {
-                return ResourceManager.GetString("copied_to_clipboard", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy failed ({0}). Please try again..
-        /// </summary>
-        internal static string copy_failed {
-            get {
-                return ResourceManager.GetString("copy_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy path.
-        /// </summary>
-        internal static string copy_path {
-            get {
-                return ResourceManager.GetString("copy_path", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Include apps found on the desktop.
        /// </summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx
@@ -163,22 +163,12 @@
  <data name="open_location" xml:space="preserve">
    <value>Open location</value>
  </data>
-  <data name="copy_path" xml:space="preserve">
-    <value>Copy path</value>
-  </data>
  <data name="run_as_administrator" xml:space="preserve">
    <value>Run as administrator</value>
  </data>
  <data name="run_as_different_user" xml:space="preserve">
    <value>Run as different user</value>
  </data>
-  <data name="copy_failed" xml:space="preserve">
-    <value>Copy failed ({0}). Please try again.</value>
-    <comment>{0} is the error message</comment>
-  </data>
-  <data name="copied_to_clipboard" xml:space="preserve">
-    <value>Copied to clipboard!</value>
-  </data>
  <data name="enable_start_menu_source" xml:space="preserve">
    <value>Include apps found in the Start Menu</value>
  </data>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/CalculateEngine.cs
@@ -6,20 +6,20 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text.RegularExpressions;
-using CalculatorEngineCommon;
-using Windows.Foundation.Collections;
+
+using Mages.Core;

 namespace Microsoft.CmdPal.Ext.Calc.Helper;

 public static class CalculateEngine
 {
-    private static readonly PropertySet _constants = new()
+    private static readonly Engine _magesEngine = new Engine(new Configuration
    {
-        { "pi", Math.PI },
-        { "e", Math.E },
-    };
-
-    private static readonly Calculator _calculator = new Calculator(_constants);
+        Scope = new Dictionary<string, object>
+        {
+            { "e", Math.E }, // e is not contained in the default mages engine
+        },
+    });

    public const int RoundingDigits = 10;

@@ -68,26 +68,28 @@ public static class CalculateEngine
        // Expand conversions between trig units
        input = CalculateHelper.ExpandTrigConversions(input, trigMode);

-        var result = _calculator.EvaluateExpression(input);
+        var result = _magesEngine.Interpret(input);

        // This could happen for some incorrect queries, like pi(2)
-        if (result == "NaN")
+        if (result == null)
        {
            error = Properties.Resources.calculator_expression_not_complete;
            return default;
        }

-        if (string.IsNullOrEmpty(result))
+        result = TransformResult(result);
+        if (result is string)
+        {
+            error = result as string;
+            return default;
+        }
+
+        if (string.IsNullOrEmpty(result?.ToString()))
        {
            return default;
        }

        var decimalResult = Convert.ToDecimal(result, cultureInfo);
-
-        // Remove trailing zeros from the decimal string representation (e.g., "1.2300" -> "1.23")
-        // This is necessary because the value extracted from exprtk may contain unnecessary trailing zeros.
-        var formatted = decimalResult.ToString("G29", cultureInfo);
-        decimalResult = Convert.ToDecimal(formatted, cultureInfo);
        var roundedResult = Round(decimalResult);

        return new CalculateResult()
@@ -101,4 +103,25 @@ public static class CalculateEngine
    {
        return Math.Round(value, RoundingDigits, MidpointRounding.AwayFromZero);
    }
+
+    private static dynamic TransformResult(object result)
+    {
+        if (result.ToString() == "NaN")
+        {
+            return Properties.Resources.calculator_not_a_number;
+        }
+
+        if (result is Function)
+        {
+            return Properties.Resources.calculator_expression_not_complete;
+        }
+
+        if (result is double[,])
+        {
+            // '[10,10]' is interpreted as array by mages engine
+            return Properties.Resources.calculator_double_array_returned;
+        }
+
+        return result;
+    }
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/NumberTranslator.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/NumberTranslator.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -64,61 +63,46 @@ public class NumberTranslator
        return Translate(input, targetCulture, sourceCulture, splitRegexForTarget);
    }

-    private static string ConvertBaseLiteral(string token, CultureInfo cultureTo)
-    {
-        var prefixes = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase)
-        {
-            { "0x", 16 },
-            { "0b", 2 },
-            { "0o", 8 },
-        };
-
-        foreach (var (prefix, numberBase) in prefixes)
-        {
-            if (token.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
-            {
-                try
-                {
-                    var num = Convert.ToInt64(token.Substring(prefix.Length), numberBase);
-                    return num.ToString(cultureTo);
-                }
-                catch
-                {
-                    return null; // fallback
-                }
-            }
-        }
-
-        return null;
-    }
-
    private static string Translate(string input, CultureInfo cultureFrom, CultureInfo cultureTo, Regex splitRegex)
    {
        var outputBuilder = new StringBuilder();
+        var hexRegex = new Regex(@"(?:(0x[\da-fA-F]+))");

-        // Match numbers in hexadecimal (0x..), binary (0b..), or octal (0o..) format,
-        // and convert them to decimal form for compatibility with ExprTk (which only supports decimal input).
-        var baseNumberRegex = new Regex(@"(0[xX][\da-fA-F]+|0[bB][0-9]+|0[oO][0-9]+)");
+        var hexTokens = hexRegex.Split(input);

-        var tokens = baseNumberRegex.Split(input);
-
-        foreach (var token in tokens)
+        foreach (var hexToken in hexTokens)
        {
-            // Currently, we only convert base literals (hexadecimal, binary, octal) to decimal.
-            var converted = ConvertBaseLiteral(token, cultureTo);
-
-            if (converted != null)
+            if (hexToken.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
            {
-                outputBuilder.Append(converted);
+                // Mages engine has issues processing large hex number (larger than 7 hex digits + 0x prefix = 9 characters). So we convert it to decimal and pass it to the engine.
+                if (hexToken.Length > 9)
+                {
+                    try
+                    {
+                        var num = Convert.ToInt64(hexToken, 16);
+                        var numStr = num.ToString(cultureFrom);
+                        outputBuilder.Append(numStr);
+                    }
+                    catch (Exception)
+                    {
+                        outputBuilder.Append(hexToken);
+                    }
+                }
+                else
+                {
+                    outputBuilder.Append(hexToken);
+                }
+
                continue;
            }

-            foreach (var inner in splitRegex.Split(token))
+            var tokens = splitRegex.Split(hexToken);
+            foreach (var token in tokens)
            {
                var leadingZeroCount = 0;

                // Count leading zero characters.
-                foreach (var c in inner)
+                foreach (var c in token)
                {
                    if (c != '0')
                    {
@@ -129,7 +113,7 @@ public class NumberTranslator
                }

                // number is all zero characters. no need to add zero characters at the end.
-                if (inner.Length == leadingZeroCount)
+                if (token.Length == leadingZeroCount)
                {
                    leadingZeroCount = 0;
                }
@@ -137,9 +121,9 @@ public class NumberTranslator
                decimal number;

                outputBuilder.Append(
-                    decimal.TryParse(inner, NumberStyles.Number, cultureFrom, out number)
+                    decimal.TryParse(token, NumberStyles.Number, cultureFrom, out number)
                    ? (new string('0', leadingZeroCount) + number.ToString(cultureTo))
-                    : inner.Replace(cultureFrom.TextInfo.ListSeparator, cultureTo.TextInfo.ListSeparator));
+                    : token.Replace(cultureFrom.TextInfo.ListSeparator, cultureTo.TextInfo.ListSeparator));
            }
        }

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs
@@ -65,6 +65,11 @@ public static partial class QueryHelper

            return ResultHelper.CreateResult(result.RoundedResult, inputCulture, outputCulture, query, handleSave);
        }
+        catch (Mages.Core.ParseException)
+        {
+            // Invalid input
+            return ErrorHandler.OnError(isFallbackSearch, query, Properties.Resources.calculator_expression_not_complete);
+        }
        catch (OverflowException)
        {
            // Result to big to convert to decimal
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Microsoft.CmdPal.Ext.Calc.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Microsoft.CmdPal.Ext.Calc.csproj
@@ -9,25 +9,15 @@
    <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
    <ProjectPriFileName>Microsoft.CmdPal.Ext.Calc.pri</ProjectPriFileName>
  </PropertyGroup>
-  <PropertyGroup>
-    <CsWinRTIncludes>CalculatorEngineCommon</CsWinRTIncludes>
-    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-  </PropertyGroup>
-
  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\CalculatorEngineCommon\CalculatorEngineCommon.vcxproj" />
    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
    <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
  </ItemGroup>
+
  <ItemGroup>
-    <CsWinRTInputs Include="..\..\..\..\..\$(Platform)\$(Configuration)\CalculatorEngineCommon.winmd" />
-    <Content Include="..\..\..\..\..\$(Platform)\$(Configuration)\CalculatorEngineCommon.winmd" Link="CalculatorEngineCommon.winmd">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\..\..\..\$(Platform)\$(Configuration)\CalculatorEngineCommon.dll">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <PackageReference Include="Mages" />
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DependentUpon>Resources.resx</DependentUpon>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Actions/ActionRuntimeFactory.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Actions/ActionRuntimeFactory.cs
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.CmdPal.Ext.Indexer.Native;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.System.Com;
-using WinRT;
-using WinRT.Interop;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Data;
-
-internal static class ActionRuntimeFactory
-{
-    private const string ActionRuntimeClsidStr = "C36FEF7E-35F3-4192-9F2C-AF1FD425FB85";
-
-    // typeof(Windows.AI.Actions.IActionRuntime).GUID
-    private static readonly Guid IActionRuntimeIID = Guid.Parse("206EFA2C-C909-508A-B4B0-9482BE96DB9C");
-
-    public static unsafe global::Windows.AI.Actions.ActionRuntime CreateActionRuntime()
-    {
-        IntPtr abiPtr = default;
-        try
-        {
-            Guid classId = Guid.Parse(ActionRuntimeClsidStr);
-            Guid iid = IActionRuntimeIID;
-
-            var hresult = NativeMethods.CoCreateInstance(ref Unsafe.AsRef(in classId), IntPtr.Zero, NativeHelpers.CLSCTXLOCALSERVER, ref iid, out abiPtr);
-            Marshal.ThrowExceptionForHR((int)hresult);
-
-            return MarshalInterface<global::Windows.AI.Actions.ActionRuntime>.FromAbi(abiPtr);
-        }
-        finally
-        {
-            MarshalInspectable<object>.DisposeAbi(abiPtr);
-        }
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Assets/Actions.png
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Assets/Actions.png
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/ExecuteActionCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/ExecuteActionCommand.cs
@@ -1,43 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.AI.Actions.Hosting;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Commands;
-
-internal sealed partial class ExecuteActionCommand : InvokableCommand
-{
-    private readonly ActionInstance actionInstance;
-
-    internal ExecuteActionCommand(ActionInstance actionInstance)
-    {
-        this.actionInstance = actionInstance;
-        this.Name = actionInstance.DisplayInfo.Description;
-        this.Icon = new IconInfo(actionInstance.Definition.IconFullPath);
-    }
-
-    public override CommandResult Invoke()
-    {
-        var task = Task.Run(InvokeAsync);
-        task.Wait();
-
-        return task.Result;
-    }
-
-    private async Task<CommandResult> InvokeAsync()
-    {
-        try
-        {
-            await actionInstance.InvokeAsync();
-            return CommandResult.GoHome();
-        }
-        catch (Exception ex)
-        {
-            return CommandResult.ShowToast("Failed to invoke action " + actionInstance.Definition.Id + ": " + ex.Message);
-        }
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
@@ -4,11 +4,8 @@

 using System.Collections.Generic;
 using Microsoft.CmdPal.Ext.Indexer.Commands;
-using Microsoft.CmdPal.Ext.Indexer.Pages;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
-using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Foundation.Metadata;

 namespace Microsoft.CmdPal.Ext.Indexer.Data;

@@ -41,24 +38,9 @@ internal sealed partial class IndexerListItem : ListItem
            }
        }

-        IContextItem[] moreCommands = [
-            ..context,
-            new CommandContextItem(new OpenWithCommand(indexerItem))];
-
-        if (ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))
-        {
-            var actionsListContextItem = new ActionsListContextItem(indexerItem.FullPath);
-            if (actionsListContextItem.AnyActions())
-            {
-                moreCommands = [
-                    .. moreCommands,
-                    actionsListContextItem
-                ];
-            }
-        }
-
        MoreCommands = [
-            .. moreCommands,
+            ..context,
+            new CommandContextItem(new OpenWithCommand(indexerItem)),
            new CommandContextItem(new ShowFileInFolderCommand(indexerItem.FullPath) { Name = Resources.Indexer_Command_ShowInFolder }),
            new CommandContextItem(new CopyPathCommand(indexerItem)),
            new CommandContextItem(new OpenInConsoleCommand(indexerItem)),
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
@@ -34,9 +34,6 @@
    <Content Update="Assets\FileExplorer.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Update="Assets\Actions.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Update="Assets\FileExplorer.svg">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Native/NativeHelpers.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Native/NativeHelpers.cs
@@ -11,7 +11,6 @@ public sealed partial class NativeHelpers
    public const uint SEEMASKINVOKEIDLIST = 12;

    public const uint CLSCTXINPROCALL = 0x17;
-    public const uint CLSCTXLOCALSERVER = 0x4;

    public struct PropertyKeys
    {
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/NativeMethods.json
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/NativeMethods.json
@@ -1,7 +1,6 @@
 {
  "$schema": "https://aka.ms/CsWin32.schema.json",
  "allowMarshaling": false,
-  "comInterop": {
-    "preserveSigMethods": [ "*" ]
-  }
+  "emitSingleFile": false,
+  "public": true
 }
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ActionsListContextItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ActionsListContextItem.cs
@@ -1,93 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Indexer.Commands;
-using Microsoft.CmdPal.Ext.Indexer.Data;
-using Microsoft.CmdPal.Ext.Indexer.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.AI.Actions;
-using Windows.System;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Pages;
-
-internal sealed partial class ActionsListContextItem : CommandContextItem
-{
-    private readonly string fullPath;
-    private readonly List<CommandContextItem> actions = [];
-    private static readonly Lock UpdateMoreCommandsLock = new();
-    private static ActionRuntime actionRuntime;
-
-    public ActionsListContextItem(string fullPath)
-        : base(new NoOpCommand())
-    {
-        Title = Resources.Indexer_Command_Actions;
-        Icon = Icons.Actions;
-        RequestedShortcut = KeyChordHelpers.FromModifiers(alt: true, vkey: VirtualKey.A);
-        this.fullPath = fullPath;
-        UpdateMoreCommands();
-    }
-
-    public bool AnyActions() => actions.Count != 0;
-
-    private void ActionCatalog_Changed(global::Windows.AI.Actions.Hosting.ActionCatalog sender, object args)
-    {
-        UpdateMoreCommands();
-    }
-
-    private void UpdateMoreCommands()
-    {
-        try
-        {
-            lock (UpdateMoreCommandsLock)
-            {
-                if (actionRuntime == null)
-                {
-                    actionRuntime = ActionRuntimeFactory.CreateActionRuntime();
-                    Task.Delay(500).Wait();
-                }
-
-                actionRuntime.ActionCatalog.Changed -= ActionCatalog_Changed;
-                actionRuntime.ActionCatalog.Changed += ActionCatalog_Changed;
-            }
-
-            var extension = System.IO.Path.GetExtension(fullPath).ToLower(CultureInfo.InvariantCulture);
-            ActionEntity entity = null;
-            if (extension != null)
-            {
-                if (extension == ".jpg" || extension == ".jpeg" || extension == ".png")
-                {
-                    entity = actionRuntime.EntityFactory.CreatePhotoEntity(fullPath);
-                }
-                else if (extension == ".docx" || extension == ".doc" || extension == ".pdf" || extension == ".txt")
-                {
-                    entity = actionRuntime.EntityFactory.CreateDocumentEntity(fullPath);
-                }
-            }
-
-            if (entity == null)
-            {
-                entity = actionRuntime.EntityFactory.CreateFileEntity(fullPath);
-            }
-
-            lock (actions)
-            {
-                actions.Clear();
-                foreach (var actionInstance in actionRuntime.ActionCatalog.GetActionsForInputs([entity]))
-                {
-                    actions.Add(new CommandContextItem(new ExecuteActionCommand(actionInstance)));
-                }
-
-                MoreCommands = [.. actions];
-            }
-        }
-        catch
-        {
-            actionRuntime = null;
-        }
-    }
-}
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/Icons.cs
@@ -12,8 +12,6 @@ internal sealed class Icons

    internal static IconInfo FileExplorer { get; } = IconHelpers.FromRelativePath("Assets\\FileExplorer.png");

-    internal static IconInfo Actions { get; } = IconHelpers.FromRelativePath("Assets\\Actions.png");
-
    internal static IconInfo OpenFile { get; } = new("\uE8E5"); // OpenFile

    internal static IconInfo Document { get; } = new("\uE8A5"); // Document
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
@@ -60,15 +60,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Actions.
-        /// </summary>
-        internal static string Indexer_Command_Actions {
-            get {
-                return ResourceManager.GetString("Indexer_Command_Actions", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Browse.
        /// </summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
@@ -138,9 +138,6 @@
  <data name="Indexer_Command_OpenWith" xml:space="preserve">
    <value>Open with</value>
  </data>
-  <data name="Indexer_Command_Actions" xml:space="preserve">
-    <value>Actions...</value>
-  </data>
  <data name="Indexer_Command_ShowInFolder" xml:space="preserve">
    <value>Show in folder</value>
  </data>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs
@@ -110,13 +110,6 @@ internal static class Commands
                });
        }

-        results.Add(new ListItem(new ExecuteCommandConfirmation(Resources.Microsoft_plugin_sys_RestartShell_name!, confirmCommands, Resources.Microsoft_plugin_sys_RestartShell_confirmation!, static () => OpenInShellHelper.OpenInShell("cmd", "/C tskill explorer && start explorer", runWithHiddenWindow: true)))
-        {
-            Title = Resources.Microsoft_plugin_sys_RestartShell!,
-            Subtitle = Resources.Microsoft_plugin_sys_RestartShell_description!,
-            Icon = Icons.RestartShellIcon,
-        });
-
        // UEFI command/result. It is only available on systems booted in UEFI mode.
        if (isUefi)
        {
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Icons.cs
@@ -20,8 +20,6 @@ public static partial class Icons

    public static IconInfo RestartIcon { get; } = new IconInfo("\uE777");

-    public static IconInfo RestartShellIcon { get; } = new IconInfo("\uEC50");
-
    public static IconInfo ShutdownIcon { get; } = new IconInfo("\uE7E8");

    public static IconInfo SleepIcon { get; } = new IconInfo("\uE708");
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs
@@ -645,42 +645,6 @@ namespace Microsoft.CmdPal.Ext.System {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Restart Windows Explorer.
-        /// </summary>
-        public static string Microsoft_plugin_sys_RestartShell {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_sys_RestartShell", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You are about to restart Windows Explorer, are you sure?.
-        /// </summary>
-        public static string Microsoft_plugin_sys_RestartShell_confirmation {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_sys_RestartShell_confirmation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to End and restart the Windows Explorer shell process.
-        /// </summary>
-        public static string Microsoft_plugin_sys_RestartShell_description {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_sys_RestartShell_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Restart.
-        /// </summary>
-        public static string Microsoft_plugin_sys_RestartShell_name {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_sys_RestartShell_name", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to ip; mac; address.
        /// </summary>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx
@@ -417,16 +417,4 @@
  <data name="Microsoft_plugin_ext_fallback_display_title" xml:space="preserve">
    <value>Open System Command</value>
  </data>
-  <data name="Microsoft_plugin_sys_RestartShell" xml:space="preserve">
-    <value>Restart Windows Explorer</value>
-  </data>
-  <data name="Microsoft_plugin_sys_RestartShell_description" xml:space="preserve">
-    <value>End and restart the Windows Explorer shell process</value>
-  </data>
-  <data name="Microsoft_plugin_sys_RestartShell_name" xml:space="preserve">
-    <value>Restart</value>
-  </data>
-  <data name="Microsoft_plugin_sys_RestartShell_confirmation" xml:space="preserve">
-    <value>You are about to restart Windows Explorer, are you sure?</value>
-  </data>
 </root>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/FallbackTimeDateItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/FallbackTimeDateItem.cs
@@ -68,7 +68,6 @@ internal sealed partial class FallbackTimeDateItem : FallbackCommandItem
            Title = result.Title;
            Subtitle = result.Subtitle;
            Icon = result.Icon;
-            Command = result.Command;
        }
        else
        {
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
@@ -18,6 +18,8 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage

    private IList<ListItem> _results = new List<ListItem>();

+    private bool initialized;
+
    private SettingsManager _settingsManager;

    public TimeDateExtensionPage(SettingsManager settingsManager)
@@ -33,9 +35,12 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage

    public override IListItem[] GetItems()
    {
-        DoExecuteSearch(string.Empty);
+       if (!initialized)
+        {
+            DoExecuteSearch(string.Empty);
+        }

-        lock (_resultsLock)
+       lock (_resultsLock)
        {
            ListItem[] results = _results.ToArray();
            return results;
@@ -44,6 +49,11 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage

    public override void UpdateSearchText(string oldSearch, string newSearch)
    {
+        if (newSearch == oldSearch)
+        {
+            return;
+        }
+
        DoExecuteSearch(newSearch);
    }

@@ -74,6 +84,7 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
    {
        lock (_resultsLock)
        {
+            initialized = true;
            this._results = result;
        }

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Helpers/DefaultBrowserInfo.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Helpers/DefaultBrowserInfo.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using ManagedCommon;
@@ -189,20 +188,17 @@ public static class DefaultBrowserInfo
                {
                    var buffer = stackalloc char[128];
                    var capacity = 128;
-                    var firstChar = str[0];
-                    var strPtr = &firstChar;
+                    void* reserved = null;

                    // S_OK == 0
-                    fixed (char* pszSourceLocal = str)
-                    {
-                        if (global::Windows.Win32.PInvoke.SHLoadIndirectString(
-                            pszSourceLocal,
+                    if (global::Windows.Win32.PInvoke.SHLoadIndirectString(
+                            str,
                            buffer,
                            (uint)capacity,
-                            default) == 0)
-                        {
-                            return new string(buffer);
-                        }
+                            ref reserved)
+                        == 0)
+                    {
+                        return new string(buffer);
                    }
                }

--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Utilities.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Utilities.cs
@@ -37,7 +37,7 @@ public class Utilities
        var FOLDERID_LocalAppData = new Guid("F1B32785-6FBA-4FCF-9D55-7B8E7F157091");
        var hr = PInvoke.SHGetKnownFolderPath(
            FOLDERID_LocalAppData,
-            KNOWN_FOLDER_FLAG.KF_FLAG_FORCE_APP_DATA_REDIRECTION,
+            (uint)KNOWN_FOLDER_FLAG.KF_FLAG_FORCE_APP_DATA_REDIRECTION,
            null,
            out var localAppDataFolder);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kai Tao	56b2094a2c	Merge branch 'main' into user/yeelam/IncludeUnitTestDlls	2025-06-13 11:17:43 +08:00
Gordon Lam (SH)	1aa084f167	Try to see how UnitTest pass/failure rate	2025-06-13 07:53:20 +08:00