Repository navigation
Commit d6b50f5
[release/13.6] Fix Windows AppHost cleanup job routing (#20514)
## Description
Backport of #20494 to `release/13.6` (cherry-picked patch from
`e62dceba954899a33326297b4669e226c27dcdce`). On Windows, .NET AppHosts
launched through `dotnet run` or `dotnet watch` do not enter the Aspire
CLI's outer kill-on-close job, allowing DCP to finish removing
session-scoped resources during shutdown. Direct .NET launches and
TypeScript/polyglot AppHost servers retain their job protection.
Includes the associated CLI tests and extension E2E test stabilization.
No new dependencies.
Related: #20495 (already closed by #20494).
## Checklist
- Is this feature complete?
- [ ] Yes. Ready to ship.
- [ ] No. Follow-up changes expected.
- Are you including unit tests for the changes and scenario tests if
relevant?
- [ ] Yes
- [ ] No
- Did you add public API?
- [ ] Yes
- If yes, did you have an API Review for it?
- [ ] Yes
- [ ] No
- Did you add `<remarks />` and `<code />` elements on your triple slash
comments?
- [ ] Yes
- [ ] No
- [ ] No
- Does the change make any security assumptions or guarantees?
- [ ] Yes
- If yes, have you done a threat model and had a security review?
- [ ] Yes
- [ ] No
- [ ] No
## Customer Impact
On Windows, stopping a CLI-launched .NET AppHost can leave
session-scoped containers running instead of removing them; persistent
resources should remain running.
## Testing
Main PR: manual C# normal/forced shutdown and TypeScript cleanup,
focused CLI tests (181 passed, 3 platform-skipped), and passing Windows
edge-cases CI. Release branch: targeted CLI tests (172 passed, 3 Windows
platform-skipped), CLI/extension build, extension test and E2E
type-check, and changed-file lint. Full VS Code E2E UI run was not
performed on the release branch.
## Risk
Medium. Changes Windows process ownership for `dotnet run`/`dotnet
watch`; direct .NET and TypeScript/polyglot paths retain their
kill-on-close protection, and CLI-parent detection remains enabled.
## Regression?
Unknown. Reproduced on a 13.6 preview build; the exact introducing
version/change is not established.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>1 parent 95ff2d5 commit d6b50f5
5 files changed
Lines changed: 36 additions & 5 deletions
File tree
- extension/src/test-e2e
- src/Aspire.Cli
- Processes
- Projects
- tests/Aspire.Cli.Tests/Projects
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
220 | | - | |
221 | | - | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
222 | 224 | | |
223 | 225 | | |
224 | 226 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
32 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
33 | 36 | | |
34 | 37 | | |
35 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1552 | 1552 | | |
1553 | 1553 | | |
1554 | 1554 | | |
1555 | | - | |
| 1555 | + | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
1556 | 1559 | | |
1557 | 1560 | | |
1558 | 1561 | | |
| |||
1616 | 1619 | | |
1617 | 1620 | | |
1618 | 1621 | | |
| 1622 | + | |
1619 | 1623 | | |
1620 | 1624 | | |
1621 | 1625 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
52 | 67 | | |
53 | 68 | | |
54 | 69 | | |
| |||
586 | 601 | | |
587 | 602 | | |
588 | 603 | | |
| 604 | + | |
| 605 | + | |
589 | 606 | | |
590 | 607 | | |
591 | 608 | | |
| |||
608 | 625 | | |
609 | 626 | | |
610 | 627 | | |
| 628 | + | |
611 | 629 | | |
612 | 630 | | |
613 | 631 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
336 | 336 | | |
337 | 337 | | |
338 | 338 | | |
| 339 | + | |
| 340 | + | |
339 | 341 | | |
340 | 342 | | |
341 | 343 | | |
| |||
1063 | 1065 | | |
1064 | 1066 | | |
1065 | 1067 | | |
| 1068 | + | |
| 1069 | + | |
1066 | 1070 | | |
1067 | 1071 | | |
1068 | 1072 | | |
| |||
0 commit comments