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

[net9.0] Merge main to net9.0 #23853

Merged
merged 12 commits into from
Jul 29, 2024
Merged

[net9.0] Merge main to net9.0 #23853

merged 12 commits into from
Jul 29, 2024

Conversation

rmarinho
Copy link
Member

Description of Change

Bring latest changes from main to net9.0 for branching for preview7

pjcollins and others added 9 commits July 24, 2024 15:49
* [ci] Add scheduled push to nightly feed job

* Update eng/pipelines/maui-release.yml

* Update eng/pipelines/maui-release.yml

* Update eng/pipelines/maui-release.yml

* Update maui-release.yml

---------

Co-authored-by: Rui Marinho <me@ruimarinho.net>
* Custom titlebar control support spike

* handle titlebar hit test elements automatically

* sample

* Added TitleBar property to Window: you can now set titlebar properties on the Window such as leading + trailing content, color, etc.

* Add inactive colors for background + foreground
Fix hide/show titlebar control not working

* Fix issue w/ titlebar unhook on window close
Add titlebar to sample page

* Added `Window.SetTitleBar` function to set the window titlebar. This allows XAML defined titlebars w/ bindings

* Revert some changes

* Revert changes
Fix PublicAPI defs

* Error checkAdditional error checks for page nav

* Update ITitlebar interface

* Titlebar control is now a TemplatedView

* Remove `SetTitlebar` API
Update sample

* Remove child

* Use pattern matching

* Add some docs

* Fix missing publicapi bits

* More public api bits

* Missed some

* Fix use of content presenter

* Adjust passthrough logic

* Fix titlebar height adjust for caption buttons

* Fix override of default template not working

* Cleanup

* Fix default control template not being applied
Add default style for TitleBar

* Fix missing API for tizen

* Fix sample issue
Update sample

* Fix missing title + icon when titlebar is not fully set
Fix titlebar title spacing w/ default behavior
Fix titlebar content added not allowing hit test
Fix missing public API

* Add IgnoreSafeArea for macOS

* Tizen

* Fix titlebar being set on window creation w/ template selector

* Comment out templates

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172694
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2172757

This PR #21350 added the new `PrivacyInfo.xcprivacy` to our default templates (new requirement from Apple) when building from Windows we try to bundle this resource and unfortunately we are missing the required Link metadata when this is done from single project triggering a condition where the path is incorrectly calculated when zipped in windows and once the zip archive is transfered to the mac host it is unable to unarchive the file. To fix this we simply unify the logic with what the macios SDK currently does [1] this ensures the right bundling happens.

[1]: https://github.com/xamarin/xamarin-macios/blob/main/dotnet/targets/Microsoft.Sdk.DefaultItems.template.props#L77
* Add support for MAUI embedding

* Move things around a bit

* Make these APIs public to CT.Maui.Embedding

* Update EmbeddedWindowHandler.iOS.cs

* Update EmbeddedWindowHandler.iOS.cs

* Embedding things are platform only

* tests use it
# Conflicts:
#	src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
@rmarinho rmarinho added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Jul 26, 2024
@rmarinho rmarinho requested a review from a team as a code owner July 26, 2024 13:58
@rmarinho rmarinho disabled auto-merge July 29, 2024 09:45
@rmarinho rmarinho merged commit 4f439b3 into net9.0 Jul 29, 2024
109 of 111 checks passed
@rmarinho rmarinho deleted the merge-main-net9 branch July 29, 2024 09:45
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Aug 2, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Sep 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions fixed-in-net9.0-nightly This may be available in a nightly release!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants