From f6ef42006a5c5e84db3bae658a9a54e2ad7286a2 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Fri, 22 Aug 2025 11:40:50 +0800 Subject: [PATCH 01/29] build with the experimental winAppSDK Signed-off-by: Shawn Yuan --- Directory.Packages.props | 6 +-- NOTICE.md | 2 +- nuget.config | 6 +++ .../PowerToys.MeasureToolCore.vcxproj | 32 ++++++++++++++-- .../MeasureToolCore/packages.config | 11 +++++- .../Directory.Packages.props | 2 +- .../Microsoft.Terminal.UI.vcxproj | 27 +++++++++++++- .../Microsoft.Terminal.UI/packages.config | 7 ++++ ...icrosoft.CommandPalette.Extensions.vcxproj | 3 +- .../PowerRenameUILib/PowerRenameUI.vcxproj | 37 ++++++++++++++++--- .../PowerRenameUILib/packages.config | 11 +++++- 11 files changed, 126 insertions(+), 18 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 71bbda504296..ee7bf300b0f4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -45,7 +45,7 @@ - + @@ -57,8 +57,8 @@ This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail. --> - - + + diff --git a/NOTICE.md b/NOTICE.md index d75fe9952271..38a40988a6ee 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1539,7 +1539,7 @@ SOFTWARE. - Microsoft.Windows.CsWin32 0.3.183 - Microsoft.Windows.CsWinRT 2.2.0 - Microsoft.Windows.SDK.BuildTools 10.0.26100.4188 -- Microsoft.WindowsAppSDK 1.7.250513003 +- Microsoft.WindowsAppSDK 1.8.250814004-preview - Microsoft.WindowsPackageManager.ComInterop 1.10.340 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 - Microsoft.Xaml.Behaviors.Wpf 1.1.39 diff --git a/nuget.config b/nuget.config index 51f9b3b3f7a6..4d438039066b 100644 --- a/nuget.config +++ b/nuget.config @@ -2,9 +2,15 @@ + + + + + + diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index 28b1dd8db70b..badb92db668c 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,6 +1,12 @@  - + + + + + + + @@ -141,7 +147,13 @@ - + + + + + + + @@ -153,7 +165,19 @@ - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config index 9e58941250c1..a4dca302a0c9 100644 --- a/src/modules/MeasureTool/MeasureToolCore/packages.config +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -4,5 +4,14 @@ - + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props index d364f7da8b09..ebf9e7db0afd 100644 --- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props @@ -9,7 +9,7 @@ - + diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj index da267fbc6325..3823ade1a052 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj @@ -3,9 +3,15 @@ ..\..\..\..\ - $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003 + $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250814004-preview + + + + + + true true @@ -21,6 +27,7 @@ 10.0 10.0.26100.0 10.0.19041.0 + false @@ -193,6 +200,12 @@ + + + + + + @@ -203,6 +216,18 @@ + + + + + + + + + + + + diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config index a516cb061d8a..546c60c6919e 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config @@ -4,4 +4,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj index 983c1594a48e..22309bd38111 100644 --- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj @@ -2,7 +2,7 @@ ..\..\..\..\..\ - $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003 + $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250814004-preview $(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5 $(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188 $(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40 @@ -25,6 +25,7 @@ 10.0 10.0.19041.0 10.0.26100.0 + false diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index 9587b0dac0ea..9df922134537 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,6 +1,15 @@  - + + + + + + + + + + @@ -207,11 +216,17 @@ - + + + + + + + - + 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}. @@ -221,8 +236,20 @@ - - + + + + + + + + + + + + + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 4a91705aea79..2e1fd6c42ac0 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -6,5 +6,14 @@ - + + + + + + + + + + \ No newline at end of file From 091812a74bf1f20df04a6ad174753b786329d96b Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Mon, 25 Aug 2025 15:59:39 +0800 Subject: [PATCH 02/29] update Signed-off-by: Shawn Yuan --- nuget.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nuget.config b/nuget.config index 4d438039066b..4cd40232bc31 100644 --- a/nuget.config +++ b/nuget.config @@ -3,15 +3,9 @@ - - - - - - From f9ed0096896e3fac84a60e23d1b4bb040d9f9615 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Tue, 26 Aug 2025 10:07:44 +0800 Subject: [PATCH 03/29] update Signed-off-by: Shawn Yuan --- .pipelines/v2/templates/job-build-project.yml | 2 +- nuget.config | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 948ef951c3c2..3aacbb3db3fd 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -175,7 +175,7 @@ jobs: displayName: Ensure VSTest Platform - pwsh: |- - & '.pipelines/applyXamlStyling.ps1' -Passive + & '.pipelines/applyXamlStyling.ps1' -Main displayName: Verify XAML formatting - pwsh: |- diff --git a/nuget.config b/nuget.config index 4cd40232bc31..8aead53fd660 100644 --- a/nuget.config +++ b/nuget.config @@ -1,12 +1,12 @@  - - - - - - - - - + + + + + + + + + From 2c18493a52e7fa8b3249e9ab97b976b62d8c5fa8 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Tue, 26 Aug 2025 10:27:11 +0800 Subject: [PATCH 04/29] update Signed-off-by: Shawn Yuan --- .pipelines/v2/templates/job-build-project.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 3aacbb3db3fd..9b6d45b76d1f 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -174,9 +174,9 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 displayName: Ensure VSTest Platform - - pwsh: |- - & '.pipelines/applyXamlStyling.ps1' -Main - displayName: Verify XAML formatting + # - pwsh: |- + # & '.pipelines/applyXamlStyling.ps1' -Main + # displayName: Verify XAML formatting - pwsh: |- & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln' From be5654fbe851bb93d072b5426ceb3ca570266231 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Tue, 26 Aug 2025 10:43:17 +0800 Subject: [PATCH 05/29] update Signed-off-by: Shawn Yuan --- .pipelines/v2/templates/job-build-project.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 9b6d45b76d1f..948ef951c3c2 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -174,9 +174,9 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 displayName: Ensure VSTest Platform - # - pwsh: |- - # & '.pipelines/applyXamlStyling.ps1' -Main - # displayName: Verify XAML formatting + - pwsh: |- + & '.pipelines/applyXamlStyling.ps1' -Passive + displayName: Verify XAML formatting - pwsh: |- & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln' From 986cfb61494a66a921baaf8e77796c6771cbbe73 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Tue, 26 Aug 2025 15:28:14 +0800 Subject: [PATCH 06/29] update Signed-off-by: Shawn Yuan --- nuget.config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nuget.config b/nuget.config index 8aead53fd660..51f9b3b3f7a6 100644 --- a/nuget.config +++ b/nuget.config @@ -1,12 +1,12 @@  - - - - - - - - - + + + + + + + + + From 4ffcefad4402640e6f42dd960ffbdcb18254dc91 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Thu, 28 Aug 2025 12:43:33 +0800 Subject: [PATCH 07/29] disable notice.md and nuget packages match Signed-off-by: Shawn Yuan --- .pipelines/v2/templates/job-build-project.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 948ef951c3c2..b3a66730ba75 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -379,10 +379,10 @@ jobs: displayName: Audit WinAppSDK applications path asset conflicts # To streamline the pipeline and prevent errors, skip this step during compatibility tests with the latest WinAppSDK. - - ${{ if eq(parameters.useLatestWinAppSDK, false) }}: - - pwsh: |- - & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\' - displayName: Verify NOTICE.md and NuGet packages match + # - ${{ if eq(parameters.useLatestWinAppSDK, false) }}: + # - pwsh: |- + # & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\' + # displayName: Verify NOTICE.md and NuGet packages match - ${{ if eq(parameters.runTests, true) }}: # Publish test results which ran in MSBuild From 3ebcfc83884b3662e0cba5d68a2bfcbd285f6a87 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Tue, 2 Sep 2025 13:52:44 +0800 Subject: [PATCH 08/29] reset notice.md Signed-off-by: Shawn Yuan --- NOTICE.md | 95 +------------------------------------------------------ 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 70a3069f1e62..bedc11379de5 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1491,98 +1491,6 @@ SOFTWARE. ## NuGet Packages used by PowerToys -<<<<<<< HEAD -- AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta -- AdaptiveCards.Rendering.WinUI3 2.1.0-beta -- AdaptiveCards.Templating 2.0.5 -- Appium.WebDriver 4.4.5 -- Azure.AI.OpenAI 1.0.0-beta.17 -- CoenM.ImageSharp.ImageHash 1.3.6 -- CommunityToolkit.Common 8.4.0 -- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250703-build.2173 -- CommunityToolkit.Mvvm 8.4.0 -- CommunityToolkit.WinUI.Animations 8.2.250402 -- CommunityToolkit.WinUI.Collections 8.2.250402 -- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402 -- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402 -- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402 -- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402 -- CommunityToolkit.WinUI.Converters 8.2.250402 -- CommunityToolkit.WinUI.Extensions 8.2.250402 -- CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2 -- CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2 -- ControlzEx 6.0.0 -- HelixToolkit 2.24.0 -- HelixToolkit.Core.Wpf 2.24.0 -- hyjiacan.pinyin4net 4.1.1 -- Interop.Microsoft.Office.Interop.OneNote 1.1.0.2 -- LazyCache 2.4.0 -- Mages 3.0.0 -- Markdig.Signed 0.34.0 -- MessagePack 3.1.3 -- Microsoft.Bcl.AsyncInterfaces 9.0.8 -- Microsoft.Bot.AdaptiveExpressions.Core 4.23.0 -- Microsoft.CodeAnalysis.NetAnalyzers 9.0.0 -- Microsoft.Data.Sqlite 9.0.8 -- Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16 -- Microsoft.DotNet.ILCompiler (A) -- Microsoft.Extensions.DependencyInjection 9.0.8 -- Microsoft.Extensions.Hosting 9.0.8 -- Microsoft.Extensions.Hosting.WindowsServices 9.0.8 -- Microsoft.Extensions.Logging 9.0.8 -- Microsoft.Extensions.Logging.Abstractions 9.0.8 -- 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.8 -- Microsoft.Windows.Compatibility 9.0.8 -- Microsoft.Windows.CsWin32 0.3.183 -- Microsoft.Windows.CsWinRT 2.2.0 -- Microsoft.Windows.SDK.BuildTools 10.0.26100.4188 -- Microsoft.WindowsAppSDK 1.8.250814004-preview -- Microsoft.WindowsPackageManager.ComInterop 1.10.340 -- Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 -- Microsoft.Xaml.Behaviors.Wpf 1.1.39 -- ModernWpfUI 0.9.4 -- Moq 4.18.4 -- MSTest 3.8.3 -- NLog.Extensions.Logging 5.3.8 -- NLog.Schema 5.2.8 -- OpenAI 2.0.0 -- ReverseMarkdown 4.1.0 -- ScipBe.Common.Office.OneNote 3.0.1 -- SharpCompress 0.37.2 -- SkiaSharp.Views.WinUI 2.88.9 -- StreamJsonRpc 2.21.69 -- StyleCop.Analyzers 1.2.0-beta.556 -- System.CodeDom 9.0.8 -- System.CommandLine 2.0.0-beta4.22272.1 -- System.ComponentModel.Composition 9.0.8 -- System.Configuration.ConfigurationManager 9.0.8 -- System.Data.OleDb 9.0.8 -- System.Data.SqlClient 4.9.0 -- System.Diagnostics.EventLog 9.0.8 -- System.Diagnostics.PerformanceCounter 9.0.8 -- System.Drawing.Common 9.0.8 -- System.IO.Abstractions 22.0.13 -- System.IO.Abstractions.TestingHelpers 22.0.13 -- System.Management 9.0.8 -- System.Net.Http 4.3.4 -- System.Private.Uri 4.3.2 -- System.Reactive 6.0.1 -- System.Runtime.Caching 9.0.8 -- System.ServiceProcess.ServiceController 9.0.8 -- System.Text.Encoding.CodePages 9.0.8 -- System.Text.Json 9.0.8 -- System.Text.RegularExpressions 4.3.1 -- UnicodeInformation 2.6.0 -- UnitsNet 5.56.0 -- UTF.Unknown 2.5.1 -- WinUIEx 2.2.0 -- WPF-UI 3.0.5 -- WyHash 1.0.5 -======= - AdaptiveCards.ObjectModel.WinUI3 - AdaptiveCards.Rendering.WinUI3 - AdaptiveCards.Templating @@ -1629,5 +1537,4 @@ SOFTWARE. - UTF.Unknown - WinUIEx - WPF-UI -- WyHash ->>>>>>> main +- WyHash \ No newline at end of file From a231bf5e07f63efa288f3a9a6935b8589a12348b Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Wed, 10 Sep 2025 12:11:22 +0800 Subject: [PATCH 09/29] update to public release winappsdk1.8 Signed-off-by: Shawn Yuan --- .pipelines/v2/templates/job-build-project.yml | 8 +-- nuget.config | 4 ++ .../PowerToys.MeasureToolCore.vcxproj | 56 +++++++++---------- .../MeasureToolCore/packages.config | 20 +++---- .../Microsoft.Terminal.UI.vcxproj | 50 ++++++++--------- .../Microsoft.Terminal.UI/packages.config | 14 ++--- ...icrosoft.CommandPalette.Extensions.vcxproj | 2 +- .../PowerRenameUILib/PowerRenameUI.vcxproj | 56 +++++++++---------- .../PowerRenameUILib/packages.config | 20 +++---- 9 files changed, 117 insertions(+), 113 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 5e90e0ca3385..e345cdc3fa1d 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -382,10 +382,10 @@ jobs: displayName: Audit WinAppSDK applications path asset conflicts # To streamline the pipeline and prevent errors, skip this step during compatibility tests with the latest WinAppSDK. - # - ${{ if eq(parameters.useLatestWinAppSDK, false) }}: - # - pwsh: |- - # & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\' - # displayName: Verify NOTICE.md and NuGet packages match + - ${{ if eq(parameters.useLatestWinAppSDK, false) }}: + - pwsh: |- + & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\' + displayName: Verify NOTICE.md and NuGet packages match - ${{ if eq(parameters.runTests, true) }}: # Publish test results which ran in MSBuild diff --git a/nuget.config b/nuget.config index 51f9b3b3f7a6..fe14edd7b26d 100644 --- a/nuget.config +++ b/nuget.config @@ -2,9 +2,13 @@ + + + + diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index badb92db668c..6de7c50b55a0 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -1,12 +1,12 @@  - - - - - - - + + + + + + + @@ -147,13 +147,13 @@ - - - - - - - + + + + + + + @@ -165,19 +165,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config index a4dca302a0c9..6416ca5b16ad 100644 --- a/src/modules/MeasureTool/MeasureToolCore/packages.config +++ b/src/modules/MeasureTool/MeasureToolCore/packages.config @@ -4,14 +4,14 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj index 1f0e749e09dd..880236b6e805 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj @@ -3,15 +3,15 @@ ..\..\..\..\ - $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250814004-preview + $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003 - - - - - - + + + + + + true true @@ -207,12 +207,12 @@ - - - - - - + + + + + + @@ -223,18 +223,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config index 546c60c6919e..be2f7137d3d0 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config @@ -4,11 +4,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj index 22309bd38111..0f044de5665b 100644 --- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj @@ -2,7 +2,7 @@ ..\..\..\..\..\ - $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250814004-preview + $(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003 $(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5 $(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188 $(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40 diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index 9df922134537..e6b8618099ed 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -1,12 +1,12 @@  - - - - - - - + + + + + + + @@ -216,13 +216,13 @@ - - - - - - - + + + + + + + @@ -236,20 +236,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config index 2e1fd6c42ac0..74414b51bc13 100644 --- a/src/modules/powerrename/PowerRenameUILib/packages.config +++ b/src/modules/powerrename/PowerRenameUILib/packages.config @@ -6,14 +6,14 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file From 62a7889a501e9024c134ddc93df61a88175f81fe Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Wed, 10 Sep 2025 12:13:45 +0800 Subject: [PATCH 10/29] update Signed-off-by: Shawn Yuan --- Directory.Packages.props | 2 +- .../TemplateCmdPalExtension/Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3a787a751a04..62647d064ad8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -58,7 +58,7 @@ --> - + diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props index ebf9e7db0afd..75ffb75e3191 100644 --- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props +++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props @@ -9,7 +9,7 @@ - + From a1589a431e52ce3423d7c91b4e064344e6674364 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Wed, 10 Sep 2025 12:21:28 +0800 Subject: [PATCH 11/29] updaet Signed-off-by: Shawn Yuan --- Directory.Packages.props | 2 +- nuget.config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 62647d064ad8..23dac3025840 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -57,7 +57,7 @@ This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail. --> - + diff --git a/nuget.config b/nuget.config index fe14edd7b26d..e9635836a46c 100644 --- a/nuget.config +++ b/nuget.config @@ -3,14 +3,14 @@ - + - + From a8c5a2db6b33632bf4ef91a66c59b1bf82e298f5 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Wed, 10 Sep 2025 12:59:59 +0800 Subject: [PATCH 12/29] update Signed-off-by: Shawn Yuan --- nuget.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nuget.config b/nuget.config index e9635836a46c..fe14edd7b26d 100644 --- a/nuget.config +++ b/nuget.config @@ -3,14 +3,14 @@ - + - + From 0875030ab6508d235f589a12f8353a7afc8a2283 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Wed, 10 Sep 2025 13:23:20 +0800 Subject: [PATCH 13/29] update Signed-off-by: Shawn Yuan --- nuget.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nuget.config b/nuget.config index fe14edd7b26d..51f9b3b3f7a6 100644 --- a/nuget.config +++ b/nuget.config @@ -2,13 +2,9 @@ - - - - From c36070cc44bebf361274359b7412a5285828b275 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Thu, 11 Sep 2025 16:13:32 +0800 Subject: [PATCH 14/29] update nuget.config Signed-off-by: Shawn Yuan --- .../Microsoft.Terminal.UI.vcxproj | 1 - .../cmdpal/Microsoft.Terminal.UI/packages.config | 3 +++ .../Microsoft.CommandPalette.Extensions.vcxproj | 1 - .../packages.config | 12 ++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj index 880236b6e805..6e474cf5f349 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj @@ -27,7 +27,6 @@ 10.0 10.0.26100.0 10.0.19041.0 - false diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config index be2f7137d3d0..2fb34c8fed67 100644 --- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config +++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config @@ -11,4 +11,7 @@ + + + \ No newline at end of file diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj index 0f044de5665b..a6cad871ab6b 100644 --- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj @@ -25,7 +25,6 @@ 10.0 10.0.19041.0 10.0.26100.0 - false diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config index 6a99b79e23f2..e945c5824dcd 100644 --- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config @@ -1,5 +1,17 @@  + + + + + + + + + + + + \ No newline at end of file From 91b6b21e0bb5f9aad1610e8778cacc54662e62d7 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Fri, 12 Sep 2025 10:38:01 +0800 Subject: [PATCH 15/29] Locate the right CmdPal MSIX --- .pipelines/v2/templates/job-build-project.yml | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml index 5e90e0ca3385..ed928fb85608 100644 --- a/.pipelines/v2/templates/job-build-project.yml +++ b/.pipelines/v2/templates/job-build-project.yml @@ -411,9 +411,28 @@ jobs: !**\obj\** - pwsh: |- - $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1) - $PackageFilename = $Package.FullName - Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}" + $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" + Write-Host "Found $($Packages.Count) CmdPal MSIX package(s):" + foreach ($pkg in $Packages) { + Write-Host " - $($pkg.FullName)" + } + + if ($Packages.Count -gt 0) { + # Priority: Look for platform-specific MSIX (x64/arm64) first, then fallback to any + $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1 + if ($PlatformPackage) { + $Package = $PlatformPackage + Write-Host "Using platform-specific package: $($Package.FullName)" + } else { + $Package = $Packages | Select-Object -First 1 + Write-Host "Using first available package: $($Package.FullName)" + } + + $PackageFilename = $Package.FullName + Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}" + } else { + Write-Warning "No CmdPal MSIX packages found!" + } displayName: Locate the CmdPal MSIX - ${{ if eq(parameters.codeSign, true) }}: From d7275e322a9c2e03b6031c5eeceb5b137c646032 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Fri, 12 Sep 2025 11:15:35 +0800 Subject: [PATCH 16/29] test Signed-off-by: Shawn Yuan --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 14689413c109..fac1a9e9794c 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -41,6 +41,10 @@ true + + false + + Microsoft.Terminal.UI;CmdPalKeyboardService From a83cee17890124871b181b5a15fe865e879a6f76 Mon Sep 17 00:00:00 2001 From: Shawn Yuan Date: Fri, 12 Sep 2025 11:18:31 +0800 Subject: [PATCH 17/29] add comments Signed-off-by: Shawn Yuan --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index fac1a9e9794c..7327a2146886 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -42,6 +42,7 @@ + false From 336f3b55570f839d7bc1b12d6f1684aceefa822d Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Fri, 12 Sep 2025 11:41:17 +0800 Subject: [PATCH 18/29] donot do bundle --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 14689413c109..42f82390d993 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -39,6 +39,7 @@ true + None From 0e0f3d507fe31a89afd80ad7af393fc8ba777546 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Fri, 12 Sep 2025 11:48:04 +0800 Subject: [PATCH 19/29] disable bunddle --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 9e6a74394ea7..6f0b6ef34348 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -39,12 +39,7 @@ true - None - - - - - false + Never From c70e8f3baf2a860e2e7404b2fd5a6c3eba091133 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Fri, 12 Sep 2025 15:13:23 +0800 Subject: [PATCH 20/29] rename test filder --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 6f0b6ef34348..d297c9220468 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -40,6 +40,7 @@ true Never + Microsoft.CmdPal.UI_$(Version)_Test\ From 861958d1c3f0c37d8aa7069d336e014752aac0c3 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Fri, 12 Sep 2025 16:33:22 +0800 Subject: [PATCH 21/29] add dir --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index d297c9220468..9924f73a4329 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -40,7 +40,7 @@ true Never - Microsoft.CmdPal.UI_$(Version)_Test\ + $(OutputPath)AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ From af059dd97e2a61088e6a04f11dcbee7bbf61ed15 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 20:24:41 +0800 Subject: [PATCH 22/29] fix path issue --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 9924f73a4329..641dd1880636 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -37,10 +37,10 @@ true - + true Never - $(OutputPath)AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ + $(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ From 17b880da578786b593980db62947381f3624a009 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 22:26:57 +0800 Subject: [PATCH 23/29] replace the folder --- installer/PowerToysSetup/CmdPal.wxs | 28 +++++++++++-------- installer/PowerToysSetupVNext/CmdPal.wxs | 27 +++++++++++------- .../cmdpal/CmdPalModuleInterface/dllmain.cpp | 6 ++-- .../Microsoft.CmdPal.UI.csproj | 3 +- tools/build/cert-sign-package.ps1 | 2 +- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs index c3c5280cc5fd..5be3b3b1a5ed 100644 --- a/installer/PowerToysSetup/CmdPal.wxs +++ b/installer/PowerToysSetup/CmdPal.wxs @@ -19,36 +19,42 @@ - + + - - - - - - + + + + + + + + + + + - + - + - + - + diff --git a/installer/PowerToysSetupVNext/CmdPal.wxs b/installer/PowerToysSetupVNext/CmdPal.wxs index f05a1f2f353d..2426d0479d45 100644 --- a/installer/PowerToysSetupVNext/CmdPal.wxs +++ b/installer/PowerToysSetupVNext/CmdPal.wxs @@ -13,34 +13,41 @@ - + + - - - - - + + + + + + + + + + + - + - + - + - + diff --git a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp index 7c6a7926dba0..727d385d425e 100644 --- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp +++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp @@ -235,11 +235,13 @@ class CmdPal : public PowertoyModuleIface std::wstring installationFolder = get_module_folderpath(); #ifdef _DEBUG std::wstring archSubdir = L"x64"; + std::wstring archSuffix = L"x64"; #ifdef _M_ARM64 archSubdir = L"ARM64"; + archSuffix = L"arm64"; #endif - auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\", false); - auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\Dependencies\\" + archSubdir + L"\\", true); + auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_" + archSuffix + L"_Test\\", false); + auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_" + archSuffix + L"_Test\\Dependencies\\" + archSubdir + L"\\", true); #else auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\", false); auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\Dependencies\\", true); diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 641dd1880636..6f0b6ef34348 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -37,10 +37,9 @@ true - + true Never - $(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ diff --git a/tools/build/cert-sign-package.ps1 b/tools/build/cert-sign-package.ps1 index 8bb57762a555..67008b0a0c4b 100644 --- a/tools/build/cert-sign-package.ps1 +++ b/tools/build/cert-sign-package.ps1 @@ -1,6 +1,6 @@ param ( [string]$certSubject = "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US", - [string[]]$TargetPaths = "C:\PowerToys\ARM64\Release\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_0.0.1.0_Test\Microsoft.CmdPal.UI_0.0.1.0_arm64.msix" + [string[]]$TargetPaths = "C:\PowerToys\ARM64\Release\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_0.0.1.0_arm64_Test\Microsoft.CmdPal.UI_0.0.1.0_arm64.msix" ) . "$PSScriptRoot\cert-management.ps1" From d14d19e18b0c30eb7bd3e35ae7c5f15411e125b9 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 22:57:40 +0800 Subject: [PATCH 24/29] Revert "replace the folder" This reverts commit 17b880da578786b593980db62947381f3624a009. --- installer/PowerToysSetup/CmdPal.wxs | 28 ++++++++----------- installer/PowerToysSetupVNext/CmdPal.wxs | 27 +++++++----------- .../cmdpal/CmdPalModuleInterface/dllmain.cpp | 6 ++-- .../Microsoft.CmdPal.UI.csproj | 3 +- tools/build/cert-sign-package.ps1 | 2 +- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs index 5be3b3b1a5ed..c3c5280cc5fd 100644 --- a/installer/PowerToysSetup/CmdPal.wxs +++ b/installer/PowerToysSetup/CmdPal.wxs @@ -19,42 +19,36 @@ - - + - - - - - - - - - - + + + + + + - - + - + - + - + diff --git a/installer/PowerToysSetupVNext/CmdPal.wxs b/installer/PowerToysSetupVNext/CmdPal.wxs index 2426d0479d45..f05a1f2f353d 100644 --- a/installer/PowerToysSetupVNext/CmdPal.wxs +++ b/installer/PowerToysSetupVNext/CmdPal.wxs @@ -13,41 +13,34 @@ - - - - - - - - - - - + - + + + + + - - + - + - + - + diff --git a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp index 727d385d425e..7c6a7926dba0 100644 --- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp +++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp @@ -235,13 +235,11 @@ class CmdPal : public PowertoyModuleIface std::wstring installationFolder = get_module_folderpath(); #ifdef _DEBUG std::wstring archSubdir = L"x64"; - std::wstring archSuffix = L"x64"; #ifdef _M_ARM64 archSubdir = L"ARM64"; - archSuffix = L"arm64"; #endif - auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_" + archSuffix + L"_Test\\", false); - auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_" + archSuffix + L"_Test\\Dependencies\\" + archSubdir + L"\\", true); + auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\", false); + auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\Dependencies\\" + archSubdir + L"\\", true); #else auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\", false); auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\Dependencies\\", true); diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 6f0b6ef34348..641dd1880636 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -37,9 +37,10 @@ true - + true Never + $(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ diff --git a/tools/build/cert-sign-package.ps1 b/tools/build/cert-sign-package.ps1 index 67008b0a0c4b..8bb57762a555 100644 --- a/tools/build/cert-sign-package.ps1 +++ b/tools/build/cert-sign-package.ps1 @@ -1,6 +1,6 @@ param ( [string]$certSubject = "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US", - [string[]]$TargetPaths = "C:\PowerToys\ARM64\Release\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_0.0.1.0_arm64_Test\Microsoft.CmdPal.UI_0.0.1.0_arm64.msix" + [string[]]$TargetPaths = "C:\PowerToys\ARM64\Release\WinUI3Apps\CmdPal\AppPackages\Microsoft.CmdPal.UI_0.0.1.0_Test\Microsoft.CmdPal.UI_0.0.1.0_arm64.msix" ) . "$PSScriptRoot\cert-management.ps1" From d617eacd6d22700e32632be82df396324733cc8f Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 22:58:30 +0800 Subject: [PATCH 25/29] revert --- .../cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj index 641dd1880636..b89533035d0f 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj @@ -37,7 +37,7 @@ true - + true Never $(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\ From 1a316a29e6614ca28f1dbb83b23d76fdcbcd08bc Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 23:09:36 +0800 Subject: [PATCH 26/29] remvoe comments --- .../Microsoft.CmdPal.UI.ViewModels.csproj | 12 ------------ 1 file changed, 12 deletions(-) diff --git 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 index 141a476eeb53..a4018597b20a 100644 --- 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 @@ -94,16 +94,4 @@ PreserveNewest - - - - From 8e6bd7b495af32a9d02a60610e153245c8dee287 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sat, 13 Sep 2025 23:56:56 +0800 Subject: [PATCH 27/29] update installer --- installer/PowerToysSetup/CmdPal.wxs | 25 ------------------------ installer/PowerToysSetupVNext/CmdPal.wxs | 24 ----------------------- 2 files changed, 49 deletions(-) diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs index c3c5280cc5fd..13ebb057f955 100644 --- a/installer/PowerToysSetup/CmdPal.wxs +++ b/installer/PowerToysSetup/CmdPal.wxs @@ -33,26 +33,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -60,11 +40,6 @@ - - - - - diff --git a/installer/PowerToysSetupVNext/CmdPal.wxs b/installer/PowerToysSetupVNext/CmdPal.wxs index f05a1f2f353d..83620e2f6426 100644 --- a/installer/PowerToysSetupVNext/CmdPal.wxs +++ b/installer/PowerToysSetupVNext/CmdPal.wxs @@ -25,25 +25,6 @@ - - - - - - - - - - - - - - - - - - - @@ -51,11 +32,6 @@ - - - - - From a1abc2bd5b6aaa4cee3b2bd472d9f86a94db8a2f Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sun, 14 Sep 2025 10:13:47 +0800 Subject: [PATCH 28/29] remvoe unused --- installer/PowerToysSetup/CmdPal.wxs | 1 - installer/PowerToysSetupVNext/CmdPal.wxs | 1 - 2 files changed, 2 deletions(-) diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs index 13ebb057f955..a938d70f0e43 100644 --- a/installer/PowerToysSetup/CmdPal.wxs +++ b/installer/PowerToysSetup/CmdPal.wxs @@ -42,7 +42,6 @@ - diff --git a/installer/PowerToysSetupVNext/CmdPal.wxs b/installer/PowerToysSetupVNext/CmdPal.wxs index 83620e2f6426..190bf1fe234d 100644 --- a/installer/PowerToysSetupVNext/CmdPal.wxs +++ b/installer/PowerToysSetupVNext/CmdPal.wxs @@ -34,7 +34,6 @@ - From 861c99fa8ef50db1b1e11cd744c779ae738299a9 Mon Sep 17 00:00:00 2001 From: Leilei Zhang Date: Sun, 14 Sep 2025 15:55:00 +0800 Subject: [PATCH 29/29] remove depdency --- installer/PowerToysSetup/CmdPal.wxs | 8 -------- installer/PowerToysSetupVNext/CmdPal.wxs | 8 -------- 2 files changed, 16 deletions(-) diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs index a938d70f0e43..cce523e8b4c3 100644 --- a/installer/PowerToysSetup/CmdPal.wxs +++ b/installer/PowerToysSetup/CmdPal.wxs @@ -9,13 +9,6 @@ - - - - - - - @@ -39,7 +32,6 @@ - diff --git a/installer/PowerToysSetupVNext/CmdPal.wxs b/installer/PowerToysSetupVNext/CmdPal.wxs index 190bf1fe234d..8304551c12d1 100644 --- a/installer/PowerToysSetupVNext/CmdPal.wxs +++ b/installer/PowerToysSetupVNext/CmdPal.wxs @@ -4,13 +4,6 @@ - - - - - - - @@ -31,7 +24,6 @@ -