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

Template dependencies update (backport #357) #371

Merged
merged 6 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 30, 2023

This is an automatic backport of pull request #357 done by Mergify.
Cherry-pick of 481c784 has failed:

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

You are currently cherry-picking commit 481c784.
  (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:   src/Uno.Templates/content/unoapp/.template.config/template.json
	modified:   src/Uno.Templates/content/unoapp/Directory.Build.props
	modified:   src/Uno.Templates/content/unoapp/Directory.Packages.props
	modified:   src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Mobile/MyExtensionsApp._1.Mobile.csproj
	modified:   src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Tests/MyExtensionsApp._1.Tests.csproj
	modified:   src/Uno.Templates/content/unoapp/MyExtensionsApp._1.UITests/MyExtensionsApp._1.UITests.csproj
	modified:   src/Uno.Templates/content/unoapp/MyExtensionsApp._1/MyExtensionsApp._1.csproj

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Templates/Uno.Templates.csproj
	both modified:   src/Uno.Templates/reinstall.ps1

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 4 commits October 30, 2023 00:48
(cherry picked from commit 481c784)

# Conflicts:
#	src/Uno.Templates/Uno.Templates.csproj
#	src/Uno.Templates/reinstall.ps1
(cherry picked from commit 81f177d)
(cherry picked from commit 659cf31)
@mergify mergify bot added the conflicts label Oct 30, 2023
@mergify mergify bot mentioned this pull request Oct 30, 2023
@nickrandolph nickrandolph merged commit dc1059a into release/stable/5.0 Oct 30, 2023
38 checks passed
@nickrandolph nickrandolph deleted the mergify/bp/release/stable/5.0/pr-357 branch October 30, 2023 21:53
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