Skip to content

maintenance(build): align shared dependency baselines#69

Merged
egil merged 1 commit into
mainfrom
copilot/maintenance-build-align-dependency-baselines
Jun 12, 2026
Merged

maintenance(build): align shared dependency baselines#69
egil merged 1 commit into
mainfrom
copilot/maintenance-build-align-dependency-baselines

Conversation

Copilot AI commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

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.ReproducibleBuilds 1.2.252.0.2
    • Nerdbank.GitVersioning 3.7.1153.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.v3 2.0.13.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.

Copilot AI changed the title [WIP] Align shared dependency baselines for build and test packages maintenance(build): align shared dependency baselines Jun 12, 2026
Copilot finished work on behalf of egil June 12, 2026 09:21
Copilot AI requested a review from egil June 12, 2026 09:21
@egil

egil commented Jun 12, 2026

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

@egil egil marked this pull request as ready for review June 12, 2026 09:34

Copilot AI commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

@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.

@egil

egil commented Jun 12, 2026

Copy link
Copy Markdown
Owner

@copilot fix merge conflicts

Copilot AI commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

@copilot fix merge conflicts

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 finished work on behalf of egil June 12, 2026 09:43
Copilot AI requested a review from egil June 12, 2026 09:43
@egil

egil commented Jun 12, 2026

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request. merge is still blocked

Copilot AI commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

@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.

Copilot finished work on behalf of egil June 12, 2026 09:51
@egil egil force-pushed the copilot/maintenance-build-align-dependency-baselines branch from 7a58b99 to f0a1075 Compare June 12, 2026 09:54
@egil egil force-pushed the copilot/maintenance-build-align-dependency-baselines branch from f0a1075 to bfc4f70 Compare June 12, 2026 10:34
@egil egil merged commit f218750 into main Jun 12, 2026
10 checks passed
@egil egil deleted the copilot/maintenance-build-align-dependency-baselines branch June 12, 2026 11:14
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.

2 participants