cal AOT

use exprtk
update
2026-01-14 08:16:50 +01:00 · 2025-06-10 19:20:47 +08:00 · 2025-06-10 13:50:03 +08:00 · 2025-06-06 15:03:40 +08:00 · 2025-06-06 14:46:48 +08:00
62 changed files with 46957 additions and 1123 deletions
--- a/.config/configuration.vsEnterprise.winget
+++ b/.config/configuration.vsEnterprise.winget
@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        DeveloperMode: true
+        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
--- a/.config/configuration.vsProfessional.winget
+++ b/.config/configuration.vsProfessional.winget
@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        DeveloperMode: true
+        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
--- a/.config/configuration.winget
+++ b/.config/configuration.winget
@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        DeveloperMode: true
+        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,7 @@ body:
  attributes:
    label: Microsoft PowerToys version
    placeholder: X.XX.X
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
  validations:
    required: true

@@ -20,7 +20,7 @@ body:
  type: dropdown
  attributes:
    label: Installation method
-    description: How / where was PowerToys installed from?
+    description: How / Where was PowerToys installed from?
    multiple: true
    options:
      - GitHub
--- a/.github/ISSUE_TEMPLATE/documentation-issue.yml
+++ b/.github/ISSUE_TEMPLATE/documentation-issue.yml
@@ -6,7 +6,7 @@ labels:
 body:
 - type: textarea
  attributes: 
-    label: Describe the requested doc changes
+    label: Provide a description of requested docs changes
    placeholder: Briefly describe which document needs to be corrected and why.
  validations:
    required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -13,7 +13,7 @@ body:
 - type: textarea
  attributes:
    label: Scenario when this would be used?
-    placeholder: What is the scenario this would be used in? Why is this important to your workflow as a power user?
+    placeholder: What is the scenario this would be used? Why is this important to your workflow as a power user?
  validations:
    required: true
 - type: textarea
--- a/.github/ISSUE_TEMPLATE/translation_issue.yml
+++ b/.github/ISSUE_TEMPLATE/translation_issue.yml
@@ -14,7 +14,7 @@ body:
  attributes:
    label: Microsoft PowerToys version
    placeholder: 0.70.0
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
  validations:
    required: true
 - type: dropdown
@@ -65,7 +65,7 @@ body:
 - type: textarea
  attributes: 
    label: ❌ Actual phrase(s)
-    placeholder: What is there? Please include a screenshot, as that is extremely helpful.
+    placeholder: What is there? Please include a screenshot as that is extremely helpful.
  validations:
    required: true
 - type: textarea
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -5,9 +5,9 @@
 ## PR Checklist

 - [ ] **Closes:** #xxx
