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

perf(brush): Don't use reflection to invoke brush updates (backport #18899) #18940

Merged
merged 15 commits into from
Nov 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2024


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

jeromelaban and others added 14 commits November 27, 2024 12:37
(cherry picked from commit 679b4bf)

# Conflicts:
#	src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.Android.cs
(cherry picked from commit 8a23ca1)
(cherry picked from commit 92335c3)
(cherry picked from commit 26687ad)
(cherry picked from commit fc84e12)
(cherry picked from commit ad137db)
(cherry picked from commit 6ca6b65)
(cherry picked from commit 58714bb)
(cherry picked from commit f2ee537)
(cherry picked from commit 63ddc19)
@mergify mergify bot added the conflicts label Nov 27, 2024
Copy link
Contributor Author

mergify bot commented Nov 27, 2024

Cherry-pick of 679b4bf has failed:

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

You are currently cherry-picking commit 679b4bff33.
  (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:
	deleted:    src/Uno.UI/Helpers/WeakEvents/WeakEventManager.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/Border/Border.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.iOSmacOS.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/Border/BorderLayerRenderer.wasm.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.skia.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/MultilineTextBoxView.iOS.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/SinglelineTextBoxView.iOS.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.Android.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.macOS.cs
	modified:   src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.wasm.cs
	modified:   src/Uno.UI/UI/Xaml/IFrameworkElementImplementation.Android.tt
	modified:   src/Uno.UI/UI/Xaml/IFrameworkElementImplementation.iOS.tt
	modified:   src/Uno.UI/UI/Xaml/IFrameworkElementImplementation.macOS.tt
	modified:   src/Uno.UI/UI/Xaml/Media/Brush.cs
	modified:   src/Uno.UI/UI/Xaml/Shapes/Shape.cs
	modified:   src/Uno.UI/Uno.UI.netcoremobile.csproj

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

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 platform/wasm 🌐 Categorizes an issue or PR as relevant to the WebAssembly platform platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform platform/macos 🍏 Categorizes an issue or PR as relevant to the macOS platform platform/ios 🍎 Categorizes an issue or PR as relevant to the iOS platform area/skia ✏️ Categorizes an issue or PR as relevant to Skia area/automation Categorizes an issue or PR as relevant to project automation kind/documentation labels Nov 27, 2024
@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@jeromelaban jeromelaban merged commit 4192479 into release/stable/5.5 Nov 27, 2024
105 of 111 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.5/pr-18899 branch November 27, 2024 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/automation Categorizes an issue or PR as relevant to project automation area/skia ✏️ Categorizes an issue or PR as relevant to Skia conflicts kind/documentation platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform platform/ios 🍎 Categorizes an issue or PR as relevant to the iOS platform platform/macos 🍏 Categorizes an issue or PR as relevant to the macOS platform platform/wasm 🌐 Categorizes an issue or PR as relevant to the WebAssembly platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants