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

Add View docs #17220

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Add View docs #17220

merged 3 commits into from
Sep 6, 2023

Conversation

jknaudt21
Copy link
Contributor

Description of Change

Add docs for View

Issues Fixed

Related to #3960

@jknaudt21 jknaudt21 requested a review from a team as a code owner September 5, 2023 20:00
@jknaudt21 jknaudt21 added area-docs Conceptual docs, API docs, Samples t/housekeeping ♻︎ labels Sep 5, 2023
src/Controls/src/Core/View/View.cs Outdated Show resolved Hide resolved
src/Controls/src/Core/View/View.cs Outdated Show resolved Hide resolved
src/Controls/src/Core/View/View.cs Outdated Show resolved Hide resolved
src/Controls/src/Core/View/View.cs Outdated Show resolved Hide resolved
jknaudt21 and others added 2 commits September 6, 2023 10:27
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
@jfversluis jfversluis enabled auto-merge (squash) September 6, 2023 18:25
@jfversluis jfversluis added the backport/suggested The PR author or issue review has suggested that the change should be backported. label Sep 6, 2023
@jfversluis
Copy link
Member

Suggesting backport because it's relatively safe to do and gives up more coverage on the docs in vCurrent

@jfversluis jfversluis merged commit 7b2dad1 into main Sep 6, 2023
38 checks passed
@jfversluis jfversluis deleted the dev/jd/viewDocs branch September 6, 2023 20:05
@PureWeen
Copy link
Member

/backport to release/8.0.1xx-rc2.2

@github-actions
Copy link
Contributor

Started backporting to release/8.0.1xx-rc2.2: https://github.com/dotnet/maui/actions/runs/6631841696

@github-actions
Copy link
Contributor

@PureWeen backporting to release/8.0.1xx-rc2.2 failed, the patch most likely resulted in conflicts:

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

Applying: [docs] Document View
.git/rebase-apply/patch:527: trailing whitespace.
		/// Invoked whenever the binding context of the <see cref="View" /> changes. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	src/Controls/docs/Microsoft.Maui.Controls/View.xml
M	src/Controls/src/Core/View/View.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/View/View.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/View/View.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 [docs] Document View
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
Copy link
Contributor

@PureWeen an error occurred while backporting to release/8.0.1xx-rc2.2, 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.2.9373 Look for this fix in 8.0.0-rc.2.9373! 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.2.9373 Look for this fix in 8.0.0-rc.2.9373! t/housekeeping ♻︎
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants