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

Merge sr9 into net9 ga #25265

Merged
merged 22 commits into from
Oct 20, 2024
Merged

Merge sr9 into net9 ga #25265

merged 22 commits into from
Oct 20, 2024

Conversation

PureWeen
Copy link
Member

Description of Change

Rollup changes that are going into .NET 8 SR9.2 so that they are also released with .NET9 GA

PureWeen and others added 15 commits September 11, 2024 19:13
…24829)

* Add padding for buttons that need it and UITest

* lost some spaces in the xaml

* android and windows screenshot

---------

Co-authored-by: tj-devel709 <[email protected]>
* test for #24849

* failing test

* [C] OR EQUAL !

- fixes #24849

---------

Co-authored-by: Stephane Delcroix <[email protected]>
…licate groups or crashes when adding a new item to a group or when adding a new group. (#25030)

* [iOS] CollectionView issue fix.

* Added test case.

* Added snapshots.

---------

Co-authored-by: Tamilarasan Paranthaman <[email protected]>
…#25075)

* [X] allow namescope resolution before parenting

when an element doesn't override the NameScope (DataTemplate, etc...)
FindName fails until the element is parented.

this PR sets a field (less expensive than a BP) used only during that
time, and allow VSM to be applied.

- fixes #22001

* fix

* fixes #16208

---------

Co-authored-by: Stephane Delcroix <[email protected]>
…ad of `postInvalidate` (#25121)

* Revert #24222 and simply use `invalidate` instead of `postInvalidate`

* - update aar file

---------

Co-authored-by: Alberto Aldegheri <[email protected]>
Co-authored-by: Shane Neuville <[email protected]>
* [iOS] Text alignment in editor - improvements

* Update Issue24583.cs

* Try old way but use content height

* less noise

* Added the first batch of snapshots

* add more screenshots

---------

Co-authored-by: Jakub Florkowski <[email protected]>
Co-authored-by: tj-devel709 <[email protected]>
…xt or image change (#25214)

* allow remeasure for title and image change

* more screenshots 2

* more screenshots 3
…ndColor for a NavigationPage - fix (#25251)

* Added a null check

* Added a UI test

* Removed an xaml file for ui test

* Update NavigationPageToolbar.cs

* Improvements

* Update NavigationPageToolbar.cs

---------

Co-authored-by: Jakub Florkowski <[email protected]>
…sr9_into_net9_ga

# Conflicts:
#	eng/Versions.props
#	src/Controls/src/Core/Binding.cs
#	src/Controls/src/Core/Button/Button.iOS.cs
#	src/Controls/src/Core/Element/Element.cs
#	src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
#	src/Controls/src/Xaml/XamlServiceProvider.cs
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonPaddingIsAddedWhenNeeded.png
#	src/Core/src/maui.aar
@PureWeen PureWeen requested a review from a team as a code owner October 14, 2024 20:30
@PureWeen PureWeen requested review from Eilon, StephaneDelcroix, rmarinho and tj-devel709 and removed request for a team and Eilon October 14, 2024 20:30
# Conflicts:
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonPaddingIsAddedWhenNeeded.png
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_NoBorder.png
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage4.png
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage6.png
# Conflicts:
#	src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png
@PureWeen PureWeen force-pushed the merge_sr9_into_net9_ga branch from 3385ff2 to 11d68e2 Compare October 19, 2024 18:04
@PureWeen
Copy link
Member Author

/azp run

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@PureWeen
Copy link
Member Author

/azp run MAUI-DeviceTests-public

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@PureWeen
Copy link
Member Author

/azp run MAUI-DeviceTests-public

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@PureWeen PureWeen merged commit 7cef4c0 into release/9.0.1xx Oct 20, 2024
108 of 112 checks passed
@PureWeen PureWeen deleted the merge_sr9_into_net9_ga branch October 20, 2024 13:11
@github-actions github-actions bot locked and limited conversation to collaborators Nov 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants