Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Null is not true, but null is not false #2030

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Conversation

davidfowl
Copy link
Member

@davidfowl davidfowl commented Feb 1, 2024

Simplest fix for this so we can backport to preview 3. A better fix is to avoid making this nullable and just have true and false 😄

Microsoft Reviewers: Open in CodeFlow

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-app-model Issues pertaining to the APIs in Aspire.Hosting, e.g. DistributedApplication label Feb 1, 2024
@davidfowl
Copy link
Member Author

/backport to release/8.0-preview3

Copy link
Contributor

github-actions bot commented Feb 1, 2024

Started backporting to release/8.0-preview3: https://github.com/dotnet/aspire/actions/runs/7736840583

Copy link
Contributor

github-actions bot commented Feb 1, 2024

@davidfowl backporting to release/8.0-preview3 failed, the patch most likely resulted in conflicts:

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

Applying: Null is not true, but null is not false
Using index info to reconstruct a base tree...
M	src/Aspire.Hosting/Dcp/ApplicationExecutor.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Hosting/Dcp/ApplicationExecutor.cs
CONFLICT (content): Merge conflict in src/Aspire.Hosting/Dcp/ApplicationExecutor.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 Null is not true, but null is not false
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 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Feb 1, 2024

@davidfowl an error occurred while backporting to release/8.0-preview3, please check the run log for details!

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

Copy link
Member

@joperezr joperezr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed for preview 3 branch, but for main does it make sense to also add tests for this?

@davidfowl
Copy link
Member Author

I was just discussing this with @JamesNK. To enable testing this component it needs a lot more refactoring. Yes, though we need to do it.

@davidfowl davidfowl merged commit 67bce2c into main Feb 1, 2024
8 checks passed
@davidfowl davidfowl deleted the davidfowl/fix-dotnet-watch branch February 1, 2024 06:44
@mitchdenny
Copy link
Member

I think we probably need to start to break ApplicationExecutor up ... its become a bit of a dumping ground. In doing so we can make this whole space more testable.

radical pushed a commit to radical/aspire that referenced this pull request Feb 2, 2024
radical pushed a commit to radical/aspire that referenced this pull request Feb 6, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Apr 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-app-model Issues pertaining to the APIs in Aspire.Hosting, e.g. DistributedApplication
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants