You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The maintenance inventory flagged version drift in shared build/test baseline packages across package Directory.Packages.props files. The drift originated entirely from Egil.StronglyTypedPrimitives, which lagged behind the versions used by the other packages.
Changes
Egil.StronglyTypedPrimitives/Directory.Packages.props — bumped shared baseline packages to match the rest of the repo:
DotNet.ReproducibleBuilds1.2.25 → 2.0.2
Nerdbank.GitVersioning3.7.115 → 3.9.50
Each shared baseline package now resolves to a single version repo-wide, so no exception entry in docs/maintenance/baseline.json is required.
Merge Resolution
After merging origin/main, the only conflict was in Egil.StronglyTypedPrimitives/Directory.Packages.props. main had since adopted the mtp-native test harness for this package — replacing xunit.v3/xunit.runner.visualstudio with xunit.v3.mtp-v2 and adding Microsoft.Testing.Extensions.CodeCoverage. The conflict was resolved by keeping main's mtp-native harness structure while retaining the DotNet.ReproducibleBuilds and Nerdbank.GitVersioning baseline alignments. As a result the originally planned xunit.v32.0.1 → 3.2.2 bump is moot: stp no longer references xunit.v3, and the shared xunit.v3.mtp-v2 package now resolves to 3.2.2 across all packages.
Notes
The issue body also listed Egil.Orleans.EventSourcing and Egil.Orleans.Storage, which no longer exist in the repo (stale inventory snapshot). Only the three current package baselines were in scope.
CopilotAI
changed the title
[WIP] Align shared dependency baselines for build and test packages
maintenance(build): align shared dependency baselines
Jun 12, 2026
@copilot resolve the merge conflicts in this pull request
Resolved the merge conflict in Egil.StronglyTypedPrimitives/Directory.Packages.props in 06dd269. main had adopted the mtp-native test harness (xunit.v3.mtp-v2, dropping xunit.v3/xunit.runner.visualstudio), so I kept that structure and retained the baseline alignment (DotNet.ReproducibleBuilds 2.0.2, Nerdbank.GitVersioning 3.9.50). All three shared baselines now match across packages; Release build is warning-free and 170 tests pass.
Done in 18fba57. main had advanced past my earlier merge with two CI commits (65a6c30, 2aa77e5), which is why the PR still showed conflicts. Merging the latest main was clean (no content conflicts) — it only brought in CI SDK-band workflow updates. The baseline alignments are intact (DotNet.ReproducibleBuilds 2.0.2, Nerdbank.GitVersioning 3.9.50, xunit.v3.mtp-v2 3.2.2); Release build is warning-free and 170 tests pass.
@copilot resolve the merge conflicts in this pull request. merge is still blocked
Merged the latest origin/main (it had advanced again with maintenance/CI commits up through df49714). The merge was clean with no content conflicts. The PR's mergeable_state is now unstable rather than dirty/conflicting — i.e. there's no merge conflict anymore; the diff against main is just the intended +2/-2 in Egil.StronglyTypedPrimitives/Directory.Packages.props (DotNet.ReproducibleBuilds 2.0.2, Nerdbank.GitVersioning 3.9.50). If merge is still reported blocked, it's now a pending/failing CI check rather than a conflict. Release build is warning-free.
egil
deleted the
copilot/maintenance-build-align-dependency-baselines
branch
June 12, 2026 11:14
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
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.
The maintenance inventory flagged version drift in shared build/test baseline packages across package
Directory.Packages.propsfiles. The drift originated entirely fromEgil.StronglyTypedPrimitives, which lagged behind the versions used by the other packages.Changes
Egil.StronglyTypedPrimitives/Directory.Packages.props— bumped shared baseline packages to match the rest of the repo:DotNet.ReproducibleBuilds1.2.25→2.0.2Nerdbank.GitVersioning3.7.115→3.9.50Each shared baseline package now resolves to a single version repo-wide, so no exception entry in
docs/maintenance/baseline.jsonis required.Merge Resolution
After merging
origin/main, the only conflict was inEgil.StronglyTypedPrimitives/Directory.Packages.props.mainhad since adopted the mtp-native test harness for this package — replacingxunit.v3/xunit.runner.visualstudiowithxunit.v3.mtp-v2and addingMicrosoft.Testing.Extensions.CodeCoverage. The conflict was resolved by keeping main's mtp-native harness structure while retaining theDotNet.ReproducibleBuildsandNerdbank.GitVersioningbaseline alignments. As a result the originally plannedxunit.v32.0.1→3.2.2bump is moot:stpno longer referencesxunit.v3, and the sharedxunit.v3.mtp-v2package now resolves to3.2.2across all packages.Notes
Egil.Orleans.EventSourcingandEgil.Orleans.Storage, which no longer exist in the repo (stale inventory snapshot). Only the three current package baselines were in scope.