Extract Maps, Graphics & Foldable docs during build#10909
Merged
Conversation
744e4af to
8bc12eb
Compare
Member
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/3409437614 |
Contributor
|
@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 128Please backport manually! |
Contributor
|
@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
approved these changes
Nov 7, 2022
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 <me@ruimarinho.net>
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Description of Change
Enabling generation of XML docs and adding them to the build artifacts for: