Skip to content

feat: Re-add VectorExtensions (backport #14985) #15017

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.

Sign up for GitHub

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

Jump to bottom
Merged
jeromelaban merged 7 commits into from
Jan 10, 2024
Merged

feat: Re-add VectorExtensions (backport #14985) #15017

jeromelaban merged 7 commits into from
Jan 10, 2024

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2024

This is an automatic backport of pull request #14985 done by Mergify.
Cherry-pick of f9cb3e8 has failed:

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

You are currently cherry-picking commit f9cb3e8c93.
  (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/Media/VisualTreeHelper.cs
	modified:   src/Uno.UI/UI/Xaml/UIElement.skia.cs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/Uno.UI/Microsoft/UI/Xaml/Controls/Expander/Expander.cs
	both modified:   src/Uno.UI/Microsoft/UI/Xaml/Controls/SwipeControl/SwipeControl.Uno.cs
	deleted by us:   src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.cs
	both modified:   src/Uno.UI/UI/Xaml/Media/Brush.skia.cs
	both modified:   src/Uno.UI/UI/Xaml/Media/EllipseGeometry.skia.cs
	both modified:   src/Uno.UI/UI/Xaml/Media/LineGeometry.skia.cs

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jan 10, 2024
@mergify mergify bot mentioned this pull request Jan 10, 2024
Merged
6 tasks
@github-actions github-actions bot added platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform area/skia ✏️ Categorizes an issue or PR as relevant to Skia labels Jan 10, 2024
@unodevops
Copy link
Contributor

unodevops commented Jan 10, 2024

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

@MartinZikmund MartinZikmund force-pushed the mergify/bp/release/stable/5.0/pr-14985 branch from 83cc987 to b08ef0a Compare January 10, 2024 07:46
@unodevops
Copy link
Contributor

unodevops commented Jan 10, 2024

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

@unodevops
Copy link
Contributor

unodevops commented Jan 10, 2024

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

@jeromelaban jeromelaban merged commit 566cc04 into release/stable/5.0 Jan 10, 2024
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.0/pr-14985 branch January 10, 2024 13:38
@unodevops
Copy link
Contributor

unodevops commented Jan 10, 2024

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

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

Reviewers

@MartinZikmund MartinZikmund MartinZikmund approved these changes

Assignees

No one assigned

Labels

area/skia ✏️ Categorizes an issue or PR as relevant to Skia conflicts platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@unodevops @MartinZikmund @jeromelaban