Respect the distribution manifest ordering when listing distributions #13561
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
OneBlue
requested review from
benhillis,
Copilot,
craigloewen-msft and
justus-camp-microsoft
There was a problem hiding this comment.
Pull Request Overview
Adds preservation of manifest-defined distribution ordering by switching to nlohmann::ordered_json / ordered_map and introducing tests to validate ordering.
- Replaces std::map with nlohmann::ordered_map and custom from_json to retain insertion order.
- Updates JSON parsing utilities to allow using ordered_json.
- Adds tests asserting distribution listing respects manifest order.
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| test/windows/UnitTests.cpp | Adds test cases to verify manifest ordering of distributions. |
| src/windows/common/Distribution.h | Changes ModernDistributions to ordered_map and implements custom from_json to preserve order. |
| src/windows/common/Distribution.cpp | Uses ordered_json in manifest parsing. |
| src/shared/inc/JsonUtils.h | Generalizes FromJson to accept a JSON type parameter. |
| CMakeLists.txt | Updates nlohmann/json dependency version. |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
benhillis
approved these changes
Oct 6, 2025
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.
Summary of the Pull Request
PR Checklist
Detailed Description of the Pull Request / Additional comments
Validation Steps Performed