-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
[Tizen] Add Label TextType #11103
[Tizen] Add Label TextType #11103
Conversation
Hey there @JoonghyunCho! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
/azp run |
/backport to net7.0 |
Azure Pipelines successfully started running 2 pipeline(s). |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/3393384354 |
@rmarinho backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [Tizen] Add handing Label.TextType
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Platform/Tizen/Extensions/TextExtensions.cs
M src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
M src/Core/src/Fonts/FontManager.Tizen.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Fonts/FontManager.Tizen.cs
Auto-merging src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
Auto-merging src/Controls/src/Core/Platform/Tizen/Extensions/TextExtensions.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 [Tizen] Add handing Label.TextType
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! |
@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. |
/backport to main |
Started backporting to main: https://github.com/dotnet/maui/actions/runs/3464806036 |
@mattleibow an error occurred while backporting to main, please check the run log for details! Error: @mattleibow is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=mattleibow |
/backport to main |
Started backporting to main: https://github.com/dotnet/maui/actions/runs/3464827427 |
@mattleibow backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [Tizen] Add handing Label.TextType
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Platform/Tizen/Extensions/TextExtensions.cs
M src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
M src/Core/src/Fonts/FontManager.Tizen.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Fonts/FontManager.Tizen.cs
Auto-merging src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Shipped.txt
Auto-merging src/Controls/src/Core/Platform/Tizen/Extensions/TextExtensions.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 [Tizen] Add handing Label.TextType
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! |
@mattleibow an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
remake the PR #11389 against main branch |
Description of Change
This PR adds
At this point, Tizen.UIExtensions package which actually process the
span
creates a new line for each spans. This will be fixed in Tizen.UIExtensions package.