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

chore: Fixing reference to UIWindow (backport #2246) #2255

Merged
merged 11 commits into from
Apr 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 17, 2024

GitHub Issue (If applicable): closes #2240

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

UIWindow not found using the old _window field.

What is the new behavior?

v5.2 of Uno adds multi-window support along with refactoring inner logic for Window management.
the internal NativeWindow property now returns the UIWindow required for Maui Embedding

PR Checklist

Please check if your PR fulfills the following requirements:

  • Tested code with current supported SDKs
  • Docs have been added/updated which fit documentation template. (for bug fixes / features)
  • Unit Tests and/or UI Tests for the changes have been added (for bug fixes / features) (if applicable)
  • Wasm UI Tests are not showing unexpected any differences. Validate PR Screenshots Compare Test Run results.
  • Contains NO breaking changes
  • Updated the Release Notes
  • Associated with an issue (GitHub or internal)

Other information

Internal Issue (If applicable):


This is an automatic backport of pull request #2246 done by [Mergify](https://mergify.com).

nickrandolph and others added 10 commits April 17, 2024 15:25
(cherry picked from commit a106876)
(cherry picked from commit 72b698f)

# Conflicts:
#	src/Directory.Packages.props
(cherry picked from commit 42d5a70)
(cherry picked from commit e89d605)
(cherry picked from commit c193535)

# Conflicts:
#	src/Directory.Packages.props
(cherry picked from commit e203ffd)
(cherry picked from commit 034d966)
(cherry picked from commit 12e6e6c)
@mergify mergify bot added the conflicts label Apr 17, 2024
Copy link
Author

mergify bot commented Apr 17, 2024

Cherry-pick of 72b698f has failed:

On branch mergify/bp/release/stable/4.1/pr-2246
Your branch is ahead of 'origin/release/stable/4.1' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 72b698f29.
  (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.Maui.UI/MauiEmbedding.apple.cs

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

Cherry-pick of c193535 has failed:

On branch mergify/bp/release/stable/4.1/pr-2246
Your branch is ahead of 'origin/release/stable/4.1' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c19353546.
  (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/MauiEmbedding/Directory.Build.props
	modified:   samples/MauiEmbedding/Directory.Packages.props
	modified:   samples/MauiEmbedding/MauiEmbedding.MauiControls/MauiEmbedding.MauiControls.csproj
	modified:   samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
	modified:   src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs
	modified:   src/Uno.Extensions.Navigation.UI/Navigators/ContentDialogNavigator.cs
	modified:   src/Uno.Extensions.Navigation.UI/ServiceProviderExtensions.cs
	new file:   src/maui-embedding.props

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

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

@mergify mergify bot mentioned this pull request Apr 17, 2024
7 tasks
@dansiegel dansiegel enabled auto-merge April 17, 2024 15:49
@dansiegel dansiegel merged commit 4162050 into release/stable/4.1 Apr 17, 2024
13 checks passed
@dansiegel dansiegel deleted the mergify/bp/release/stable/4.1/pr-2246 branch April 17, 2024 16:58
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.

2 participants