Ensure all vcpkgs use our custom triplets #5423
Merged
+20
−37
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JohnMcPMS
approved these changes
May 2, 2025
florelis
added a commit
that referenced
this pull request
May 3, 2025
In #5423 I used a wrong variable for the arm64-release-static vcpkg triplet. Didn't notice it until running on internal builds because we don't build that configuration in CI builds here... ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5431)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After the change to have our dependencies use vcpkgs instead of checking in a clone of the code, we got BinSkim alerts due to some of them not using our custom triplets with the compilation flags that we need. This PR ensures that all projects include the
vcpkg.propsthat makes CMake use our custom triplets instead of the default{arch}-windowsones.It is unclear to me why this happened. For example, why the test installer exe was building the vcpkgs at all, but the logs show that as one of the root projects for the issue.
Besides importing
vcpkg.propsin more projects, this also does a little refactor of the triplets to reduce duplication and have the required flags in a single placeMicrosoft Reviewers: Open in CodeFlow