dotnet / aspire

Tools, templates, and packages to accelerate building observable, production-ready apps
https://learn.microsoft.com/dotnet/aspire
MIT License
3.93k stars 480 forks source link

Fix source column displaying executable args #6619

Closed JamesNK closed 2 weeks ago

JamesNK commented 2 weeks ago

Description

Fixes https://github.com/dotnet/aspire/issues/6585

After:

image

Checklist

JamesNK commented 2 weeks ago

/backport to release/9.0

github-actions[bot] commented 2 weeks ago

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11713945866

github-actions[bot] commented 2 weeks ago

@JamesNK backporting to release/9.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix source column displaying executable args
Using index info to reconstruct a base tree...
M   src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
CONFLICT (content): Merge conflict in src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
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 advice.mergeConflict false"
Patch failed at 0001 Fix source column displaying executable args
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 2 weeks ago

@JamesNK an error occurred while backporting to release/9.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.