Skip to content

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

Merged
rmarinho merged 276 commits intonet9.0from
merge-main-net9
Nov 19, 2024
Merged

[net9.0] Merge main to net9.0#25956
rmarinho merged 276 commits intonet9.0from
merge-main-net9

Conversation

@rmarinho
Copy link
Copy Markdown
Member

Description of Change

Bring latest changes fro main to net9.0 so we can test iOS and Android workloads

PureWeen and others added 30 commits October 10, 2024 11:25
* Add first batch of XamUITests

* Disable tests

* Update Issue12777.cs

* Disable some tests to make it green

* Update Bugzilla44044.cs

* Changes to fix the build

* Removing duplicates

* Removed more duplicates

* Remove more duplicates

* Remove more duplicates

* More changes

* More changes

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
…ems. (#24830)

* Fixed: 11896 - CollectionView Header/Footer/EmptyView issues when adding/removing items

* updated Items/ItemsViewHandler.Android.cs

* Added testcases.

* Added ios fix.

* updated Issue11896.cs

* updated Issue11896.cs

* Added output images.

* ios images updated.
* [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 <42434498+kubaflo@users.noreply.github.com>
Co-authored-by: tj-devel709 <tj.devel709@gmail.com>
…rols (#25006)

* Fixed Microsoft.Maui.Controls 8.0.90 (Latest stable) Ruins Entry Controls

* Added test cases

* updated test case method name

* Added automation id

* Added pending test snapshot

* Added images for android and IOS

* Fixed Microsoft.Maui.Controls 8.0.90 (Latest stable) Ruins Entry Controls

* Added test cases

* updated test case method name

* Added automation id

* Added images for android and IOS

* Added pending test snapshot

* Modified ios image

* revert unwanted changes

* Revert "Added pending test snapshot"

This reverts commit 3f66bbb.

* modified code changes

* Revert "Added pending test snapshot"

This reverts commit 269de76.

* Reapply "Added pending test snapshot"

This reverts commit dd65898.

Revert "modified code changes"

This reverts commit 8d59b7b.

Revert "Modified ios image"

This reverts commit daef7ed.

* Added pending test snapshot

* dummy

* Revert "Merge branch 'fix-24783' of https://github.com/NirmalKumarYuvaraj/maui into fix-24783"

This reverts commit 8d50a3c, reversing
changes made to 15000b8.

* Revert "Merge branch 'fix-24783' of https://github.com/NirmalKumarYuvaraj/maui into fix-24783"

This reverts commit 15000b8, reversing
changes made to daef7ed.

* reverted all the changes

* Added missing test cases and images

* removed unwanted images and files

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
… in IOS (#25084)

* Fixed - 19246 - Button doesn't reset to "Normal" if scrolled quickly to the top in IOS

* Removed If condition for VirtualButton is an IButton

* Modified code changes
…41009.1 (#25186)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 10.0.0-prerelease.24501.1 -> To Version 10.0.0-prerelease.24509.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Enable TSA upload

* More TSA options
…5122)

* allow remeasure for title and image change

* add more to the test

* screenshots

* screenshots 2

* round the titleRect manual measurement

* remove one condition for adding additional padding

* change internal field to method

* Always measure the titleRect and fix edge case with slim titleRects

* screenshots

* more screenshots
…xt or image change (#25214)

* allow remeasure for title and image change

* more screenshots 2

* more screenshots 3
* [housekeeping] Fix ps1 script warnings

* Fix upload tsa

* Try tsaoptions from artifact
* Added Stepper UITests

* Added iOS version

* Updated Stepper UITests

* Fix build error

* More changes in the iOS impl

* Added support to Windows

* More changes in the Windows impl

* More changes

* More changes

* Changes to avoid not find MauiStepper container from Appium

* More changes

* More fixes
…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 <kubaflo123@gmail.com>
…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
…String Programmatically. (#25171)

* fixed - 18235 : Setting .NET MAUI Button.Text to String.Empty inside a Clicked event handler causes previously set buttons to revert to previous values

* added testcases.

* updated testcases.

* updated testcases.

* updated Testcases.

* fix updated.

* updated ButtonExtensions.cs

* Added windows snapshot.
* Like with issues, set gallery items as mainpage directly

* More changes
…41011.1 (#25247)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 10.0.0-prerelease.24509.1 -> To Version 10.0.0-prerelease.24511.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* [housekeeping] Remove debug.keystore (#25240)

* [housekeeping] Fix ps1 script warnings (#25241)

* [housekeeping] Fix ps1 script warnings

* Fix upload tsa

* Try tsaoptions from artifact
# Conflicts:
#	eng/scripts/appium-install.ps1
…Ds (#25275)

* [nuget-msi-convert] Support improved VS component IDs

Context: dotnet/arcade@b2d3a3a
Context: https://github.com/xamarin/yaml-templates/pull/339

The VS insertion manifest generation has been updated to use new VS
component IDs required for .NET 9+.

* Use yaml-templates main

---------

Co-authored-by: Peter Collins <pecolli@microsoft.com>
…onPage - fix (#25197)

* Added a null check

* Added a UI test

* Removed an xaml file for ui test

* Update NavigationPageToolbar.cs

* Improvements

* Update NavigationPageToolbar.cs
rmarinho and others added 15 commits November 18, 2024 10:00
# Conflicts:
#	eng/pipelines/handlers.yml
#	src/Essentials/test/DeviceTests/Tests/DeviceInfo_Tests.cs
…#25847)

* enabled UITests from XamarinUI test to appium

* Update AppiumApp.cs 

Getting reference from this commit 9dab842

* Added issue link for fails attribute - Issue7534.cs
…to be displayed (#23745)

* Page.IsBusy activity idicator

* Added snapshots
Update runtime

Try private

Try 200

Try again

GTry

Teste again

Try public

Fix emscript

Update NuGet.config

Fix url

Missing s
* Try to call trim

* Use a buildProps local

* Case sensitve

* Also speed up blazor tests

* Fix missing parameter
#25924)

* Fixed CarouselView Loop="False" rendering items incorrectly

* Added snapshots

* Update CarouselViewShouldRenderCorrectly.png
@rmarinho rmarinho requested review from a team as code owners November 19, 2024 16:42
@rmarinho rmarinho requested review from jfversluis, jonathanpeppers and tj-devel709 and removed request for jfversluis and tj-devel709 November 19, 2024 16:42
@rmarinho rmarinho added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Nov 19, 2024
@rmarinho rmarinho enabled auto-merge November 19, 2024 17:12
@rmarinho rmarinho requested a review from mattleibow November 19, 2024 17:12
@rmarinho rmarinho disabled auto-merge November 19, 2024 18:47
@rmarinho rmarinho merged commit 72e684d into net9.0 Nov 19, 2024
@rmarinho rmarinho deleted the merge-main-net9 branch November 19, 2024 18:47
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Dec 16, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jan 16, 2025
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.