- [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
+- [ ] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
+- [ ] **Localization:** All end user facing strings can be localized
 - [ ] **Dev docs:** Added/updated
 - [ ] **New binaries:** Added on the required places
   - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries
@@ -16,7 +16,7 @@
   - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
 - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx

-<!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here -->
+<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
 ## Detailed Description of the Pull Request / Additional comments

 <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
--- a/.github/workflows/spelling2.yml
+++ b/.github/workflows/spelling2.yml
@@ -93,7 +93,7 @@ jobs:
    steps:
      - name: check-spelling
        id: spelling
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
        with:
          config: .github/actions/spell-check
          suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -175,7 +175,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -202,7 +202,7 @@ jobs:
      cancel-in-progress: false
    steps:
      - name: apply spelling updates
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
        with:
          experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
          checkout: true
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -221,6 +221,7 @@

                "PowerToys.CmdPalModuleInterface.dll",
                "CmdPalKeyboardService.dll",
+                "CmdPalCalculator.dll",
                "*Microsoft.CmdPal.UI_*.msix"
            ],
            "SigningInfo": {
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -31,22 +31,22 @@
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
    <PackageVersion Include="MessagePack" Version="3.1.3" />
    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.5" />
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.5" />
    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
    <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. -->
    <!-- 
@@ -72,28 +72,28 @@
    <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. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.6" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.5" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.6" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.6" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.5" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.5" />
    <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
-    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
    <!-- Package System.Diagnostics.EventLog 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.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.5" />
    <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.6" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.5" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.5" />
    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.6" />
+    <PackageVersion Include="System.Management" Version="9.0.5" />
    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.6" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.5" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1453,22 +1453,22 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
- Microsoft.Bcl.AsyncInterfaces 9.0.6
+- Microsoft.Bcl.AsyncInterfaces 9.0.5
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
- Microsoft.Data.Sqlite 9.0.6
+- Microsoft.Data.Sqlite 9.0.5
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
- Microsoft.Extensions.DependencyInjection 9.0.6
- Microsoft.Extensions.Hosting 9.0.6
- Microsoft.Extensions.Hosting.WindowsServices 9.0.6
- Microsoft.Extensions.Logging 9.0.6
- Microsoft.Extensions.Logging.Abstractions 9.0.6
+- Microsoft.Extensions.DependencyInjection 9.0.5
+- Microsoft.Extensions.Hosting 9.0.5
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.5
+- Microsoft.Extensions.Logging 9.0.5
+- Microsoft.Extensions.Logging.Abstractions 9.0.5
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
- Microsoft.Win32.SystemEvents 9.0.6
- Microsoft.Windows.Compatibility 9.0.6
+- Microsoft.Win32.SystemEvents 9.0.5
+- Microsoft.Windows.Compatibility 9.0.5
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1487,25 +1487,25 @@ SOFTWARE.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
- System.CodeDom 9.0.6
+- System.CodeDom 9.0.5
 - System.CommandLine 2.0.0-beta4.22272.1
- System.ComponentModel.Composition 9.0.6
- System.Configuration.ConfigurationManager 9.0.6
- System.Data.OleDb 9.0.6
- System.Data.SqlClient 4.9.0
- System.Diagnostics.EventLog 9.0.6
- System.Diagnostics.PerformanceCounter 9.0.6
- System.Drawing.Common 9.0.6
+- System.ComponentModel.Composition 9.0.5
+- System.Configuration.ConfigurationManager 9.0.5
+- System.Data.OleDb 9.0.5
+- System.Data.SqlClient 4.8.6
+- System.Diagnostics.EventLog 9.0.5
+- System.Diagnostics.PerformanceCounter 9.0.5
+- System.Drawing.Common 9.0.5
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
- System.Management 9.0.6
+- System.Management 9.0.5
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
- System.Runtime.Caching 9.0.6
- System.ServiceProcess.ServiceController 9.0.6
- System.Text.Encoding.CodePages 9.0.6
- System.Text.Json 9.0.6
+- System.Runtime.Caching 9.0.5
+- System.ServiceProcess.ServiceController 9.0.5
+- System.Text.Encoding.CodePages 9.0.5
+- System.Text.Json 9.0.5
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -712,6 +712,8 @@ 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}") = "CmdPalCalculator", "src\modules\cmdpal\CmdPalCalculator\CmdPalCalculator.vcxproj", "{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2584,6 +2586,14 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2598,14 +2608,14 @@ 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
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
+		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
+		{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
@@ -2831,13 +2841,13 @@ Global
 		{367D7543-7DBA-4381-99F1-BF6142A996C4} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{6D56B64D-FF1F-488F-AFED-9B9854A5D399} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
 		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{E09AA983-C755-474F-83D6-A5CDF528C070} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{92EC89E4-9972-453A-8A1A-3A9E230C146A} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{D1160404-D3D1-497A-883A-4059C07C2273} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
@@ -2879,6 +2889,7 @@ 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} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -53,10 +53,10 @@ This is our preferred method.

 ### Via Microsoft Store

-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which is available for both Windows 11 and Windows 10.

 ### Via WinGet
-Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
+Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:

 #### User scope installer [default]
 ```powershell
@@ -79,7 +79,7 @@ There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) cr

 ## Contributing

-This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
+This project welcomes contributions of all types.  Besides  coding features / bug fixes,  other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.

 We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort.

@@ -99,7 +99,7 @@ In this release, we focused on new features, stability, and automation.

 **✨Highlights**

- - We focused on greatly improving the Command Palette's performance and fixing a large number of bugs. Some new features we've added are:
+ - We focused on greatly improving Command Palette's performance and fixing a large amount of bugs. Some new features we've added are:
 - Added the ability for Command Palette to search any file using a fallback command.
 - Added the ability to make the Command Palette global hotkey a low-level keyboard hook.
 - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette.
@@ -117,17 +117,17 @@ In this release, we focused on new features, stability, and automation.

 ### Command Not Found

- - Updated the WinGet Command Not Found script to only enable the experimental features if they exist.
+ - Updated the WinGet Command Not Found script to only enable the experimental features if they actually exist.

 ### Command Palette

 - Updated bug template to include Command Palette module.
 - Fixed an issue where the toast window was not scaled for DPI, causing layout issues under display scaling.
- - Fixed an issue where Up/Down keyboard navigation didn't move selection when the caret was at position 0, and added continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue where Up/Down keyboard navigation didn't move selection when caret was at position 0, and add continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 - Updated the Time and Date extension code to simplify it and improve clarity.
 - Fixed an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
- - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from the Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added setting to enable/disable system tray icon in CmdPal and aligned terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added setting to enable/disable system tray icon in CmdPal and align terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 - Fixed an alias update issue by removing the old alias when a new one is set.
 - Resolved GitHub casing conflict by migrating Exts and exts into a new ext directory, ensuring consistent structure across platforms and preventing path fragmentation.
 - Fix an issue where the 'Create New Extension' command generated empty file names.
@@ -155,9 +155,9 @@ In this release, we focused on new features, stability, and automation.
 - Refactored CmdPal classes to improve JSON serialization and introduced new serialization contexts for better performance and maintainability.
 - Added support for ahead-of-time (AoT) compilation.
 - Added retry mechanism for CmdPal launch.
- - Removed some unused files from CmdPal.Common to simplify the codebase and facilitate marking it as AoT-compatible.
+ - Removed some unused files from CmdPal.Common to simplify codebase and facilitate marking it as AoT-compatible.
 - Fixed a bug where a race condition in the update of SearchText caused the cursor in the input box to automatically jump to the end of the line, ensuring SearchText is only updated after it has actually been changed.
- - Added support for searching any file in the fallback command.
+ - Added support for searching any file in fallback command.
 - Cleaned up AoT-related code to prevent duplicate operations during testing.
 - Reduced CmdPal load time by parallelizing extension startup and adding timeouts to prevent misbehaving extensions from blocking others.
 - Enhanced UI behavior by dismissing the details pane when the list gets emptied, avoiding inconsistent visual states.
@@ -179,7 +179,7 @@ In this release, we focused on new features, stability, and automation.

 ### Keyboard Manager

- - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
+ - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling, by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!

 ### PowerRename

@@ -187,7 +187,7 @@ In this release, we focused on new features, stability, and automation.

 ### PowerToys Run

- - Added support for custom formats in the "Time and Date" plugin and improved error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added support for custom formats in the "Time and Date" plugin and improves error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
 - Fix two crashes: one for WFT on very early dates and another for calculating the week of the month on very late dates (e.g., 31.12.9999), and reorder UI settings. Thanks [@htcfreek](https://github.com/htcfreek)!
 - Fix an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
 - Added version details to plugin error messages for 'Loading error' and 'Init error'. Thanks [@htcfreek](https://github.com/htcfreek)!
@@ -254,7 +254,7 @@ For [v0.92][github-next-release-work], we'll work on the items below:
 - New UI Automation tests
 - Working on installer upgrades
 - Upgrading Keyboard Manager's editor UI
- - Stability, bug fixes
+ - Stability / bug fixes

 ## PowerToys Community

@@ -266,7 +266,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct

 ## Privacy Statement

-The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
+The application logs basic diagnostic data (telemetry). For more information on privacy and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).

 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -46,7 +46,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
 | [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
 | [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |
-| [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |

 ## Extending software plugins

@@ -69,5 +68,4 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
-| [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
+[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -22,7 +22,7 @@
  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
    <DebugSymbols>true</DebugSymbols>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
  </PropertyGroup>

@@ -43,4 +43,4 @@
      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
    </ItemGroup>
  </Target>
-</Project>
+</Project>
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -29,9 +29,7 @@ namespace ManagedCommon
         * If you want to publish it with Native AOT enabled (or publish as a single file).
         * You need to find another way to remove Assembly.Location usage.
         */
-#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
-        private static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;
-#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
+        private static readonly string Version = "2.0.0";

        /// <summary>
        /// Initializes the logger and sets the path for logging.
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -37,17 +37,6 @@ namespace Microsoft.PowerToys.Telemetry
        public void WriteEvent<T>(T telemetryEvent)
            where T : EventBase, IEvent
        {
-            if (DataDiagnosticsSettings.GetEnabledValue())
-            {
-                this.Write<T>(
-                    telemetryEvent.EventName,
-                    new EventSourceOptions()
-                    {
-                        Keywords = ProjectKeywordMeasure,
-                        Tags = ProjectTelemetryTagProductAndServicePerformance,
-                    },
-                    telemetryEvent);
-            }
        }
    }
 }
--- a/src/modules/cmdpal/CmdPalCalculator/Calculator.cpp
+++ b/src/modules/cmdpal/CmdPalCalculator/Calculator.cpp
@@ -0,0 +1,24 @@
+#include "pch.h"
+#include "Calculator.h"
+#include "Calculator.g.cpp"
+#include "ExprtkEvaluator.h"
+
+namespace winrt::CmdPalCalculator::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(key.c_str(), value);
+        }
+    }
+
+    hstring Calculator::EvaluateExpression(hstring const& expression)
+    {
+        auto result = ExprtkCalculator::internal::EvaluateExpression(expression.c_str(), m_constants);
+
+        return hstring(result);
+    }
+}
--- a/src/modules/cmdpal/CmdPalCalculator/Calculator.h
+++ b/src/modules/cmdpal/CmdPalCalculator/Calculator.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Calculator.g.h"
+
+namespace winrt::CmdPalCalculator::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::wstring, double> m_constants;
+    };
+}
+
+namespace winrt::CmdPalCalculator::factory_implementation
+{
+    struct Calculator : CalculatorT<Calculator, implementation::Calculator>
+    {
+    };
+}
--- a/src/modules/cmdpal/CmdPalCalculator/Calculator.idl
+++ b/src/modules/cmdpal/CmdPalCalculator/Calculator.idl
@@ -0,0 +1,10 @@
+namespace CmdPalCalculator
+{
+    [default_interface]
+    runtimeclass Calculator
+    {
+        Calculator();
+        Calculator(Windows.Foundation.Collections.IPropertySet constants);
+        String EvaluateExpression(String expression);
+    }
+}
--- a/src/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.def
+++ b/src/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.def
@@ -0,0 +1,3 @@
+EXPORTS
+DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
+DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
--- a/src/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.vcxproj
+++ b/src/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.vcxproj
@@ -0,0 +1,181 @@
+<?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>CmdPalCalculator</ProjectName>
+    <RootNamespace>CmdPalCalculator</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>CmdPalCalculator</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>CmdPalCalculator.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>
+    <ClInclude Include="ExprtkEvaluator.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="exprtk.hpp" />
+    <ClInclude Include="Calculator.h">
+      <DependentUpon>Calculator.idl</DependentUpon>
+    </ClInclude>
+  </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="CmdPalCalculator.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PropertySheet.props" />
+  </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/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.vcxproj.filters
+++ b/src/modules/cmdpal/CmdPalCalculator/CmdPalCalculator.vcxproj.filters
@@ -0,0 +1,29 @@
+<?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="CmdPalCalculator.def" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PropertySheet.props" />
+  </ItemGroup>
+</Project>
--- a/src/modules/cmdpal/CmdPalCalculator/EvaluateNativeExpression.cpp
+++ b/src/modules/cmdpal/CmdPalCalculator/EvaluateNativeExpression.cpp
--- a/src/modules/cmdpal/CmdPalCalculator/ExprtkEvaluator.cpp
+++ b/src/modules/cmdpal/CmdPalCalculator/ExprtkEvaluator.cpp
@@ -0,0 +1,46 @@
+#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::string WStringToAscii(const std::wstring& wstr)
+    {
+        std::string result;
+        result.reserve(wstr.size());
+        for (wchar_t wc : wstr)
+            result.push_back(static_cast<char>(wc));
+        return result;
+    }
+
+    std::wstring EvaluateExpression(
+        const std::wstring& wexpr,
+        const std::unordered_map<std::wstring, double>& constants)
+    {
+        exprtk::symbol_table<double> symbol_table;
+
+        for (auto const& [name, value] : constants)
+        {
+            symbol_table.add_constant(WStringToAscii(name.c_str()), value);
+        }
+
+        exprtk::expression<double> expression;
+        expression.register_symbol_table(symbol_table);
+
+        exprtk::parser<double> parser;
+        if (!parser.compile(WStringToAscii(wexpr), expression))
+            return L"NaN";
+
+        return ToWStringFullPrecision(expression.value());
+    }
+}
--- a/src/modules/cmdpal/CmdPalCalculator/ExprtkEvaluator.h
+++ b/src/modules/cmdpal/CmdPalCalculator/ExprtkEvaluator.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+#include <unordered_map>
+
+namespace ExprtkCalculator::internal
+{
+    std::wstring EvaluateExpression(
+        const std::wstring& expression,
+        const std::unordered_map<std::wstring, double>& constants = {});
+}
--- a/src/modules/cmdpal/CmdPalCalculator/PropertySheet.props
+++ b/src/modules/cmdpal/CmdPalCalculator/PropertySheet.props
@@ -0,0 +1,16 @@
+<?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/modules/cmdpal/CmdPalCalculator/exprtk.hpp
+++ b/src/modules/cmdpal/CmdPalCalculator/exprtk.hpp
--- a/src/modules/cmdpal/CmdPalCalculator/packages.config
+++ b/src/modules/cmdpal/CmdPalCalculator/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.220531.1" targetFramework="native" />
+</packages>
--- a/src/modules/cmdpal/CmdPalCalculator/pch.cpp
+++ b/src/modules/cmdpal/CmdPalCalculator/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
--- a/src/modules/cmdpal/CmdPalCalculator/pch.h
+++ b/src/modules/cmdpal/CmdPalCalculator/pch.h
@@ -0,0 +1,4 @@
+#pragma once
+#include <unknwn.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
--- a/src/modules/cmdpal/CmdPalCalculator/readme.txt
+++ b/src/modules/cmdpal/CmdPalCalculator/readme.txt
@@ -0,0 +1,23 @@
+========================================================================
+    C++/WinRT CmdPalCalculator Project Overview
+========================================================================
+
+This project demonstrates how to get started authoring Windows Runtime 
+classes directly with standard C++, using the C++/WinRT SDK component 
+to generate implementation headers from interface (IDL) files.  The
+generated Windows Runtime component binary and WinMD files should then
+be bundled with the Universal Windows Platform (UWP) app consuming them.
+
+Steps:
+1. Create an interface (IDL) file to define your Windows Runtime class, 
+    its default interface, and any other interfaces it implements.
+2. Build the project once to generate module.g.cpp, module.h.cpp, and
+    implementation templates under the "Generated Files" folder, as 
+    well as skeleton class definitions under "Generated Files\sources".  
+3. Use the skeleton class definitions for reference to implement your
+    Windows Runtime classes.
+
+========================================================================
+Learn more about C++/WinRT here:
+http://aka.ms/cppwinrt/
+========================================================================
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -12,6 +12,6 @@
    <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" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
  </ItemGroup>
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
@@ -3,11 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System.Text.Json;
-using AdaptiveCards.ObjectModel.WinUI3;
-using AdaptiveCards.Templating;
-using CommunityToolkit.Mvvm.Messaging;
-using ManagedCommon;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Windows.Data.Json;
@@ -27,145 +22,14 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag

    public string DataJson { get; protected set; } = "{}";

-    public AdaptiveCardParseResult? Card { get; private set; }
-
    private static string Serialize(string? s) =>
        JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);

-    private static bool TryBuildCard(
-        string templateJson,
-        string dataJson,
-        out AdaptiveCardParseResult? card,
-        out Exception? error)
-    {
-        card = null;
-        error = null;
-
-        try
-        {
-            var template = new AdaptiveCardTemplate(templateJson);
-            var cardJson = template.Expand(dataJson);
-            card = AdaptiveCard.FromJsonString(cardJson);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Error building card from template: {Message}", ex.Message);
-            error = ex;
-            return false;
-        }
-    }
-
    public override void InitializeProperties()
    {
-        var model = _formModel.Unsafe;
-        if (model is null)
-        {
-            return;
-        }
+    }

-        TemplateJson = model.TemplateJson;
-        StateJson = model.StateJson;
-        DataJson = model.DataJson;
-
-        if (TryBuildCard(TemplateJson, DataJson, out var builtCard, out var renderingError))
-        {
-            Card = builtCard;
-            UpdateProperty(nameof(Card));
-            return;
-        }
-
-        var errorPayload = $$"""
+    public void HandleSubmit()
    {
-        "error_message": {{Serialize(renderingError!.Message)}},
-        "error_stack":   {{Serialize(renderingError.StackTrace)}},
-        "inner_exception": {{Serialize(renderingError.InnerException?.Message)}},
-        "template_json": {{Serialize(TemplateJson)}},
-        "data_json":     {{Serialize(DataJson)}}
    }
-    """;
-
-        if (TryBuildCard(ErrorCardJson, errorPayload, out var errorCard, out var _))
-        {
-            Card = errorCard;
-            UpdateProperty(nameof(Card));
-            return;
-        }
-
-        UpdateProperty(nameof(Card));
-    }
-
-    public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
-    {
-        if (action is AdaptiveOpenUrlAction openUrlAction)
-        {
-            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
-            return;
-        }
-
-        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
-        {
-            // Get the data and inputs
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
-            var inputString = inputs.Stringify();
-
-            _ = Task.Run(() =>
-            {
-                try
-                {
-                    var model = _formModel.Unsafe!;
-                    if (model != null)
-                    {
-                        var result = model.SubmitForm(inputString, dataString);
-                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ShowException(ex);
-                }
-            });
-        }
-    }
-
-    private static readonly string ErrorCardJson = """
-{
-    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-    "type": "AdaptiveCard",
-    "version": "1.5",
-    "body": [
-        {
-            "type": "TextBlock",
-            "text": "Error parsing form from extension",
-            "wrap": true,
-            "style": "heading",
-            "size": "ExtraLarge",
-            "weight": "Bolder",
-            "color": "Attention"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "${error_message}",
-            "color": "Attention"
-        },
-        {
-            "type": "TextBlock",
-            "text": "${error_stack}",
-            "fontType": "Monospace"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "Inner exception:"
-        },
-        {
-            "type": "TextBlock",
-            "wrap": true,
-            "text": "${inner_exception}",
-            "color": "Attention"
-        }
-    ]
-}
-""";
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentPageViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentPageViewModel.cs
@@ -79,9 +79,6 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
            throw;
        }

-        var oneContent = newContent.Count == 1;
-        newContent.ForEach(c => c.OnlyControlOnPage = oneContent);
-
        // Now, back to a UI thread to update the observable collection
        DoOnUiThread(
        () =>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentViewModel.cs
@@ -7,5 +7,4 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 public abstract partial class ContentViewModel(WeakReference<IPageContext> context) :
    ExtensionObjectViewModel(context)
 {
-    public bool OnlyControlOnPage { get; internal set; }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
@@ -17,8 +17,6 @@
  <ItemGroup>
    <PackageReference Include="CommunityToolkit.Common" />
    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="AdaptiveCards.Templating" />
-    <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />

    <PackageReference Include="Microsoft.Windows.CsWin32">
      <PrivateAssets>all</PrivateAssets>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
@@ -98,13 +98,13 @@ public partial class App : Application
        var allApps = new AllAppsCommandProvider();
        services.AddSingleton<ICommandProvider>(allApps);
        services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
-        services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
        services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();

        services.AddSingleton<ICommandProvider, ClipboardHistoryCommandsProvider>();
        services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
        services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
+        services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();

        // GH #38440: Users might not have WinGet installed! Or they might have
        // a ridiculously old version. Or might be running as admin.
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/AdaptiveCardsConfig.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/AdaptiveCardsConfig.cs
@@ -1,342 +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 AdaptiveCards.Rendering.WinUI3;
-
-namespace Microsoft.CmdPal.UI.Controls;
-
-public sealed class AdaptiveCardsConfig
-{
-    public static AdaptiveHostConfig Light { get; }
-
-    public static AdaptiveHostConfig Dark { get; }
-
-    static AdaptiveCardsConfig()
-    {
-        Light = AdaptiveHostConfig.FromJsonString(LightHostConfigString).HostConfig;
-        Dark = AdaptiveHostConfig.FromJsonString(DarkHostConfigString).HostConfig;
-    }
-
-    public static readonly string DarkHostConfigString = """
-{
-  "spacing": {
-    "small": 4,
-    "default": 8,
-    "medium": 20,
-    "large": 30,
-    "extraLarge": 40,
-    "padding": 8
-  },
-  "separator": {
-    "lineThickness": 0,
-    "lineColor": "#C8FFFFFF"
-  },
-  "supportsInteractivity": true,
-  "fontTypes": {
-    "default": {
-      "fontFamily": "'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
-      "fontSizes": {
-        "small": 12,
-        "default": 12,
-        "medium": 14,
-        "large": 20,
-        "extraLarge": 26
-      },
-      "fontWeights": {
-        "lighter": 200,
-        "default": 400,
-        "bolder": 600
-      }
-    },
-    "monospace": {
-      "fontFamily": "'Courier New', Courier, monospace",
-      "fontSizes": {
-        "small": 12,
-        "default": 12,
-        "medium": 14,
-        "large": 18,
-        "extraLarge": 26
-      },
-      "fontWeights": {
-        "lighter": 200,
-        "default": 400,
-        "bolder": 600
-      }
-    }
-  },
-  "containerStyles": {
-    "default": {
-      "backgroundColor": "#00000000",
-      "borderColor": "#00000000",
-      "foregroundColors": {
-        "default": {
-          "default": "#FFFFFF",
-          "subtle": "#C8FFFFFF"
-        },
-        "accent": {
-          "default": "#0063B1",
-          "subtle": "#880063B1"
-        },
-        "attention": {
-          "default": "#FF5555",
-          "subtle": "#DDFF5555"
-        },
-        "good": {
-          "default": "#54a254",
-          "subtle": "#DD54a254"
-        },
-        "warning": {
-          "default": "#c3ab23",
-          "subtle": "#DDc3ab23"
-        }
-      }
-    },
-    "emphasis": {
-      "backgroundColor": "#09FFFFFF",
-      "borderColor": "#09FFFFFF",
-      "foregroundColors": {
-        "default": {
-          "default": "#FFFFFF",
-          "subtle": "#C8FFFFFF"
-        },
-        "accent": {
-          "default": "#2E89FC",
-          "subtle": "#882E89FC"
-        },
-        "attention": {
-          "default": "#FF5555",
-          "subtle": "#DDFF5555"
-        },
-        "good": {
-          "default": "#54a254",
-          "subtle": "#DD54a254"
-        },
-        "warning": {
-          "default": "#c3ab23",
-          "subtle": "#DDc3ab23"
-        }
-      }
-    }
-  },
-  "imageSizes": {
-    "small": 16,
-    "medium": 24,
-    "large": 32
-  },
-  "actions": {
-    "maxActions": 5,
-    "spacing": "default",
-    "buttonSpacing": 8,
-    "showCard": {
-      "actionMode": "inline",
-      "inlineTopMargin": 8
-    },
-    "actionsOrientation": "horizontal",
-    "actionAlignment": "stretch"
-  },
-  "adaptiveCard": {
-    "allowCustomStyle": false
-  },
-  "imageSet": {
-    "imageSize": "medium",
-    "maxImageHeight": 100
-  },
-  "factSet": {
-    "title": {
-      "color": "default",
-      "size": "default",
-      "isSubtle": false,
-      "weight": "bolder",
-      "wrap": true,
-      "maxWidth": 150
-    },
-    "value": {
-      "color": "default",
-      "size": "default",
-      "isSubtle": false,
-      "weight": "default",
-      "wrap": true
-    },
-    "spacing": 8
-  },
-  "textStyles": {
-    "heading": {
-      "size": "large",
-      "weight": "bolder",
-      "color": "default",
-      "isSubtle": false,
-      "fontType": "default"
-    },
-    "columnHeader": {
-      "size": "medium",
-      "weight": "bolder",
-      "color": "default",
-      "isSubtle": false,
-      "fontType": "default"
-    }
-  }
-}
-""";
-
-    public static readonly string LightHostConfigString = """
-{
-  "spacing": {
-    "small": 4,
-    "default": 8,
-    "medium": 20,
-    "large": 30,
-    "extraLarge": 40,
-    "padding": 8
-  },
-  "separator": {
-    "lineThickness": 0,
-    "lineColor": "#606060"
-  },
-  "supportsInteractivity": true,
-  "fontTypes": {
-    "default": {
-      "fontFamily": "'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
-      "fontSizes": {
-        "small": 12,
-        "default": 12,
-        "medium": 14,
-        "large": 20,
-        "extraLarge": 26
-      },
-      "fontWeights": {
-        "lighter": 200,
-        "default": 400,
-        "bolder": 600
-      }
-    },
-    "monospace": {
-      "fontFamily": "'Courier New', Courier, monospace",
-      "fontSizes": {
-        "small": 12,
-        "default": 12,
-        "medium": 14,
-        "large": 18,
-        "extraLarge": 26
-      },
-      "fontWeights": {
-        "lighter": 200,
-        "default": 400,
-        "bolder": 600
-      }
-    }
-  },
-  "containerStyles": {
-    "default": {
-      "backgroundColor": "#00000000",
-      "borderColor": "#00000000",
-      "foregroundColors": {
-        "default": {
-          "default": "#E6000000",
-          "subtle": "#99000000"
-        },
-        "accent": {
-          "default": "#0063B1",
-          "subtle": "#880063B1"
-        },
-        "attention": {
-          "default": "#C00000",
-          "subtle": "#DDC00000"
-        },
-        "good": {
-          "default": "#54a254",
-          "subtle": "#DD54a254"
-        },
-        "warning": {
-          "default": "#c3ab23",
-          "subtle": "#DDc3ab23"
-        }
-      }
-    },
-    "emphasis": {
-      "backgroundColor": "#80F6F6F6",
-      "borderColor": "#80F6F6F6",
-      "foregroundColors": {
-        "default": {
-          "default": "#E6000000",
-          "subtle": "#99000000"
-        },
-        "accent": {
-          "default": "#2E89FC",
-          "subtle": "#882E89FC"
-        },
-        "attention": {
-          "default": "#C00000",
-          "subtle": "#DDC00000"
-        },
-        "good": {
-          "default": "#54a254",
-          "subtle": "#DD54a254"
-        },
-        "warning": {
-          "default": "#c3ab23",
-          "subtle": "#DDc3ab23"
-        }
-      }
-    }
-  },
-  "imageSizes": {
-    "small": 16,
-    "medium": 24,
-    "large": 32
-  },
-  "actions": {
-    "maxActions": 5,
-    "spacing": "default",
-    "buttonSpacing": 8,
-    "showCard": {
-      "actionMode": "inline",
-      "inlineTopMargin": 8
-    },
-    "actionsOrientation": "horizontal",
-    "actionAlignment": "stretch"
-  },
-  "adaptiveCard": {
-    "allowCustomStyle": false
-  },
-  "imageSet": {
-    "imageSize": "medium",
-    "maxImageHeight": 100
-  },
-  "factSet": {
-    "title": {
-      "color": "default",
-      "size": "default",
-      "isSubtle": false,
-      "weight": "bolder",
-      "wrap": true,
-      "maxWidth": 150
-    },
-    "value": {
-      "color": "default",
-      "size": "default",
-      "isSubtle": false,
-      "weight": "default",
-      "wrap": true
-    },
-    "spacing": 8
-  },
-  "textStyles": {
-    "heading": {
-      "size": "large",
-      "weight": "bolder",
-      "color": "default",
-      "isSubtle": false,
-      "fontType": "default"
-    },
-    "columnHeader": {
-      "size": "medium",
-      "weight": "bolder",
-      "color": "default",
-      "isSubtle": false,
-      "fontType": "default"
-    }
-  }
-}
-""";
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="Microsoft.CmdPal.UI.Controls.ContentFormControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Microsoft.CmdPal.UI.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:viewmodels="using:Microsoft.CmdPal.UI.ViewModels"
-    Background="Transparent"
-    mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <ResourceDictionary x:Name="CardOverrideStyles">
-            <Style x:Key="Adaptive.TextBlock" TargetType="TextBlock">
-                <Setter Property="IsTextSelectionEnabled" Value="True" />
-            </Style>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <Grid x:Name="ContentGrid" />
-</UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs
@@ -1,162 +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 AdaptiveCards.ObjectModel.WinUI3;
-using AdaptiveCards.Rendering.WinUI3;
-using Microsoft.CmdPal.UI.ViewModels;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-
-namespace Microsoft.CmdPal.UI.Controls;
-
-public sealed partial class ContentFormControl : UserControl
-{
-    private static readonly AdaptiveCardRenderer _renderer;
-    private ContentFormViewModel? _viewModel;
-
-    // LOAD-BEARING: if you don't hang onto a reference to the RenderedAdaptiveCard
-    // then the GC might clean it up sometime, even while the card is in the UI
-    // tree. If this gets GC'd, then it'll revoke our Action handler, and the
-    // form will do seemingly nothing.
-    private RenderedAdaptiveCard? _renderedCard;
-
-    public ContentFormViewModel? ViewModel { get => _viewModel; set => AttachViewModel(value); }
-
-    static ContentFormControl()
-    {
-        // We can't use `CardOverrideStyles` here yet, because we haven't called InitializeComponent once.
-        // But also, the default value isn't `null` here. It's... some other default empty value.
-        // So clear it out so that we know when the first time we get created is
-        _renderer = new AdaptiveCardRenderer()
-        {
-            OverrideStyles = null,
-        };
-    }
-
-    public ContentFormControl()
-    {
-        this.InitializeComponent();
-        var lightTheme = ActualTheme == Microsoft.UI.Xaml.ElementTheme.Light;
-        _renderer.HostConfig = lightTheme ? AdaptiveCardsConfig.Light : AdaptiveCardsConfig.Dark;
-
-        // 5% BODGY: if we set this multiple times over the lifetime of the app,
-        // then the second call will explode, because "CardOverrideStyles is already the child of another element".
-        // SO only set this once.
-        if (_renderer.OverrideStyles == null)
-        {
-            _renderer.OverrideStyles = CardOverrideStyles;
-        }
-
-        // TODO in the future, we should handle ActualThemeChanged and replace
-        // our rendered card with one for that theme. But today is not that day
-    }
-
-    private void AttachViewModel(ContentFormViewModel? vm)
-    {
-        if (_viewModel != null)
-        {
-            _viewModel.PropertyChanged -= ViewModel_PropertyChanged;
-        }
-
-        _viewModel = vm;
-
-        if (_viewModel != null)
-        {
-            _viewModel.PropertyChanged += ViewModel_PropertyChanged;
-
-            var c = _viewModel.Card;
-            if (c != null)
-            {
-                DisplayCard(c);
-            }
-        }
-    }
-
-    private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        if (ViewModel == null)
-        {
-            return;
-        }
-
-        if (e.PropertyName == nameof(ViewModel.Card))
-        {
-            var c = ViewModel.Card;
-            if (c != null)
-            {
-                DisplayCard(c);
-            }
-        }
-    }
-
-    private void DisplayCard(AdaptiveCardParseResult result)
-    {
-        _renderedCard = _renderer.RenderAdaptiveCard(result.AdaptiveCard);
-        ContentGrid.Children.Clear();
-        if (_renderedCard.FrameworkElement != null)
-        {
-            ContentGrid.Children.Add(_renderedCard.FrameworkElement);
-
-            // Use the Loaded event to ensure we focus after the card is in the visual tree
-            _renderedCard.FrameworkElement.Loaded += OnFrameworkElementLoaded;
-        }
-
-        _renderedCard.Action += Rendered_Action;
-    }
-
-    private void OnFrameworkElementLoaded(object sender, RoutedEventArgs e)
-    {
-        // Unhook the event handler to avoid multiple registrations
-        if (sender is FrameworkElement element)
-        {
-            element.Loaded -= OnFrameworkElementLoaded;
-
-            if (!ViewModel?.OnlyControlOnPage ?? true)
-            {
-                return;
-            }
-
-            // Focus on the first focusable element asynchronously to ensure the visual tree is fully built
-            element.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
-            {
-                var focusableElement = FindFirstFocusableElement(element);
-                focusableElement?.Focus(FocusState.Programmatic);
-            });
-        }
-    }
-
-    private Control? FindFirstFocusableElement(DependencyObject parent)
-    {
-        var childCount = VisualTreeHelper.GetChildrenCount(parent);
-
-        // Process children first (depth-first search)
-        for (var i = 0; i < childCount; i++)
-        {
-            var child = VisualTreeHelper.GetChild(parent, i);
-
-            // If the child is a focusable control like TextBox, ComboBox, etc.
-            if (child is Control control &&
-                control.IsEnabled &&
-                control.IsTabStop &&
-                control.Visibility == Visibility.Visible &&
-                control.AllowFocusOnInteraction)
-            {
-                return control;
-            }
-
-            // Recursively check children
-            var result = FindFirstFocusableElement(child);
-            if (result != null)
-            {
-                return result;
-            }
-        }
-
-        return null;
-    }
-
-    private void Rendered_Action(RenderedAdaptiveCard sender, AdaptiveActionEventArgs args) =>
-        ViewModel?.HandleSubmit(args.Action, args.Inputs.AsJson());
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/HotkeySettingsControlHook.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/HotkeySettingsControlHook.cs
@@ -12,7 +12,7 @@ public delegate bool IsActive();

 public delegate bool FilterAccessibleKeyboardEvents(int key, UIntPtr extraInfo);

-public class HotkeySettingsControlHook : IDisposable
+public partial class HotkeySettingsControlHook : IDisposable
 {
    private const int WmKeyDown = 0x100;
    private const int WmKeyUp = 0x101;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeKeyboardHelper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeKeyboardHelper.cs
@@ -5,82 +5,81 @@
 using System;
 using System.Runtime.InteropServices;

-namespace Microsoft.PowerToys.Settings.UI.Helpers
+namespace Microsoft.PowerToys.Settings.UI.Helpers;
+
+internal static class NativeKeyboardHelper
 {
-    internal static class NativeKeyboardHelper
+    [StructLayout(LayoutKind.Sequential)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+    internal struct INPUT
    {
-        [StructLayout(LayoutKind.Sequential)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct INPUT
-        {
-            internal INPUTTYPE type;
-            internal InputUnion data;
+        internal INPUTTYPE type;
+        internal InputUnion data;

-            internal static int Size
-            {
-                get { return Marshal.SizeOf(typeof(INPUT)); }
-            }
-        }
-
-        [StructLayout(LayoutKind.Explicit)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct InputUnion
+        internal static int Size
        {
-            [FieldOffset(0)]
-            internal MOUSEINPUT mi;
-            [FieldOffset(0)]
-            internal KEYBDINPUT ki;
-            [FieldOffset(0)]
-            internal HARDWAREINPUT hi;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct MOUSEINPUT
-        {
-            internal int dx;
-            internal int dy;
-            internal int mouseData;
-            internal uint dwFlags;
-            internal uint time;
-            internal UIntPtr dwExtraInfo;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct KEYBDINPUT
-        {
-            internal short wVk;
-            internal short wScan;
-            internal uint dwFlags;
-            internal int time;
-            internal UIntPtr dwExtraInfo;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct HARDWAREINPUT
-        {
-            internal int uMsg;
-            internal short wParamL;
-            internal short wParamH;
-        }
-
-        internal enum INPUTTYPE : uint
-        {
-            INPUT_MOUSE = 0,
-            INPUT_KEYBOARD = 1,
-            INPUT_HARDWARE = 2,
-        }
-
-        [Flags]
-        internal enum KeyEventF
-        {
-            KeyDown = 0x0000,
-            ExtendedKey = 0x0001,
-            KeyUp = 0x0002,
-            Unicode = 0x0004,
-            Scancode = 0x0008,
+            get { return Marshal.SizeOf<INPUT>(); }
        }
    }
+
+    [StructLayout(LayoutKind.Explicit)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+    internal struct InputUnion
+    {
+        [FieldOffset(0)]
+        internal MOUSEINPUT mi;
+        [FieldOffset(0)]
+        internal KEYBDINPUT ki;
+        [FieldOffset(0)]
+        internal HARDWAREINPUT hi;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+    internal struct MOUSEINPUT
+    {
+        internal int dx;
+        internal int dy;
+        internal int mouseData;
+        internal uint dwFlags;
+        internal uint time;
+        internal UIntPtr dwExtraInfo;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+    internal struct KEYBDINPUT
+    {
+        internal short wVk;
+        internal short wScan;
+        internal uint dwFlags;
+        internal int time;
+        internal UIntPtr dwExtraInfo;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
+    internal struct HARDWAREINPUT
+    {
+        internal int uMsg;
+        internal short wParamL;
+        internal short wParamH;
+    }
+
+    internal enum INPUTTYPE : uint
+    {
+        INPUT_MOUSE = 0,
+        INPUT_KEYBOARD = 1,
+        INPUT_HARDWARE = 2,
+    }
+
+    [Flags]
+    internal enum KeyEventF
+    {
+        KeyDown = 0x0000,
+        ExtendedKey = 0x0001,
+        KeyUp = 0x0002,
+        Unicode = 0x0004,
+        Scancode = 0x0008,
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeMethods.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeMethods.cs
@@ -7,7 +7,7 @@ using System.Text;

 namespace Microsoft.PowerToys.Settings.UI.Helpers;

-public static class NativeMethods
+public static partial class NativeMethods
 {
    private const int WS_POPUP = 1 << 31; // 0x80000000
    internal const int GWL_STYLE = -16;
@@ -26,11 +26,11 @@ public static class NativeMethods
    [DllImport("user32.dll")]
    internal static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);

-    [DllImport("user32.dll")]
-    internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
+    [LibraryImport("user32.dll")]
+    internal static partial uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);

-    [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall, SetLastError = true)]
-    internal static extern short GetAsyncKeyState(int vKey);
+    [LibraryImport("user32.dll")]
+    internal static partial short GetAsyncKeyState(int vKey);

    [DllImport("user32.dll", SetLastError = true)]
    internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -66,11 +66,6 @@
                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                    Severity="Warning" />
            </Grid>
-            <tk7controls:MarkdownTextBlock
-                x:Uid="InvalidShortcutWarningLabel"
-                Background="Transparent"
-                FontSize="12"
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
        </StackPanel>
    </Grid>
 </UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -36,10 +36,5 @@
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
-        <tk7controls:MarkdownTextBlock
-            Grid.Column="1"
-            VerticalAlignment="Center"
-            Background="Transparent"
-            Text="{x:Bind Text}" />
    </Grid>
 </UserControl>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
@@ -37,37 +37,21 @@

            <DataTemplate x:Key="FormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                <Grid Margin="0,4,4,4" Padding="12,8,8,8">
-                    <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="MarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid Margin="0,4,4,4" Padding="12,8,8,8">
-                    <toolkit:MarkdownTextBlock
-                        Background="Transparent"
-                        Header3FontSize="12"
-                        Header3FontWeight="Normal"
-                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="NestedFormContentTemplate" x:DataType="viewmodels:ContentFormViewModel">
                <Grid>
-                    <cmdPalControls:ContentFormControl ViewModel="{x:Bind}" />
                </Grid>
            </DataTemplate>

            <DataTemplate x:Key="NestedMarkdownContentTemplate" x:DataType="viewmodels:ContentMarkdownViewModel">
                <Grid>
-                    <toolkit:MarkdownTextBlock
-                        Background="Transparent"
-                        Header3FontSize="12"
-                        Header3FontWeight="Normal"
-                        Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Body, Mode=OneWay}" />
                </Grid>
            </DataTemplate>

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TrayIconService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TrayIconService.cs
@@ -72,7 +72,7 @@ internal sealed partial class TrayIconService
                _largeIcon = GetAppIconHandle();
                _trayIconData = new NOTIFYICONDATAW()
                {
-                    cbSize = (uint)Marshal.SizeOf(typeof(NOTIFYICONDATAW)),
+                    cbSize = (uint)Marshal.SizeOf<NOTIFYICONDATAW>(),
                    hWnd = _hwnd,
                    uID = MY_NOTIFY_ID,
                    uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_MESSAGE | NOTIFY_ICON_DATA_FLAGS.NIF_ICON | NOTIFY_ICON_DATA_FLAGS.NIF_TIP,
@@ -133,7 +133,7 @@ internal sealed partial class TrayIconService

    private DestroyIconSafeHandle GetAppIconHandle()
    {
-        var exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+        var exePath = Path.Combine(AppContext.BaseDirectory, "Microsoft.CmdPal.UI.exe");
        DestroyIconSafeHandle largeIcon;
        PInvoke.ExtractIconEx(exePath, 0, out largeIcon, out _, 1);
        return largeIcon;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -496,27 +496,18 @@ public sealed partial class MainWindow : WindowEx,

            if (key != null)
            {
-                if (settings.UseLowLevelGlobalHotkey)
-                {
-                    _keyboardListener.SetHotkeyAction(key.Win, key.Ctrl, key.Shift, key.Alt, (byte)key.Code, commandHotkey.CommandId);
+                var vk = key.Code;
+                var modifiers =
+                    (key.Alt ? HOT_KEY_MODIFIERS.MOD_ALT : 0) |
+                    (key.Ctrl ? HOT_KEY_MODIFIERS.MOD_CONTROL : 0) |
+                    (key.Shift ? HOT_KEY_MODIFIERS.MOD_SHIFT : 0) |
+                    (key.Win ? HOT_KEY_MODIFIERS.MOD_WIN : 0)
+                    ;

-                    _hotkeys.Add(new(globalHotkey, string.Empty));
-                }
-                else
+                var success = PInvoke.RegisterHotKey(_hwnd, _hotkeys.Count, modifiers, (uint)vk);
+                if (success)
                {
-                    var vk = key.Code;
-                    var modifiers =
-                        (key.Alt ? HOT_KEY_MODIFIERS.MOD_ALT : 0) |
-                        (key.Ctrl ? HOT_KEY_MODIFIERS.MOD_CONTROL : 0) |
-                        (key.Shift ? HOT_KEY_MODIFIERS.MOD_SHIFT : 0) |
-                        (key.Win ? HOT_KEY_MODIFIERS.MOD_WIN : 0)
-                        ;
-
-                    var success = PInvoke.RegisterHotKey(_hwnd, _hotkeys.Count, modifiers, (uint)vk);
-                    if (success)
-                    {
-                        _hotkeys.Add(commandHotkey);
-                    }
+                    _hotkeys.Add(commandHotkey);
                }
            }
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -23,6 +23,16 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
  </PropertyGroup>

+    <PropertyGroup>
+	    <SelfContained>true</SelfContained>
+	    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	    <PublishTrimmed>true</PublishTrimmed>
+	    <PublishSingleFile>false</PublishSingleFile>
+	    <DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
+	    <PublishAot>true</PublishAot>
+	    <EnableMsixTooling>true</EnableMsixTooling>
+    </PropertyGroup>	
+
  <PropertyGroup>
    <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
  </PropertyGroup>
@@ -71,7 +81,6 @@
    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
    <PackageReference Include="CommunityToolkit.WinUI.Animations" />
    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="Microsoft.WindowsAppSDK" />
@@ -90,9 +99,6 @@
    <PackageReference Include="System.Text.Json" />

    <!-- LOAD BEARING: GeneratePathProperty=true on BOTH the AC dependencies. Don't forget the AdaptiveCardsWorkaround below -->
-    <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true" />
-    <PackageReference Include="AdaptiveCards.Rendering.WinUI3" GeneratePathProperty="True" />
-    <PackageReference Include="AdaptiveCards.Templating" />
    <PackageReference Include="System.Text.RegularExpressions" />
  </ItemGroup>

@@ -117,7 +123,6 @@

    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj" />
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj" />
@@ -127,7 +132,7 @@
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj" />
    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj" />
-
+    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj" />
    <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
      <Private>True</Private>
@@ -181,10 +186,6 @@
  <PropertyGroup>
    <AdaptiveCardsNative>runtimes\win10-$(Platform)\native</AdaptiveCardsNative>
  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="$(PkgAdaptiveCards_ObjectModel_WinUI3)\$(AdaptiveCardsNative)\AdaptiveCards.ObjectModel.WinUI3.dll" Link="AdaptiveCards.ObjectModel.WinUI3.dll" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="$(PkgAdaptiveCards_Rendering_WinUI3)\$(AdaptiveCardsNative)\AdaptiveCards.Rendering.WinUI3.dll" Link="AdaptiveCards.Rendering.WinUI3.dll" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
  <ItemGroup>
    <Content Update="..\Microsoft.CmdPal.UI.ViewModels\Assets\template.zip">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
@@ -1,7 +1,6 @@
 GetPhysicallyInstalledSystemMemory
 GlobalMemoryStatusEx
 GetSystemInfo
-CoCreateInstance
 GetForegroundWindow
 SetForegroundWindow
 GetWindowRect
@@ -21,10 +20,7 @@ SetActiveWindow
 MonitorFromWindow
 GetMonitorInfo
 GetDpiForMonitor
-SHCreateStreamOnFileEx
 CoAllowSetForegroundWindow
-SHCreateStreamOnFileEx
-SHLoadIndirectString
 WM_HOTKEY
 WM_NCLBUTTONDBLCLK

@@ -33,7 +29,6 @@ LoadIcon
 WM_USER
 WM_WINDOWPOSCHANGING
 RegisterWindowMessageW
-GetModuleHandleW
 ExtractIconEx
 TRACK_POPUP_MENU_FLAGS
 WM_COMMAND
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -10,7 +10,6 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
    xmlns:ui="using:CommunityToolkit.WinUI"
    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
    Background="Transparent"
@@ -132,13 +131,6 @@
                        Visibility="{x:Bind HasTags, Mode=OneWay}">
                        <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
-                                <toolkit:WrapPanel
-                                    x:Name="TagsWrapPanel"
-                                    MinWidth="0"
-                                    Padding="0"
-                                    HorizontalSpacing="4"
-                                    Orientation="Horizontal"
-                                    VerticalSpacing="4" />
                            </ItemsPanelTemplate>
                        </ItemsControl.ItemsPanel>
                    </ItemsControl>
@@ -408,16 +400,6 @@
                            TextWrapping="WrapWholeWords"
                            Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />

-                        <toolkit:MarkdownTextBlock
-                            Grid.Row="2"
-                            Margin="0,12,0,24"
-                            Background="Transparent"
-                            Header3FontSize="12"
-                            Header3FontWeight="Normal"
-                            Header3Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                            IsTextSelectionEnabled="True"
-                            Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />
-
                        <ItemsRepeater
                            Grid.Row="3"
                            ItemTemplate="{StaticResource DetailsDataTemplateSelector}"
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>False</PublishSingleFile>
    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
-    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">True</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
  </PropertyGroup>
 </Project>
--- 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 Mages.Core;
+using CmdPalCalculator;
+using Windows.Foundation.Collections;

 namespace Microsoft.CmdPal.Ext.Calc.Helper;

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

    public const int RoundingDigits = 10;

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

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

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

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

        var decimalResult = Convert.ToDecimal(result, cultureInfo);
+        var formatted = decimalResult.ToString("G29", cultureInfo);
+        decimalResult = Convert.ToDecimal(formatted, cultureInfo);
        var roundedResult = Round(decimalResult);

        return new CalculateResult()
@@ -103,25 +98,4 @@ 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,6 +3,7 @@
 // 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;
@@ -63,46 +64,61 @@ 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]+))");

-        var hexTokens = hexRegex.Split(input);
+        // 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]+)");

-        foreach (var hexToken in hexTokens)
+        var tokens = baseNumberRegex.Split(input);
+
+        foreach (var token in tokens)
        {
-            if (hexToken.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
-            {
-                // 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);
-                }
+            // Currently, we only convert base literals (hexadecimal, binary, octal) to decimal.
+            var converted = ConvertBaseLiteral(token, cultureTo);

+            if (converted != null)
+            {
+                outputBuilder.Append(converted);
                continue;
            }

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

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

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

                outputBuilder.Append(
-                    decimal.TryParse(token, NumberStyles.Number, cultureFrom, out number)
+                    decimal.TryParse(inner, NumberStyles.Number, cultureFrom, out number)
                    ? (new string('0', leadingZeroCount) + number.ToString(cultureTo))
-                    : token.Replace(cultureFrom.TextInfo.ListSeparator, cultureTo.TextInfo.ListSeparator));
+                    : inner.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,11 +65,6 @@ 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
@@ -1,6 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
+  <Target Name="BuildCmdPalCalculator" BeforeTargets="Build">
+    <MSBuild
+        Projects="..\..\CmdPalCalculator\CmdPalCalculator.vcxproj"
+        Targets="Build"
+        Properties="Configuration=$(Configuration);Platform=$(Platform)" />
+  </Target>
  <PropertyGroup>
    <RootNamespace>Microsoft.CmdPal.Ext.Calc</RootNamespace>
    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
@@ -9,13 +15,24 @@
    <!-- 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>CmdPalCalculator</CsWinRTIncludes>
+    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+  </PropertyGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
    <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Mages" />
+    <CsWinRTInputs Include="..\..\..\..\..\$(Platform)\$(Configuration)\CmdPalCalculator.winmd" />
+    <Content Include="..\..\..\..\..\$(Platform)\$(Configuration)\CmdPalCalculator.winmd" Link="CmdPalCalculator.winmd">
+		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	</Content>
+    <Content Include="..\..\..\..\..\$(Platform)\$(Configuration)\CmdPalCalculator.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/Pages/WindowsSettingsListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/Pages/WindowsSettingsListPage.cs
@@ -31,81 +31,57 @@ internal sealed partial class WindowsSettingsListPage : DynamicListPage
        }

        var filteredList = _windowsSettings.Settings
-            .Select(SearchScoringPredicate)
-            .Where(scoredSetting => scoredSetting.Score > 0)
-            .OrderByDescending(scoredSetting => scoredSetting.Score)
-            .Select(scoredSetting => scoredSetting.Setting);
+            .Where(Predicate)
+            .OrderBy(found => found.Name);

        var newList = ResultHelper.GetResultList(filteredList, query);
        return newList;

-        // Rank settings by how they matched the search query. Order is:
-        // 1. Exact Name (10 points)
-        // 2. Name Starts With (8 points)
-        // 3. Name (5 points)
-        // 4. Area (4 points)
-        // 5. AltName (2 points)
-        // 6. Settings path (1 point)
-        (WindowsSetting Setting, int Score) SearchScoringPredicate(WindowsSetting setting)
+        bool Predicate(WindowsSetting found)
        {
            if (string.IsNullOrWhiteSpace(query))
            {
                // If no search string is entered skip query comparison.
-                return (setting, 0);
+                return true;
            }

-            if (string.Equals(setting.Name, query, StringComparison.OrdinalIgnoreCase))
+            if (found.Name.Contains(query, StringComparison.CurrentCultureIgnoreCase))
            {
-                return (setting, 10);
+                return true;
            }

-            if (setting.Name.StartsWith(query, StringComparison.CurrentCultureIgnoreCase))
+            if (!(found.Areas is null))
            {
-                return (setting, 8);
-            }
-
-            if (setting.Name.Contains(query, StringComparison.CurrentCultureIgnoreCase))
-            {
-                return (setting, 5);
-            }
-
-            if (!(setting.Areas is null))
-            {
-                foreach (var area in setting.Areas)
+                foreach (var area in found.Areas)
                {
                    // Search for areas on normal queries.
                    if (area.Contains(query, StringComparison.CurrentCultureIgnoreCase))
                    {
-                        return (setting, 4);
+                        return true;
                    }

                    // Search for Area only on queries with action char.
                    if (area.Contains(query.Replace(":", string.Empty), StringComparison.CurrentCultureIgnoreCase)
                    && query.EndsWith(":", StringComparison.CurrentCultureIgnoreCase))
                    {
-                        return (setting, 4);
+                        return true;
                    }
                }
            }

-            if (!(setting.AltNames is null))
+            if (!(found.AltNames is null))
            {
-                foreach (var altName in setting.AltNames)
+                foreach (var altName in found.AltNames)
                {
                    if (altName.Contains(query, StringComparison.CurrentCultureIgnoreCase))
                    {
-                        return (setting, 2);
+                        return true;
                    }
                }
            }

            // Search by key char '>' for app name and settings path
-            if (query.Contains('>') && ResultHelper.FilterBySettingsPath(setting, query))
-            {
-                return (setting, 1);
-            }
-
-            return (setting, 0);
+            return query.Contains('>') ? ResultHelper.FilterBySettingsPath(found, query) : false;
        }
    }

--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs
@@ -123,7 +123,7 @@ public class ThumbnailHelper
    private static nint GetLargestIcon(string path)
    {
        var shinfo = default(NativeMethods.SHFILEINFO);
-        NativeMethods.SHGetFileInfo(path, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_SYSICONINDEX);
+        NativeMethods.SHGetFileInfo(path, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_ICON | SHGFI_SYSICONINDEX);

        var hIcon = IntPtr.Zero;
        var iID_IImageList = new Guid("46EB5926-582E-4017-9FDF-E8998DAA0950");
--- a/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
+++ b/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
@@ -14,70 +14,12 @@ namespace PowerLauncher.Helper
 {
    public static class ErrorReporting
    {
-        private const string LoggerName = "UnHandledException";
-
-        public static void ShowMessageBox(string title, string message)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                MessageBox.Show(message, title);
-            });
-        }
-
-        public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
-        {
-            // handle non-ui thread exceptions
-            System.Windows.Application.Current.Dispatcher.Invoke(() =>
-            {
-                HandleException(e?.ExceptionObject as Exception, true);
-            });
-        }
-
-        public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
-        {
-            if (e != null)
-            {
-                // handle ui thread exceptions
-                HandleException(e.Exception, false);
-
-                // prevent application exist, so the user can copy prompted error info
-                e.Handled = true;
-            }
-        }
-
-        public static string RuntimeInfo()
-        {
-            var info = $"\nVersion: {Constant.Version}" +
-                       $"\nOS Version: {Environment.OSVersion.VersionString}" +
-                       $"\nIntPtr Length: {IntPtr.Size}" +
-                       $"\nx64: {Environment.Is64BitOperatingSystem}";
-            return info;
-        }
-
-        private static void HandleException(Exception e, bool isNotUIThread)
-        {
-            // The crash occurs in PresentationFramework.dll, not necessarily when the Runner UI is visible, originating from this line:
-            // https://github.com/dotnet/wpf/blob/3439f20fb8c685af6d9247e8fd2978cac42e74ac/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Shell/WindowChromeWorker.cs#L1005
-            // Many bug reports because users see the "Report problem UI" after "the" crash with System.Runtime.InteropServices.COMException 0xD0000701 or 0x80263001.
-            // However, displaying this "Report problem UI" during WPF crashes, especially when DWM composition is changing, is not ideal; some users reported it hangs for up to a minute before the "Report problem UI" appears.
-            // This change modifies the behavior to log the exception instead of showing the "Report problem UI".
-            if (IsDwmCompositionException(e as System.Runtime.InteropServices.COMException))
-            {
-                var logger = LogManager.GetLogger(LoggerName);
-                logger.Error($"From {(isNotUIThread ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
-            }
-            else
-            {
-                Report(e, isNotUIThread);
-            }
-        }
-
        private static void Report(Exception e, bool waitForClose)
        {
            if (e != null)
            {
-                var logger = LogManager.GetLogger(LoggerName);
-                logger.Fatal($"From {(waitForClose ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
+                var logger = LogManager.GetLogger("UnHandledException");
+                logger.Fatal(ExceptionFormatter.FormatException(e));

                var reportWindow = new ReportWindow(e);

@@ -92,21 +34,39 @@ namespace PowerLauncher.Helper
            }
        }

-        private static bool IsDwmCompositionException(System.Runtime.InteropServices.COMException comException)
+        public static void ShowMessageBox(string title, string message)
        {
-            if (comException == null)
+            Application.Current.Dispatcher.Invoke(() =>
            {
-                return false;
-            }
+                MessageBox.Show(message, title);
+            });
+        }

-            var stackTrace = comException.StackTrace;
-            if (string.IsNullOrEmpty(stackTrace))
+        public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
+        {
+            // handle non-ui thread exceptions
+            System.Windows.Application.Current.Dispatcher.Invoke(() =>
            {
-                return false;
-            }
+                Report((Exception)e?.ExceptionObject, true);
+            });
+        }

-            // Check for common DWM composition changed patterns in the stack trace
-            return stackTrace.Contains("DwmCompositionChanged");
+        public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+        {
+            // handle ui thread exceptions
+            Report(e?.Exception, false);
+
+            // prevent application exist, so the user can copy prompted error info
+            e.Handled = true;
+        }
+
+        public static string RuntimeInfo()
+        {
+            var info = $"\nVersion: {Constant.Version}" +
+                       $"\nOS Version: {Environment.OSVersion.VersionString}" +
+                       $"\nIntPtr Length: {IntPtr.Size}" +
+                       $"\nx64: {Environment.Is64BitOperatingSystem}";
+            return info;
        }
    }
 }
--- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
+++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
@@ -389,7 +389,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Monaco
                }

                fileReader.Close();
-                _base64FileCode = Convert.ToBase64String(encodingToUse.GetBytes(fileContent));
+                _base64FileCode = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(fileContent));
                Logger.LogInfo("Reading requested file ended");
            }
Author	SHA1	Message	Date
Leilei Zhang	5fe883b789	cal AOT	2025-06-10 19:20:47 +08:00
Leilei Zhang	d5e457fb90	use exprtk	2025-06-10 13:50:03 +08:00
Yu Leng	b3c533e4c4	update	2025-06-06 15:03:40 +08:00
Yu Leng	2bdb591ac8	init	2025-06-06 14:46:48 +08:00