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

fix: sample mobile head (backport #637) #646

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2023

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

On branch mergify/bp/legacy/3x/pr-637
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 bd30319.
  (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.Mobile/Uno.Toolkit.Samples.Mobile.csproj
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/AndroidManifest.xml
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Main.Android.cs
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-hdpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-ldpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-mdpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-tvdpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-xhdpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-xxhdpi/icon.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/mipmap-xxxhdpi/icon.png
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/Resources/values/Styles.xml
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Uno.Toolkit.WinUI.Samples.Mobile.csproj
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Info.plist
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/LaunchScreen.storyboard
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Main.iOS.cs
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Media.xcassets/Resources/Default-568h@2x.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Media.xcassets/Resources/SplashScreen@2x.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Media.xcassets/Resources/SplashScreen@3x.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Resources/Default-568h@2x.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Resources/SplashScreen@2x.png
	new file:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/iOS/Resources/SplashScreen@3x.png
	modified:   src/Uno.Toolkit.UI/AssemblyInfo.cs

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

Cherry-pick of 94aa94a has failed:

On branch mergify/bp/legacy/3x/pr-637
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 94aa94a.
  (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 <file>..." to mark resolution)
	both modified:   src/crosstargeting_override.props.sample

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 a6792a9)
(cherry picked from commit bd30319)

# Conflicts:
#	samples/Directory.Packages.props
#	src/Uno.Toolkit.sln
(cherry picked from commit 94aa94a)

# Conflicts:
#	src/crosstargeting_override.props.sample
@mergify mergify bot added the conflicts label Jul 12, 2023
@mergify mergify bot mentioned this pull request Jul 12, 2023
6 tasks
@agneszitte agneszitte closed this Jul 12, 2023
@mergify mergify bot deleted the mergify/bp/legacy/3x/pr-637 branch July 12, 2023 18:23
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