Skip to content

Update BindableObject API docs - #17099

Merged
rmarinho merged 2 commits into
mainfrom
bindableobject-api-docs
Aug 31, 2023
Merged

rmarinho merged 2 commits into
mainfrom
bindableobject-api-docs

Conversation

@jfversluis

Copy link
Copy Markdown
Member

Description of Change

Moves the external comments to inline, adds missing comments and minor improvements.

Issues Fixed

Related to #3960

@jfversluis jfversluis added area-docs Conceptual docs, API docs, Samples t/housekeeping ♻︎ labels Aug 30, 2023
@jfversluis
jfversluis requested a review from a team as a code owner August 30, 2023 10:09
@samhouts samhouts added this to the .NET 8 GA milestone Aug 30, 2023

@jknaudt21 jknaudt21 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Small suggestions! Looks great overall

Comment thread src/Controls/src/Core/BindableObject.cs Resolved
Comment thread src/Controls/src/Core/BindableObject.cs Resolved
Comment thread src/Controls/src/Core/BindableObject.cs Resolved
Comment thread src/Controls/src/Core/BindableObject.cs Resolved
@rmarinho
rmarinho merged commit 972b15e into main Aug 31, 2023
@rmarinho
rmarinho deleted the bindableobject-api-docs branch August 31, 2023 11:37
@rmarinho
rmarinho restored the bindableobject-api-docs branch August 31, 2023 11:37
@rmarinho

Copy link
Copy Markdown
Member

Sorry pushed the button too early.. @jfversluis can you address the comments on a new PR please? thanks

@jfversluis
jfversluis deleted the bindableobject-api-docs branch August 31, 2023 12:57
@jfversluis jfversluis added the backport/suggested The PR author or issue review has suggested that the change should be backported. label Aug 31, 2023
@jfversluis

jfversluis commented Aug 31, 2023 •

Copy link
Copy Markdown
Member Author

Suggested backport since it should be relatively easy to do and help increase coverage also on .NET 7, also see #17138, that should be backported together with this.

@mattleibow

Copy link
Copy Markdown
Member

/backport to net7.0

@github-actions

github-actions Bot commented Sep 6, 2023

Copy link
Copy Markdown
Contributor

Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6098944644

@github-actions

github-actions Bot commented Sep 6, 2023

Copy link
Copy Markdown
Contributor

@mattleibow backporting to net7.0 failed, the patch most likely resulted in conflicts:

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

Applying: Update BindableObject API docs
Using index info to reconstruct a base tree...
M	src/Controls/src/Core/BindableObject.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/BindableObject.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/BindableObject.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 Update BindableObject API docs
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!

@github-actions

github-actions Bot commented Sep 6, 2023

Copy link
Copy Markdown
Contributor

@mattleibow an error occurred while backporting to net7.0, please check the run log for details!

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

@github-actions github-actions Bot locked and limited conversation to collaborators Dec 6, 2023
@samhouts samhouts added the fixed-in-8.0.0-rc.1.9171 Look for this fix in 8.0.0-rc.1.9171 label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-docs Conceptual docs, API docs, Samples backport/suggested The PR author or issue review has suggested that the change should be backported. fixed-in-8.0.0-rc.1.9171 Look for this fix in 8.0.0-rc.1.9171 t/housekeeping ♻︎

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants