-
Notifications
You must be signed in to change notification settings - Fork 49
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 4f3632d)
(cherry picked from commit 1399eb2)
(cherry picked from commit cec4a98)
(cherry picked from commit ee5af2a)
(cherry picked from commit f13d363)
(cherry picked from commit 9afa41e)
(cherry picked from commit 8b77129)
(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 7acc6ad)
(cherry picked from commit 1459192)
(cherry picked from commit 4912a89)
(cherry picked from commit e2fa2ca)
(cherry picked from commit d46a74c)
(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 b3ea7fe)
(cherry picked from commit 82f111a)
(cherry picked from commit e382c3e)
We should revert this (cherry picked from commit 763542a)
(cherry picked from commit 71b04db)
(cherry picked from commit 3bd1861)
(cherry picked from commit c76e542)
(cherry picked from commit 83d5303)
(cherry picked from commit 63e48f1)
(cherry picked from commit af12af3)
(cherry picked from commit b451b3c)
(cherry picked from commit 4c464a4)
(cherry picked from commit 987b729)
(cherry picked from commit c48cce5)
(cherry picked from commit aeadee0)
(cherry picked from commit 631f327)
(cherry picked from commit 3f506ea)
(cherry picked from commit 4050fba)
(cherry picked from commit c38e5fb)
(cherry picked from commit b271cd0)
(cherry picked from commit e94bdbc)
(cherry picked from commit 0b663ce)
(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)
(cherry picked from commit ee64140)
(cherry picked from commit 5cbf98e)
nickrandolph
force-pushed
the
mergify/bp/legacy/2x/pr-1691
branch
from
July 26, 2023 08:58
7cea29c
to
b4dc8c0
Compare
nickrandolph
force-pushed
the
mergify/bp/legacy/2x/pr-1691
branch
from
July 26, 2023 13:32
2e34ecf
to
2cce23f
Compare
nickrandolph
approved these changes
Jul 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #1691 done by Mergify.
Cherry-pick of e232b04 has failed:
Cherry-pick of 44da710 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com