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

Dev/xygu/20230823/shadow-rework (backport #752) #766

Merged
merged 5 commits into from
Aug 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2023

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

On branch mergify/bp/legacy/3x/pr-752
Your branch is up to date with 'origin/legacy/3x'.

You are currently cherry-picking commit f633ff0.
  (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.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Properties.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Themes/Generic.xaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
	both modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs

Cherry-pick of a8e6843 has failed:

On branch mergify/bp/legacy/3x/pr-752
Your branch is ahead of 'origin/legacy/3x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a8e6843.
  (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:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Properties.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowsCache.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Extensions/SKExtensions.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs

Cherry-pick of b57d6e6 has failed:

On branch mergify/bp/legacy/3x/pr-752
Your branch is ahead of 'origin/legacy/3x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b57d6e6.
  (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:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
	modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
	modified:   src/Uno.Toolkit.Skia.WinUI/Extensions/SKExtensions.cs
	modified:   src/Uno.Toolkit.UI/Extensions/DependencyObjectExtensions.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.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

(cherry picked from commit f633ff0)

# Conflicts:
#	src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
#	src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
(cherry picked from commit a8e6843)

# Conflicts:
#	src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
(cherry picked from commit b57d6e6)

# Conflicts:
#	src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
@mergify mergify bot added the conflicts label Aug 29, 2023
@mergify mergify bot mentioned this pull request Aug 29, 2023
18 tasks
@agneszitte
Copy link
Contributor

@Xiaoy312 merge conflicts need to be resolved please

@Xiaoy312 Xiaoy312 self-assigned this Aug 29, 2023
- merge conflict
- netstd incompatibility
@Xiaoy312 Xiaoy312 merged commit 162f9f8 into legacy/3x Aug 29, 2023
29 checks passed
@Xiaoy312 Xiaoy312 deleted the mergify/bp/legacy/3x/pr-752 branch August 29, 2023 20:51
@kazo0
Copy link
Contributor

kazo0 commented Aug 29, 2023

@Mergifyio backport release/stable/3.1

@mergify
Copy link
Contributor Author

mergify bot commented Aug 29, 2023

backport release/stable/3.1

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants