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

Merged
merged 61 commits into from
Jan 5, 2024
Merged

[net9.0] Merge main to net9 #19700

merged 61 commits into from
Jan 5, 2024

Conversation

rmarinho
Copy link
Member

@rmarinho rmarinho commented Jan 4, 2024

Description of Change

Merge main to net9.0 branch to update with latest changes

jsuarezruiz and others added 30 commits December 5, 2023 11:51
* Seeing if this will pass CI on iOS 17

* Just run these on iOS 17 for now

* Remove comments, reset test versions
### Description

Merge SR1 fixes into Main

Make sure to Merge Commit not Squash Commit this one
)

* Correctly clear text tapping the clear button on Entry

* Changes from E.Z (08dfc9e)

* Added UITest

* Updated test
jfversluis and others added 20 commits December 20, 2023 16:27
* Bump Xamarin.UITest from 4.1.4 to 4.3.3

* Update TestPages.cs
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Add design time converters for a handful of types special handled by VS XAML intellisense

* CR feedback
* Fix wrong gray color using transparent in iOS gradients

* Added UI Test

* Updated test screenshot

* Added a new sample and test

* Updated test

* Fix build errors
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Try run on devices

* Try skip cache

* Device is always arm64

* Update ios.cake

* Update device-tests-steps.yml

* Ignore API27 for now

* Add default version for windows

* Get back to the defaults
* Set Simulator UDID explicitly for CG UI tests

* Update TestPages.cs

* Update TestPages.cs
* Grab device logs if app stops running

* - move log up
…ggleWorksRemovingCurrentItem` tests

* Update Sandbox app to have a different route name for the 2nd page when using Shell
### Description of Change

* Fix `ShellTabBarVisibilityToggleWorks` and
`ShellTabBarVisibilityToggleWorksRemovingCurrentItem` tests
* Update Sandbox app to have a different route name for the 2nd page
when using Shell

### Issues Fixed

Related: #19565
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…19685)

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
@rmarinho rmarinho requested a review from a team as a code owner January 4, 2024 19:05
@rmarinho rmarinho requested review from mattleibow and PureWeen and removed request for a team January 4, 2024 19:05
@rmarinho rmarinho merged commit 70bdf9a into net9.0 Jan 5, 2024
46 of 48 checks passed
@rmarinho rmarinho deleted the merge-main-net9 branch January 5, 2024 17:59
@samhouts samhouts added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Jan 8, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Feb 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.