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 #24953

Merged
merged 24 commits into from
Sep 30, 2024
Merged

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

merged 24 commits into from
Sep 30, 2024

Conversation

rmarinho
Copy link
Member

Description of Change

Bring last changes from main to net9.0

Vignesh-SF3580 and others added 9 commits September 24, 2024 12:17
* Fixed-19859 : NavigationPage: Title not updating

* test cases added.

* testcases updated.

* updated Issue19859.xaml

* Added snapshots.
…24806)

* fix added

* UI test added

* platform affected codes updated

* script file changes updated

* review changes updated

* Test case file changes updated

* tabbar automation id casing updated

* Automation ID changed for button

* unshipped file changes reverted

* changes updated

* platform condition updated

* UI test modified

* screen shot added

* access specifier changed
* test for #24849

* failing test

* [C] OR EQUAL !

- fixes #24849
* [X] Ignore Parent DataType on collection

Picker.ItemDisplayBinding for example shouldn't inherit parent DataType

- fixes #23989

* fixtrimming

* suppresswarning

* Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/Utilities/BuildWarningsUtilities.cs
* fix added

* UI test added

* test case platform affected changes added

* test case changes added

* UI test changes added

* script file method name updated

* ui test changes added

* script file platform condition added

* output snapshots images added

* ui test file changes added

* Fix Shell title update issue

* images added for all platform

* changes reverted

* fix added

* UI test added

* test case platform affected changes added

* test case changes added

* UI test changes added

* script file method name updated

* ui test changes added

* script file platform condition added

* output snapshots images added

* ui test file changes added

* Fix Shell title update issue

* images added for all platform

* changes reverted

* image added

* image added
…es when adding a new item to a group or when adding a new group. (#24873)

* [iOS] CollectionView issue fix.

* Added test case.

* Added snapshots.
@rmarinho rmarinho requested review from a team as code owners September 26, 2024 22:46
@rmarinho rmarinho changed the base branch from main to net9.0 September 26, 2024 22:47
@rmarinho rmarinho requested a review from Redth September 26, 2024 22:47
Redth
Redth previously approved these changes Sep 27, 2024
# Conflicts:
#	src/Controls/src/Core/Element/Element.cs
#	src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Controls/src/Xaml/XamlServiceProvider.cs
#	src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
#	src/TestUtils/src/Microsoft.Maui.IntegrationTests/Utilities/BuildWarningsUtilities.cs
Redth
Redth previously approved these changes Sep 27, 2024
@rmarinho rmarinho changed the title [net9.0 Merge main to net9.0 [net9.0] Merge main to net9.0 Sep 27, 2024
@rmarinho rmarinho added this to the 9.0-rc2 milestone Sep 27, 2024
@@ -782,7 +782,7 @@ internal void OnResourcesChanged(IEnumerable<KeyValuePair<string, object>> value
internal override void OnSetDynamicResource(BindableProperty property, string key, SetterSpecificity specificity)
{
base.OnSetDynamicResource(property, key, specificity);
if (!DynamicResources.TryGetValue(property, out var existing) || existing.Item2 < specificity)
if (!DynamicResources.TryGetValue(property, out var existing) || existing.Item2 <= specificity)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StephaneDelcroix is this ok?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

jfversluis and others added 5 commits September 30, 2024 13:25
* AppThemeBinding on ToolbarItems

* Added a UI test

* UI test fix

* Added a snapshot

* Update Issue24878.cs

* Added a windows snapshot
when a resource can be compiled locally, do it.

TODO: convert OnPlatform
TODO: walk up DataTemplates

- fixes #20244
rmarinho and others added 4 commits September 30, 2024 13:30
* WIPWIP

* Feedback

* Refactor usage of `FocusManager` to avoid weak table usage

* Use ConditionalWeakTable

---------

Co-authored-by: Alberto Aldegheri <[email protected]>
Update default host address to 0.0.0.1.
@rmarinho rmarinho merged commit 88b3562 into net9.0 Sep 30, 2024
1 of 40 checks passed
@rmarinho rmarinho deleted the merge-main-net9 branch September 30, 2024 15:51
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Oct 1, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Nov 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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.