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

feat: Embedding (backport #1691) #1693

Merged
merged 86 commits into from
Jul 26, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 26, 2023

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

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

You are currently cherry-picking commit e232b04b.
  (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/MauiEmbedding/Directory.Packages.props
	modified:   samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Directory.Packages.props

Cherry-pick of 44da710 has failed:

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

You are currently cherry-picking commit 44da710f.
  (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/MauiEmbedding/Directory.Packages.props
	modified:   src/Uno.Extensions-packageonly.slnf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   samples/Playground/Directory.Packages.props
	both modified:   src/Directory.Packages.props
	both modified:   src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj
	both modified:   src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj
	both modified:   src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj
	both modified:   src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj
	both modified:   testing/TestHarness/Directory.Packages.props

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

dansiegel and others added 30 commits July 26, 2023 04:06
(cherry picked from commit 4f3632d)
(cherry picked from commit cec4a98)
(cherry picked from commit 9afa41e)
(cherry picked from commit 183e643)
(cherry picked from commit 1ab9252)
(cherry picked from commit d34e069)
(cherry picked from commit 48137a9)
(cherry picked from commit 6efa82c)
(cherry picked from commit 1459192)
(cherry picked from commit 4912a89)
(cherry picked from commit d2060e0)
Co-authored-by: Jérôme Laban <jlaban@gmail.com>
(cherry picked from commit 16143cf)
…d and adding exception handling to resource conversion

(cherry picked from commit eca4168)
(cherry picked from commit 82f111a)
(cherry picked from commit e382c3e)
We should revert this

(cherry picked from commit 763542a)
(cherry picked from commit c76e542)
(cherry picked from commit 83d5303)
(cherry picked from commit 63e48f1)
(cherry picked from commit af12af3)
pictos and others added 18 commits July 26, 2023 04:06
(cherry picked from commit 987b729)
(cherry picked from commit 631f327)
(cherry picked from commit 3f506ea)
(cherry picked from commit e94bdbc)
(cherry picked from commit 44da710)

# Conflicts:
#	samples/Playground/Directory.Packages.props
#	src/Directory.Packages.props
#	src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj
#	src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj
#	src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj
#	src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj
#	testing/TestHarness/Directory.Packages.props
(cherry picked from commit f98a493)
(cherry picked from commit 5072767)
(cherry picked from commit 42dd24a)
@mergify mergify bot added the conflicts label Jul 26, 2023
@mergify mergify bot mentioned this pull request Jul 26, 2023
7 tasks
@nickrandolph nickrandolph enabled auto-merge July 26, 2023 06:43
@nickrandolph nickrandolph force-pushed the mergify/bp/legacy/2x/pr-1691 branch from 7cea29c to b4dc8c0 Compare July 26, 2023 08:58
@nickrandolph nickrandolph force-pushed the mergify/bp/legacy/2x/pr-1691 branch from 2e34ecf to 2cce23f Compare July 26, 2023 13:32
@nickrandolph nickrandolph merged commit a919aa0 into legacy/2x Jul 26, 2023
@nickrandolph nickrandolph deleted the mergify/bp/legacy/2x/pr-1691 branch July 26, 2023 14:46
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.

3 participants