Re-baseline course deltas after web vuln fix - #41
Merged
Conversation
… + web vuln fix) Re-derived tooling-free base after the services/web transitive npm vuln fix (sharp/svgo/@babel/core). acc-base file-set updated to current main app state. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Re-derives the tooling-free base onto current main (post-#40), which now carries the services/web transitive npm vuln fix (sharp/svgo/@babel/core) plus the devcontainer (#37) and exercises.md (#38) updates. manifest.base.sha 510b4ff -> ab05db6; every expectedTreeSha recomputed. - module-01: drops the 'Update postCreateCommand' patch — that fix now lives in the base (merged via #37), so the delta would be a no-op/conflict. Keeps the ARCHITECTURE.md + README docs patch (renumbered 0001). - modules 02-06: patch content unchanged; only their cumulative expectedTreeSha shift because the base app tree changed. build-branches --check green (M1-M6 match), selftest green. Net diff is course-build/** only. Promotion still required (gated, owner-approved). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
…hability Records base commit ab05db6 (manifest.base.sha) as an ancestor so validate-branches (fetch-depth:0) has the base object for git am. -s ours: branch tree unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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
1 participant
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.
What & why
Re-baselines the ACC learner-branch delta store onto current
mainafter theservices/webtransitive npm vuln fix (#40). The base commit must carry the fixed web deps (and the intervening #37 devcontainer + #38 exercises changes), somanifest.base.shaadvances and everyexpectedTreeShais recomputed.Net diff is
course-build/**only. No app/service files change onmain(the learner-branch app state is produced by applying deltas onto the re-derived base).Changes
manifest.base.sha510b4ff→ab05db6— the re-derived tooling-free base = current main app state (.NET 10 + Boot 3.5.16/Java 17 + the sharp/svgo/@babel/core fix), minuscourse-build/+ workflows.expectedTreeSharecomputed (they shift because the base app tree changed).0001). Title/patches list updated.expectedTreeShashift.ab05db6is grafted into this branch's history via an-s oursmerge so CI (fetch-depth: 0) resolves it; the branch tree is unchanged.Gate (evidence)
build-branches.mjs --checkgreen — M1–M6 all match manifestexpectedTreeSha, ancestry linear.selftest.mjsgreen.Note
Promotion (moving learner aliases / the
acc-basetag) remains a separate gated step; not performed here. Propagation to the publishedgithub-samples/contoso-inventoryis a follow-up.