Conversation
github-actions
bot
added
the
needs-area-label
davidfowl
removed
the
needs-area-label
Member
|
/backport to release/9.2 |
Contributor
|
Started backporting to release/9.2: https://github.com/dotnet/aspire/actions/runs/14314418109 |
danmoseley
approved these changes
Apr 7, 2025
Member
|
omg conflicts |
Member
|
@mitchdenny can you resolve here and in 9.2 pls. |
Closed
Member
Author
|
/backport to release/9.2 |
Contributor
|
Started backporting to release/9.2: https://github.com/dotnet/aspire/actions/runs/14320264831 |
Contributor
|
@mitchdenny backporting to "release/9.2" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix --watch hangs.
Applying: Don't prebuild in watch mode.
Applying: Fix up merge.
error: sha1 information is lacking or useless (src/Aspire.Cli/Commands/RunCommand.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0003 Fix up merge.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
mitchdenny
added a commit
that referenced
this pull request
Apr 7, 2025
* Fix --watch hangs. * Don't prebuild in watch mode. * Fix up merge.
danmoseley
pushed a commit
that referenced
this pull request
Apr 8, 2025
* Add RPC protocol compat check. (#8577) * Add RPC protocol compat check. * Fix merge conflict. * Fix spelling. * Update DotNetCliRunner.cs Co-authored-by: David Fowler <davidfowl@gmail.com> * Improve error message with version info. --------- Co-authored-by: David Fowler <davidfowl@gmail.com> * Fix --watch hangs. (#8585) * Fix --watch hangs. * Don't prebuild in watch mode. * Fix up merge. * Add watch/no-build conflict fix. * Fix spelling. * Spelling. --------- Co-authored-by: David Fowler <davidfowl@gmail.com>
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This PR fixes hangs when using
aspire run --watch. There was a bug introduced when I split out the build leg from starting the app host. Basically I started attempting to launch the apphost in --no-build mode which is fine -except when you are in watch mode.RunAsyncchecks for this and throws an exception, unfortunately awaiting the result ofRunAsyncdoesn't occur until after the backchannel has returned.So the fix involves a few things:
--watchwe don't try launch the app host in--no-buildmode.RunAsyncwhere it checks and throws to also callSetExceptionon the backchannel completion source.