Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2025

GitHub Issue (If applicable): closes #19591

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):


This is an automatic backport of pull request #19665 done by [Mergify](https://mergify.com).

(cherry picked from commit c823cfa)

# Conflicts:
#	src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
(cherry picked from commit 1d80eed)

# Conflicts:
#	src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.skia.cs
@mergify mergify bot added the conflicts label Apr 29, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 29, 2025

Cherry-pick of c823cfa has failed:

On branch mergify/bp/release/stable/5.6/pr-19665
Your branch is up to date with 'origin/release/stable/5.6'.

You are currently cherry-picking commit c823cfa231.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.skia.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs

Cherry-pick of 1d80eed has failed:

On branch mergify/bp/release/stable/5.6/pr-19665
Your branch is ahead of 'origin/release/stable/5.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1d80eed04e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.skia.cs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the area/skia ✏️ Categorizes an issue or PR as relevant to Skia label Apr 29, 2025
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-20114/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-20114/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-20114/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-20114/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-20114/index.html

@unodevops
Copy link
Contributor

⚠️⚠️ The build 163460 has failed on Uno.UI - CI.

@github-actions
Copy link

This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or it will be closed in 10 days.

@github-actions github-actions bot added the stale This item has been marked as stale and will be closed if there is no activity. label Jun 30, 2025
@github-actions github-actions bot removed the stale This item has been marked as stale and will be closed if there is no activity. label Jul 2, 2025
@jeromelaban
Copy link
Member

Let's skip for now, moving to uno 6 fixes the issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/skia ✏️ Categorizes an issue or PR as relevant to Skia conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants