Skip to content

Windows test fix#2

Closed
brooke-hamilton wants to merge 10 commits intomainfrom
windows-test-fix
Closed

Windows test fix#2
brooke-hamilton wants to merge 10 commits intomainfrom
windows-test-fix

Conversation

@brooke-hamilton
Copy link
Copy Markdown
Owner

No description provided.

brooke-hamilton and others added 10 commits April 26, 2026 17:05
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
…ate-lockfile

Bring in the 0.86.1 fix that excludes `--additional-features`-only
features from the lockfile, and integrate it with the lockfile
graduation work on this branch.

Conflict resolution:
- src/spec-configuration/containerFeaturesConfiguration.ts:
  Drop the `initLockfile` argument from the `writeLockfile` call.
  The graduation work removed `forceInitLockfile` from
  `writeLockfile` and `initLockfile` from `readLockfile`'s return,
  so the incoming reference no longer compiles. The remaining
  `generateLockfile(featuresConfig, config, additionalFeatures)`
  call from main is preserved inside the `!params.noLockfile` guard.

Other reconciliations:
- package.json: keep 0.87.0 (graduation release) instead of 0.86.1
  so the version reflects the graduation feature set being shipped.
- CHANGELOG.md: move the 0.87.0 graduation entry under "May 2026"
  and nest the 0.86.1 bullet beneath it for historical accuracy.

Signed-off-by: Brooke Hamilton <Brooke.Hamilton+microsoft@microsoft.com>
Signed-off-by: Brooke Hamilton <Brooke.Hamilton+microsoft@microsoft.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant