Merged
Conversation
Contributor
There was a problem hiding this comment.
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
src/Aspire.Cli/Backchannel/AppHostBackchannel.cs:109
- The variable name 'capabilties' is misspelled. Rename it to 'capabilities' for clarity and consistency.
var capabilties = await rpc.InvokeWithCancellationAsync<string[]>("GetCapabilitiesAsync",
mitchdenny
force-pushed
the
mitchdenny/apphost-compat-and-capabilities
branch
from
d45b05e to
565af31
Compare
davidfowl
reviewed
Apr 7, 2025
davidfowl
reviewed
Apr 7, 2025
davidfowl
reviewed
Apr 7, 2025
Co-authored-by: David Fowler <davidfowl@gmail.com>
davidfowl
approved these changes
Apr 7, 2025
davidfowl
approved these changes
Apr 7, 2025
danmoseley
approved these changes
Apr 7, 2025
Member
|
/backport to release/9.2 |
Contributor
|
Started backporting to release/9.2: https://github.com/dotnet/aspire/actions/runs/14314447857 |
Contributor
|
@danmoseley 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: Add RPC protocol compat check.
.git/rebase-apply/patch:173: trailing whitespace.
.git/rebase-apply/patch:258: trailing whitespace.
.git/rebase-apply/patch:344: trailing whitespace.
.git/rebase-apply/patch:539: trailing whitespace.
.git/rebase-apply/patch:569: trailing whitespace.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Aspire.Cli/Commands/PublishCommand.cs
M src/Aspire.Cli/Commands/RunCommand.cs
M src/Aspire.Hosting/Backchannel/AppHostRpcTarget.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Hosting/Backchannel/AppHostRpcTarget.cs
Auto-merging src/Aspire.Cli/Commands/RunCommand.cs
CONFLICT (content): Merge conflict in src/Aspire.Cli/Commands/RunCommand.cs
Auto-merging src/Aspire.Cli/Commands/PublishCommand.cs
CONFLICT (content): Merge conflict in src/Aspire.Cli/Commands/PublishCommand.cs
error: Failed to merge in the changes.
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 0001 Add RPC protocol compat check.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
|
/backport to release/9.2 |
Contributor
|
Started backporting to release/9.2: https://github.com/dotnet/aspire/actions/runs/14314458956 |
Contributor
|
@danmoseley 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: Add RPC protocol compat check.
.git/rebase-apply/patch:173: trailing whitespace.
.git/rebase-apply/patch:258: trailing whitespace.
.git/rebase-apply/patch:344: trailing whitespace.
.git/rebase-apply/patch:539: trailing whitespace.
.git/rebase-apply/patch:569: trailing whitespace.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Aspire.Cli/Commands/PublishCommand.cs
M src/Aspire.Cli/Commands/RunCommand.cs
M src/Aspire.Hosting/Backchannel/AppHostRpcTarget.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Hosting/Backchannel/AppHostRpcTarget.cs
Auto-merging src/Aspire.Cli/Commands/RunCommand.cs
CONFLICT (content): Merge conflict in src/Aspire.Cli/Commands/RunCommand.cs
Auto-merging src/Aspire.Cli/Commands/PublishCommand.cs
CONFLICT (content): Merge conflict in src/Aspire.Cli/Commands/PublishCommand.cs
error: Failed to merge in the changes.
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 0001 Add RPC protocol compat check.
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
* 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>
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.
Fixes: #8573
This PR adds an RPC protocol compat check. When connecting the back channel it asks the apphost to specify which capabilities that it has. At the moment the only capability is
baseline.v0which it validates on connection.In the future as the CLI starts to support more scenarios it will be able to ask the apphost if it supports a particular feature and either fail or fallback gracefully.