mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 03:07:56 +01:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This pull request primarily updates project dependencies to newer versions, especially for the Windows App SDK and related packages, and improves the build pipeline's logic for selecting MSIX packages. These changes ensure compatibility with the latest SDK features and provide more robust package selection during builds. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [x] **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 Dependency and SDK upgrades: * Upgraded `Microsoft.WindowsAppSDK` and related packages (Base, Foundation, WinUI, Runtime, DWrite, InteractiveExperiences, Widgets, AI) to version 1.8.x in all relevant project files, including `Directory.Packages.props`, `.vcxproj`, `.csproj`, and `packages.config` files. This also involved updating import paths and error checks for the new package structure. [[1]](diffhunk://#diff-5baf5f9e448ad54ab25a091adee0da05d4d228481c9200518fcb1b53a65d4156L60-R61) [[2]](diffhunk://#diff-76320b3a74a9241df46edb536ba0f817d7150ddf76bb0fe677e2b276f8bae95aL3-R9) [[3]](diffhunk://#diff-76320b3a74a9241df46edb536ba0f817d7150ddf76bb0fe677e2b276f8bae95aL144-R156) [[4]](diffhunk://#diff-76320b3a74a9241df46edb536ba0f817d7150ddf76bb0fe677e2b276f8bae95aL156-R181) [[5]](diffhunk://#diff-d3a7d80ebbca915b42727633451e769ed2306b418ef3d82b3b04fd5f79560f17L7-R16) [[6]](diffhunk://#diff-1a988d33c4d4db67a9c3316796dce4c068ccfbc40472b8c91a52e4b3208d98c3L12-R12) [[7]](diffhunk://#diff-c287aa619c009edee184eefb9ecdb4e36dde33ae322725536c31f4a0566b382fL6-R14) [[8]](diffhunk://#diff-c287aa619c009edee184eefb9ecdb4e36dde33ae322725536c31f4a0566b382fR209-R214) * Updated `Microsoft.Web.WebView2` to version 1.0.3179.45 and `Microsoft.Windows.SDK.BuildTools` to 10.0.26100.4948 in `Directory.Packages.props`. [[1]](diffhunk://#diff-5baf5f9e448ad54ab25a091adee0da05d4d228481c9200518fcb1b53a65d4156L48-R48) [[2]](diffhunk://#diff-5baf5f9e448ad54ab25a091adee0da05d4d228481c9200518fcb1b53a65d4156L60-R61) Build and packaging improvements: * Enhanced the MSIX package selection logic in the build pipeline (`job-build-project.yml`) to prioritize platform-specific packages (x64/arm64) and provide clearer logging and error handling when no packages are found. * Modified `Microsoft.CmdPal.UI.csproj` to disable Appx bundling and set a specific test directory for Appx packages during CI builds, improving build output organization. These updates help ensure the project stays current with the latest SDKs and improves reliability and transparency in the build process. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Co-authored-by: Leilei Zhang <leilzh@microsoft.com>
126 lines
9.7 KiB
XML
126 lines
9.7 KiB
XML
<Project>
|
|
<PropertyGroup>
|
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
|
|
<PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
|
|
<PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
|
|
<PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
|
|
<PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
|
|
<PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
|
|
<PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
|
|
<PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
|
|
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
|
|
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
|
|
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250703-build.2173" />
|
|
<PackageVersion Include="ControlzEx" Version="6.0.0" />
|
|
<PackageVersion Include="HelixToolkit" Version="2.24.0" />
|
|
<PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
|
|
<PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
|
|
<PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
|
|
<PackageVersion Include="LazyCache" Version="2.4.0" />
|
|
<PackageVersion Include="Mages" Version="3.0.0" />
|
|
<PackageVersion Include="Markdig.Signed" Version="0.34.0" />
|
|
<!-- 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.8" />
|
|
<!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
|
|
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
|
|
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
|
|
<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.3179.45" />
|
|
<!-- 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.8" />
|
|
<PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
|
|
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
|
|
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
|
|
<!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
|
|
<!--
|
|
TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.
|
|
This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
|
|
-->
|
|
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
|
|
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
|
|
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
|
|
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
|
|
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
|
|
<PackageVersion Include="ModernWpfUI" Version="0.9.4" />
|
|
<!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
|
|
<PackageVersion Include="Moq" Version="4.18.4" />
|
|
<PackageVersion Include="MSTest" Version="3.8.3" />
|
|
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
|
|
<PackageVersion Include="NLog" Version="5.2.8" />
|
|
<PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
|
|
<PackageVersion Include="NLog.Schema" Version="5.2.8" />
|
|
<PackageVersion Include="OpenAI" Version="2.0.0" />
|
|
<PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
|
|
<PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
|
|
<PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
|
|
<PackageVersion Include="SharpCompress" Version="0.37.2" />
|
|
<!-- Don't update SkiaSharp.Views.WinUI to version 3.* branch as this brakes the HexBox control in Registry Preview. -->
|
|
<PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.9" />
|
|
<PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
|
|
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
|
|
<!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
|
|
<PackageVersion Include="System.CodeDom" Version="9.0.8" />
|
|
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
|
<PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
|
|
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
|
|
<PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
|
|
<!-- 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" />
|
|
<!-- 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.8" />
|
|
<!-- 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.8" />
|
|
<PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
|
|
<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.8" />
|
|
<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.8" />
|
|
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
|
|
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
|
|
<PackageVersion Include="System.Text.Json" Version="9.0.8" />
|
|
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
|
|
<PackageVersion Include="UnicodeInformation" Version="2.6.0" />
|
|
<PackageVersion Include="UnitsNet" Version="5.56.0" />
|
|
<PackageVersion Include="UTF.Unknown" Version="2.6.0" />
|
|
<PackageVersion Include="WinUIEx" Version="2.2.0" />
|
|
<PackageVersion Include="WPF-UI" Version="3.0.5" />
|
|
<PackageVersion Include="WyHash" Version="1.0.5" />
|
|
<PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.Firewall.wixext" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.Util.wixext" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.UI.wixext" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.NetFx.wixext" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.Bal.wixext" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.BootstrapperApplicationApi" Version="5.0.2" />
|
|
<PackageVersion Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" Version="5.0.2" />
|
|
</ItemGroup>
|
|
<ItemGroup Condition="'$(IsExperimentationLive)'!=''">
|
|
<!-- Additional dependencies used by experimentation -->
|
|
<PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
|
|
<PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
|
|
</ItemGroup>
|
|
</Project>
|