[Sprint 13] Reconcile main into dev before release

[mpaulosky]

Goal

Resolve the current main → dev branch divergence so the next dev → main release PR can be opened and merged cleanly.

Problem

main contains release/backport commits that are not present in dev, and a direct release PR from dev to main will hit merge conflicts in test projects and related files. We need to merge main back into dev, resolve conflicts with the intended dev xUnit v3 state preserved, and verify the branch remains green.

Acceptance Criteria

• main is merged back into dev on a reviewable branch
• Merge conflicts are resolved correctly, preserving the intended dev state
• Relevant build/test validation passes after reconciliation
• dev is ready for a clean release PR to main

Sprint

Sprint 13 — xUnit v3 Cleanup & Docs

Routing

Route to Aragorn for release-gate ownership and branch reconciliation.

[github-actions]

📋 Assigned to Aragorn (Lead / Architect)

Issue: #211 — [Sprint 13] Reconcile main into dev before release

Aragorn will pick this up in the next Copilot session.

For Copilot coding agent: If enabled, this issue will be worked automatically.
Otherwise, start a Copilot session and say:
Aragorn, work on issue #211