mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-06 11:16:51 +02:00
f0134e4448
## Summary of the Pull Request This PR replaces sequential fallback processing with an adaptive parallel dispatch model and isolates fallback work onto a dedicated thread pool, preventing misbehaving extensions from starving the .NET ThreadPool on blocked synchronous COM RPC call. The other major change is allowing MainListPage to allow take control over the debounce of search updates directly, reducing latency and improving smoothness of the search. - Adds `DedicatedThreadPool` — an elastic pool of background threads (min 2, max 32) that expand on demand when all threads are blocked in COM calls and shrink after 30s idle. - Extracts all fallback dispatch machinery (adaptive workers, per-command inflight tracking, pending-retry slots) from MainListPage into a standalone FallbackUpdateManager. - Prevents one fallback from monopolizing all threads by capping concurrent in-flight calls per fallback to 4. - Starts with low degree of parallelism (2) and gently scales up to half of CPU cores per batch. If a fallback takes more than 200ms, another worker is spawned so remaining commands aren't blocked. - Adds `ThrottledDebouncedAction` to coalesce rapid `RaiseItemsChanged` calls from fallback completions and user input (100ms for external events, 50ms adjusted for keystrokes), replacing unbatched direct calls. - Bypasses the UI-layer debounce timer for the main list page since it now handles its own throttling, eliminating double-debounce latency. - Introduces diagnostics for fallbacks and timing hidden behind feature flags. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #42286 - [x] Related to: #44407 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **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 - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [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 --> ## 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 --> ## Validation Steps Performed
331 lines
14 KiB
XML
331 lines
14 KiB
XML
<Project Sdk="Microsoft.NET.Sdk">
|
|
<Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
|
|
<Import Project="$(RepoRoot)src\Common.Dotnet.AotCompatibility.props" />
|
|
<Import Project="$(RepoRoot)src\CmdPalVersion.props" />
|
|
<Import Project="CmdPal.pre.props" />
|
|
<Import Project="CmdPal.Branding.props" />
|
|
|
|
<PropertyGroup>
|
|
<OutputType>WinExe</OutputType>
|
|
<RootNamespace>Microsoft.CmdPal.UI</RootNamespace>
|
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
|
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
|
|
<UseWinUI>true</UseWinUI>
|
|
<EnableMsixTooling>true</EnableMsixTooling>
|
|
<ImplicitUsings>enable</ImplicitUsings>
|
|
<Nullable>enable</Nullable>
|
|
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
|
|
<LangVersion>preview</LangVersion>
|
|
|
|
<Version>$(CmdPalVersion)</Version>
|
|
|
|
<!-- For MVVM Toolkit Partial Properties/AOT support -->
|
|
<LangVersion>preview</LangVersion>
|
|
|
|
<!-- OutputPath is set in CmdPal.Branding.props -->
|
|
|
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
|
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
|
|
<UseWinRT>true</UseWinRT>
|
|
</PropertyGroup>
|
|
|
|
<!-- Defines: to quickly add project-wide define constants / feature flags -->
|
|
<PropertyGroup Condition=" '$(Configuration)' == 'DEBUG' ">
|
|
<DefineConstants>$(DefineConstants);CMDPAL_FF_EXAMPLE_FLAG</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition=" '$(Configuration)' == 'RELEASE' ">
|
|
<DefineConstants>$(DefineConstants)</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
<!-- For debugging purposes, uncomment this block to enable AOT builds -->
|
|
<!-- <PropertyGroup>
|
|
<EnableCmdPalAOT>true</EnableCmdPalAOT>
|
|
<GeneratePackageLocally>true</GeneratePackageLocally>
|
|
</PropertyGroup> -->
|
|
|
|
<PropertyGroup Condition="'$(EnableCmdPalAOT)' == 'true'">
|
|
<SelfContained>true</SelfContained>
|
|
<PublishSingleFile>false</PublishSingleFile>
|
|
<DisableRuntimeMarshalling>false</DisableRuntimeMarshalling>
|
|
<PublishAot>true</PublishAot>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition="'$(CIBuild)' == 'true' or '$(GeneratePackageLocally)' == 'true'">
|
|
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
|
|
<AppxBundle>Never</AppxBundle>
|
|
<AppxPackageTestDir>$(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\</AppxPackageTestDir>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup>
|
|
<!-- This lets us actually reference types from Microsoft.Terminal.UI and CmdPalKeyboardService -->
|
|
<CsWinRTIncludes>Microsoft.Terminal.UI;CmdPalKeyboardService</CsWinRTIncludes>
|
|
<CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup>
|
|
<!-- This disables the auto-generated main, so we can be single-instanced -->
|
|
<DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
<!-- BODGY: XES Versioning and WinAppSDK get into a fight about the app manifest, which breaks WinAppSDK. -->
|
|
<Target Name="RearrangeXefVersioningAndWinAppSDKResourceGeneration" DependsOnTargets="GetNewAppManifestValues;CreateWinRTRegistration" BeforeTargets="XesWriteVersionInfoResourceFile">
|
|
<PropertyGroup>
|
|
<!-- XES uses this property to store the "final" location of the app manifest, before it erases it.
|
|
We have to update it to the value WinAppSDK set it to. -->
|
|
<OriginalApplicationManifest>$(ApplicationManifest.Replace("$(MSBuildProjectDirectory)\",""))</OriginalApplicationManifest>
|
|
</PropertyGroup>
|
|
<Message Importance="High" Text="Updated final manifest path to $(OriginalApplicationManifest)" />
|
|
</Target>
|
|
|
|
<ItemGroup>
|
|
<None Remove="Controls\ActionBar.xaml" />
|
|
<None Remove="Controls\ColorPalette.xaml" />
|
|
<None Remove="Controls\CommandPalettePreview.xaml" />
|
|
<None Remove="Controls\DevRibbon.xaml" />
|
|
<None Remove="Controls\FallbackRankerDialog.xaml" />
|
|
<None Remove="Controls\ScreenPreview.xaml" />
|
|
<None Remove="Controls\ScrollContainer.xaml" />
|
|
<None Remove="Controls\SearchBar.xaml" />
|
|
<None Remove="ListDetailPage.xaml" />
|
|
<None Remove="LoadingPage.xaml" />
|
|
<None Remove="MainPage.xaml" />
|
|
<None Remove="Pages\Settings\ExtensionsPage.xaml" />
|
|
<None Remove="Pages\Settings\GeneralPage.xaml" />
|
|
<None Remove="SettingsWindow.xaml" />
|
|
<None Remove="Settings\AppearancePage.xaml" />
|
|
<None Remove="Settings\InternalPage.xaml" />
|
|
<None Remove="ShellPage.xaml" />
|
|
<None Remove="Styles\Settings.xaml" />
|
|
<None Remove="Styles\TeachingTip.xaml" />
|
|
<None Remove="Styles\TextBox.xaml" />
|
|
<None Remove="Styles\Theme.Normal.xaml" />
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
|
|
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
|
|
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
|
|
<PackageReference Include="CommunityToolkit.WinUI.Animations" />
|
|
<PackageReference Include="CommunityToolkit.WinUI.Extensions" />
|
|
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
|
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
|
<PackageReference Include="Microsoft.Graphics.Win2D" />
|
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
|
|
<PackageReference Include="Microsoft.WindowsAppSDK" />
|
|
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
|
|
<PackageReference Include="WinUIEx" />
|
|
<PackageReference Include="Microsoft.Windows.CsWin32">
|
|
<PrivateAssets>all</PrivateAssets>
|
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
|
</PackageReference>
|
|
|
|
<PackageReference Include="Microsoft.Extensions.Hosting" />
|
|
</ItemGroup>
|
|
|
|
<!--
|
|
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
|
|
Tools extension to be activated for this project even if the Windows App SDK Nuget
|
|
package has not yet been restored.
|
|
-->
|
|
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
|
|
<ProjectCapability Include="Msix" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
|
|
<ProjectReference Include="..\..\..\common\Common.UI.Controls\Common.UI.Controls.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.RemoteDesktop\Microsoft.CmdPal.Ext.RemoteDesktop.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
|
|
<ProjectReference Include="..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />
|
|
|
|
<ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
|
|
|
|
<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.PerformanceMonitor\Microsoft.CmdPal.Ext.PerformanceMonitor.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" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj" />
|
|
<ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj" />
|
|
<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="$(ProjectDir)\..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
|
|
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
|
|
<BuildProject>True</BuildProject>
|
|
</ProjectReference>
|
|
<!-- WinRT metadata reference -->
|
|
<CsWinRTInputs Include="$(OutputPath)\Microsoft.Terminal.UI.winmd" />
|
|
<!-- Native implementation DLL -->
|
|
<None Include="$(OutputPath)\Microsoft.Terminal.UI.dll">
|
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
</None>
|
|
<ProjectReference Include="..\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj">
|
|
<ReferenceOutputAssembly>True</ReferenceOutputAssembly>
|
|
<Private>True</Private>
|
|
<CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="LoadingPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="ShellPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="ListDetailPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="MainPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="Controls\SearchBar.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="Controls\DevRibbon.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
<Page Update="Styles\TextBox.xaml">
|
|
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<!--
|
|
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
|
|
Explorer "Package and Publish" context menu entry to be enabled for this project even if
|
|
the Windows App SDK Nuget package has not yet been restored.
|
|
-->
|
|
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
|
|
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<Content Update="..\Microsoft.CmdPal.UI.ViewModels\Assets\template.zip">
|
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
</Content>
|
|
<Content Update="Assets\StoreLogo.dark.svg">
|
|
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
|
</Content>
|
|
<Content Update="Assets\StoreLogo.light.svg">
|
|
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
|
</Content>
|
|
<Content Update="Assets\WinGetLogo.svg">
|
|
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
|
</Content>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Styles\TeachingTip.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Dock\DockItemControl.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Controls\ScrollContainer.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Controls\CommandPalettePreview.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Controls\ScreenPreview.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Controls\ColorPalette.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Controls\FallbackRankerDialog.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Styles\Theme.Colorful.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
<Page Update="Styles\Theme.Normal.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Settings\AppearancePage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Page Update="Settings\InternalPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Update="Styles\Colors.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Update="Styles\Settings.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Update="Pages\Settings\ExtensionsPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Update="SettingsWindow.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Page Update="Pages\Settings\GeneralPage.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</Page>
|
|
</ItemGroup>
|
|
<!-- </AdaptiveCardsWorkaround> -->
|
|
|
|
<!-- Build information -->
|
|
<PropertyGroup Condition=" '$(PublishAot)' == 'true' ">
|
|
<DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_AOT</DefineConstants>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(PublishTrimmed)' == 'true' ">
|
|
<DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_TRIMMED</DefineConstants>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(CIBuild)' == 'true' ">
|
|
<DefineConstants>$(DefineConstants);BUILD_INFO_CIBUILD</DefineConstants>
|
|
</PropertyGroup>
|
|
|
|
</Project>
|