Cherry-pick servicing changes for v1.11#5571
Merged
florelis merged 3 commits intomicrosoft:release-v1.11from Jul 7, 2025
Merged
Cherry-pick servicing changes for v1.11#5571florelis merged 3 commits intomicrosoft:release-v1.11from
florelis merged 3 commits intomicrosoft:release-v1.11from
Conversation
The last couple of builds have failed due to a missing SDK version 10.0.22621.0, presumably due to the agent images being updated to remove this. The only project where we use this version is CommonCore, everywhere else we use 26100 already. This PR updates CommonCore to use the same SDK version as all the other projects. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5570)
`Repair-WinGetPackageManager` is failing to install winget in some Win10 systems. The issue seems come from microsoft#5517 and be caused because in some cases we fail to mark any one architecture as the right one to use for dependencies. This PR is a partial revert of microsoft#5517 to add the previous logic as a fallback. May fix microsoft#5559 (but I haven't set up an environment to test it...) ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5568)
We are seeing a crash coming from cpprestsdk, which happened after moving to use vcpkg dependencies and updating to v2.10.19. This reverts to the version we knew to be good, but it may be that the actual issue is not from cpprestsdk but from one of the patches from vcpkg. We consume cpprestsdk from a local port overlay that we use to be able to patch it with support for certificate pinning, so the main change is to the script that creates the port overlay. The script makes a copy of the port from the official registry; and this PR updates it so that it can fetch a version from an older commit and not just the latest. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5567)
Contributor
|
The target branch should be release 1.11 branch |
yao-msft
approved these changes
Jul 7, 2025
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
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.
This is a cherry-pick of #5570, #5568 and #5567 to the v1.11 branch.
Microsoft Reviewers: Open in CodeFlow