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

Extract Maps, Graphics & Foldable docs during build #10909

Merged
merged 9 commits into from
Nov 7, 2022

Conversation

jfversluis
Copy link
Member

@jfversluis jfversluis commented Oct 25, 2022

Description of Change

Enabling generation of XML docs and adding them to the build artifacts for:

  • Foldable
  • Maps
  • Graphics
    • Markdig
    • Skia

@jfversluis jfversluis added t/housekeeping ♻︎ area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions labels Oct 25, 2022
@jfversluis jfversluis changed the title Extract Maps and Graphics docs during build Extract Maps, Graphics & Foldable docs during build Oct 26, 2022
@jfversluis jfversluis changed the base branch from net7.0 to main October 27, 2022 10:22
@jfversluis jfversluis force-pushed the add-maps-graphics-docs branch from 744e4af to 8bc12eb Compare October 27, 2022 10:26
@jfversluis jfversluis marked this pull request as ready for review October 27, 2022 10:42
@rmarinho
Copy link
Member

rmarinho commented Nov 7, 2022

/backport to net7.0

@github-actions
Copy link
Contributor

github-actions bot commented Nov 7, 2022

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

@github-actions
Copy link
Contributor

github-actions bot commented Nov 7, 2022

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

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

Applying: Extract Maps and Graphics docs during build
Applying: Update dotnet.cake
Applying: Add Foldable & Markdig
Using index info to reconstruct a base tree...
M	eng/cake/dotnet.cake
M	src/Controls/Foldable/src/Controls.Foldable.csproj
M	src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
CONFLICT (content): Merge conflict in src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
Auto-merging src/Controls/Foldable/src/Controls.Foldable.csproj
CONFLICT (content): Merge conflict in src/Controls/Foldable/src/Controls.Foldable.csproj
Auto-merging eng/cake/dotnet.cake
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add Foldable & Markdig
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

github-actions bot commented Nov 7, 2022

@rmarinho 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.

@rmarinho rmarinho merged commit 0ace1bf into main Nov 7, 2022
@rmarinho rmarinho deleted the add-maps-graphics-docs branch November 7, 2022 10:20
jfversluis added a commit that referenced this pull request Nov 7, 2022
* Extract Maps and Graphics docs during build

* Update dotnet.cake

* Add Foldable & Markdig

* Update Controls.Foldable.csproj

* Fix MarkDig

* Update Graphics.Skia.csproj

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake
rmarinho added a commit that referenced this pull request Nov 8, 2022
* Extract Maps, Graphics & Foldable docs during build (#10909)

* Extract Maps and Graphics docs during build

* Update dotnet.cake

* Add Foldable & Markdig

* Update Controls.Foldable.csproj

* Fix MarkDig

* Update Graphics.Skia.csproj

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake

* Fix bad merge on provisionator version

Co-authored-by: Rui Marinho <[email protected]>
@github-actions github-actions bot locked and limited conversation to collaborators Dec 16, 2023
@samhouts samhouts added the fixed-in-8.0.0-preview.1.7762 Look for this fix in 8.0.0-preview.1.7762! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions fixed-in-8.0.0-preview.1.7762 Look for this fix in 8.0.0-preview.1.7762! t/housekeeping ♻︎
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants