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

build: properly ignore xamarin+winui targets for shadows (backport #762) #763

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2023

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

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

You are currently cherry-picking commit 0812002.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/Uno.Toolkit.RuntimeTests/Tests/ShadowContainerTests.cs
	deleted by us:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
	deleted by us:   src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj

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/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 0812002)

# Conflicts:
#	src/Uno.Toolkit.RuntimeTests/Tests/ShadowContainerTests.cs
#	src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
#	src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj
@agneszitte agneszitte self-requested a review August 29, 2023 14:10
@agneszitte
Copy link
Contributor

@kazo0 this one needs fixes please

@kazo0 kazo0 closed this Aug 29, 2023
@mergify mergify bot deleted the mergify/bp/release/stable/3.1/pr-762 branch August 29, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants