Exclude the dashboard from the manifest #3601
Merged
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
the
area-app-model
mitchdenny
approved these changes
Apr 11, 2024
davidfowl
force-pushed
the
davidfowl/exclude-dashboard-from-manifest
branch
from
f25f4d0 to
b5dbc98
Compare
davidfowl
changed the title
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8643722508 |
|
@davidfowl backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Exclude the dashboard from the manifest when its a project - Added a test
Using index info to reconstruct a base tree...
M src/Aspire.Hosting/DistributedApplicationBuilder.cs
M tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs
Falling back to patching base and 3-way merge...
Auto-merging tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs
CONFLICT (content): Merge conflict in tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs
Auto-merging src/Aspire.Hosting/DistributedApplicationBuilder.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Exclude the dashboard from the manifest when its a project - Added a test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@davidfowl an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8647982682 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 is a regression from the refactoring. We used to always exclude the dashboard resource which made it work for the playground samples. After the change, we don't look at the dashboard if we're not in run mode, this stops our playground samples from being deployed because we explicitly add the dashboard as a project resource.
This change excludes the dashboard if it is a project resource.