Add Win11 24H2/25H2 support + guard against silent wrong-version media - #460
Open
javifly wants to merge 30 commits into
Open
Add Win11 24H2/25H2 support + guard against silent wrong-version media#460javifly wants to merge 30 commits into
javifly wants to merge 30 commits into
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Adds Windows 11 24H2 (26100) and 25H2 (26200) choices, plus a catalog sanity check
that prevents a class of silent failures where the wrong Windows version gets built.
The bug this prevents
MCT builds whatever the catalog lists, ignoring the script's
VER. Reusing the 24H2 catalogfor 25H2 (same servicing branch) therefore produces 24H2 media silently - the 24H2 cab
only lists 26100 builds. Two alternative sources also fail, documented so others don't repeat
the trip:
products.xml(id=108396) usesSha256; MCT selfhost expectsSha1->0x80070490 - 0x200182156292serves a cab frozen 2025-06-16 (26100-only), inconsistent acrossCDN nodes
Changes
:choice-1824H2 (26100.4349),:choice-1925H2 (26200.6584)VER;abort with a clear error instead of building the wrong version. This is the part worth
landing regardless of anything else - it makes catalog drift loud instead of silent.
Testing
Auto ISO verified end to end on an unsupported Intel i7-7700K (Kaby Lake), es-ES: resulting
media confirmed 10.0.26200.6584 via
dism /Get-WimInfo.Note on the 25H2 catalog
25H2 has no working Microsoft catalog source (see above). In my fork I ship a small pinned,
hash-verified catalog cab in
utils\to solve this. I've kept that out of this PR's core torespect the "Microsoft-hosted links only" design - happy to discuss how you'd prefer to
source the 25H2 catalog, or you can take just the sanity check + 24H2 for now.