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: Reduce winappsdk version dependency (backport #2624) #2625

Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 20, 2024

This is required in order to prevent version conflicts with uno.sdk which is rolling back winappsdk version to the latest version currently supported by the Store
See: microsoft/WindowsAppSDK#4480 is resolved


This is an automatic backport of pull request #2624 done by Mergify.

(cherry picked from commit c9f165b)

# Conflicts:
#	src/Directory.Packages.props
Copy link
Author

mergify bot commented Nov 20, 2024

Cherry-pick of c9f165b has failed:

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

You are currently cherry-picking commit c9f165b56.
  (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/Directory.Packages.props

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@nickrandolph nickrandolph merged commit b2fd46c into release/stable/5.1 Nov 20, 2024
12 checks passed
@nickrandolph nickrandolph deleted the mergify/bp/release/stable/5.1/pr-2624 branch November 20, 2024 15:41
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.

1 participant