From 8a7503e7dc35a5c8114f98711220c35efb6b5498 Mon Sep 17 00:00:00 2001 From: Shawn Yuan <128874481+shuaiyuanxx@users.noreply.github.com> Date: Thu, 8 Jan 2026 18:45:46 +0800 Subject: [PATCH] fix sign issue (#44609) ## Summary of the Pull Request This pull request introduces updates to the build pipeline and resource configuration, primarily to support new modules and improve versioning information for the File Locksmith CLI. **Pipeline configuration updates:** * Added new WinUI3 application binaries (`PowerToys.QuickAccess.dll`, `PowerToys.QuickAccess.exe`, and `PowerToys.Settings.UI.Controls.dll`) to the ESRP signing pipeline, ensuring these modules are properly signed during the build process. **Resource and versioning improvements:** * Updated the resource file for `FileLocksmithCLI` to include version information and metadata (such as company name, file description, and product version) by referencing the shared version header. This improves traceability and consistency of version details in the executable. ## 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 ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed --- .pipelines/ESRPSigning_core.json | 4 ++ .../FileLocksmithCLI/FileLocksmithCLI.rc | 43 +++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 72840bebbd..c1cd63aef0 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -125,6 +125,10 @@ "WinUI3Apps\\Powertoys.Peek.UI.exe", "WinUI3Apps\\Powertoys.Peek.dll", + "WinUI3Apps\\PowerToys.QuickAccess.dll", + "WinUI3Apps\\PowerToys.QuickAccess.exe", + "WinUI3Apps\\PowerToys.Settings.UI.Controls.dll", + "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll", "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll", "WinUI3Apps\\PowerToys.EnvironmentVariables.dll", diff --git a/src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.rc b/src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.rc index 641c19fb49..81fa8346fc 100644 --- a/src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.rc +++ b/src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.rc @@ -1,5 +1,48 @@ #include "resource.h" #include +#include "../../../common/version/version.h" + +#define APSTUDIO_READONLY_SYMBOLS +#include "winres.h" +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION FILE_VERSION + PRODUCTVERSION PRODUCT_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", "File Locksmith CLI" + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", "FileLocksmithCLI.exe" + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", "FileLocksmithCLI.exe" + VALUE "ProductName", PRODUCT_NAME + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END STRINGTABLE BEGIN