feat: adding maui-core fix resource paths (backport #1784) #1788
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
(cherry picked from commit 19045ac)
(cherry picked from commit 4c399d7)
(cherry picked from commit 701473a) # Conflicts: # samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj # samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs # samples/MauiEmbedding/MauiEmbedding.Wasm/MauiEmbedding.Wasm.csproj # samples/MauiEmbedding/MauiEmbedding.sln
(cherry picked from commit 392d293) # Conflicts: # samples/MauiEmbedding/MauiEmbedding.sln
(cherry picked from commit f895beb)
(cherry picked from commit 7b2a590)
(cherry picked from commit 0ebfd1a) # Conflicts: # samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml
(cherry picked from commit e9ad8c4) # Conflicts: # build/ci/.azure-pipelines.yml # src/Uno.Extensions-packageonly.slnf
(cherry picked from commit 395c14a)
(cherry picked from commit b5aea27)
(cherry picked from commit dfb5a97)
(cherry picked from commit d3de6a9)
nickrandolph
force-pushed
the
mergify/bp/legacy/2x/pr-1784
branch
from
1a652b1
to
cd0acc1
Compare
nickrandolph
force-pushed
the
mergify/bp/legacy/2x/pr-1784
branch
from
cd0acc1
to
23e0a49
Compare
nickrandolph
force-pushed
the
mergify/bp/legacy/2x/pr-1784
branch
from
23e0a49
to
212a61b
Compare
|
Added backport for #1787 |
|
Added backport of #1789 |
nickrandolph
approved these changes
Aug 22, 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 #1784 done by Mergify.
Cherry-pick of 701473a has failed:
Cherry-pick of 392d293 has failed:
Cherry-pick of 0ebfd1a has failed:
Cherry-pick of e9ad8c4 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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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