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: Bump WinAppSdk reference version (backport #1752) #1765

Merged
merged 8 commits into from
Aug 14, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 14, 2023

This is an automatic backport of pull request #1752 done by Mergify.
Cherry-pick of 7c16436 has failed:

On branch mergify/bp/legacy/2x/pr-1752
Your branch is up to date with 'origin/legacy/2x'.

You are currently cherry-picking commit 7c164362.
  (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/Playground/Directory.Packages.props
	modified:   src/Directory.Packages.props
	modified:   src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Windows/Uno.Extensions.RuntimeTests.Windows.csproj

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   samples/MauiEmbedding/Directory.Packages.props
	deleted by us:   src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj
	deleted by us:   src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj
	both modified:   testing/TestHarness/Directory.Packages.props

Cherry-pick of e9908ec has failed:

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

You are currently cherry-picking commit e9908ec1.
  (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.Extensions.Reactive.Tests/Given_ListFeed.cs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/Uno.Extensions.Reactive.Tests/Sources/Given_DynamicFeed.cs

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

@mergify mergify bot added the conflicts label Aug 14, 2023
@mergify mergify bot mentioned this pull request Aug 14, 2023
4 tasks
(cherry picked from commit 7c16436)

# Conflicts:
#	samples/MauiEmbedding/Directory.Packages.props
#	src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj
#	src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj
#	testing/TestHarness/Directory.Packages.props
(cherry picked from commit e9908ec)

# Conflicts:
#	src/Uno.Extensions.Reactive.Tests/Sources/Given_DynamicFeed.cs
(cherry picked from commit e92a152)
@nickrandolph nickrandolph merged commit b226d8c into legacy/2x Aug 14, 2023
10 checks passed
@nickrandolph nickrandolph deleted the mergify/bp/legacy/2x/pr-1752 branch August 14, 2023 09:59
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

1 participant