Skip to content

fix: final AspireManager conflict hunk alignment for #427 (v7)#434

Merged
mpaulosky merged 2 commits into
devfrom
squad/427-dev-conflict-fix-v7
Jul 4, 2026
Merged

fix: final AspireManager conflict hunk alignment for #427 (v7)#434
mpaulosky merged 2 commits into
devfrom
squad/427-dev-conflict-fix-v7

Conversation

@mpaulosky

Copy link
Copy Markdown
Owner

Final one-line conflict-hunk alignment in AspireManager to unblock #427.

  • updates tests/AppHost.Tests/Infrastructure/AspireManager.cs only
  • full local pre-push gates passed

Refs #427

Copilot AI review requested due to automatic review settings July 4, 2026 15:43
@mpaulosky
mpaulosky enabled auto-merge (squash) July 4, 2026 15:43
@github-actions

github-actions Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

🏗️ PR Added to Squad Triage Queue

This PR has been labeled with squad and added to the triage queue.

Next steps:

  • The squad Lead will review and assign to an appropriate team member
  • A squad:member label will be added after triage

If you know which squad member should handle this, you can add the appropriate squad:member label yourself.

@github-actions github-actions Bot added the squad Squad triage inbox — Lead will assign to a member label Jul 4, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

Comment on lines +83 to +87
@@ -84,7 +84,7 @@ await retryPolicy.ExecuteAsync(async _ =>
configureBuilder: static (options, _) =>
{
options.DisableDashboard = true;
},
},
@github-actions

github-actions Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

Test Results Summary

556 tests  ±0   518 ✅ ±0   16s ⏱️ +2s
  6 suites ±0    38 💤 ±0 
  6 files   ±0     0 ❌ ±0 

Results for commit d6a598a. ± Comparison against base commit cd1da91.

@codecov

codecov Bot commented Jul 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.73%. Comparing base (cd1da91) to head (e49b1ed).
⚠️ Report is 1 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #434   +/-   ##
=======================================
  Coverage   76.73%   76.73%           
=======================================
  Files          71       71           
  Lines        1775     1775           
  Branches      214      214           
=======================================
  Hits         1362     1362           
  Misses        336      336           
  Partials       77       77           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mpaulosky
mpaulosky merged commit d17f591 into dev Jul 4, 2026
9 of 10 checks passed
@mpaulosky
mpaulosky deleted the squad/427-dev-conflict-fix-v7 branch July 4, 2026 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squad Squad triage inbox — Lead will assign to a member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants