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 into net9.0 #23328

Merged
merged 20 commits into from
Jul 1, 2024
Merged

[net9.0] Merge main into net9.0 #23328

merged 20 commits into from
Jul 1, 2024

Conversation

PureWeen
Copy link
Member

No description provided.

PureWeen and others added 13 commits June 24, 2024 19:44
* Simplify Development.md

* Update .github/DEVELOPMENT.md

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

* Update .github/DEVELOPMENT.md

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

* Update .github/DEVELOPMENT.md

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

* Update .github/DEVELOPMENT.md

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

* Update DEVELOPMENT.md

* - modify and move advanced tips to different file

* Update DEVELOPMENT.md

* Update .github/DEVELOPMENT.md

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* Update docs/DevelopmentTips.md

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* Update docs/DevelopmentTips.md

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

* - updates based on review

---------

Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
* Use better layout/measure path with refreshview

* - fix naming

* - set RefreshView content to maui compatible container

* - add test

* - fix null operator

* Update Issue23029.xaml.cs

* - fix content panel so it removes previous content

* - add additional check
* Fix flyout behaviour switching exception

* Tests added

* Flyout test page added

* Flyoutpage test fixes

* Flyout toggle test added

* Remove duplicate ] characters

* Flyout test pages added

* Check for platforms

* Fix title

* - fix tests

---------

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Renamed the project because macOS uses .app

* And the folder

* merge first

* ns
* Split SingleProject targets

* Update Microsoft.Maui.Controls.SingleProject.Before.targets
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* AccessibilityExtensions: Add missing braces

* AccessibilityExtensions: Enable nullability and improve performance

* Update shipped & unshipped API

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
* [Android] Avoid double event subscribes in gesture manager

* Fix typo in test text
@PureWeen PureWeen requested a review from a team as a code owner June 27, 2024 22:01
@PureWeen PureWeen requested review from Eilon and jsuarezruiz June 27, 2024 22:01
mattleibow
mattleibow previously approved these changes Jun 27, 2024
MartyIX and others added 2 commits June 28, 2024 09:49
* [tests] test a lot more things in `MemoryTests.cs`

This expands the tests to cover more controls and areas.

* Add test cases for more controls:

  * `Ellipse`
  * `Grid`
  * `Path`
  * `Line`
  * `Path`
  * `RadioButton`
  * `Rectangle`
  * `RoundRectangle`

* Expand tests for a couple controls:

    * `Border` has a `StrokeShape`
    * Any `TemplatedView` gets a `ControlTemplate`

* Re-enable `ListView` for Android

This should work now after merging:

* dotnet/android#8900
* #23120

* Add a complicated test case for `BindableLayout`

Similar to the case at:

* #23199

* Skip `ListView` on API 23
@PureWeen PureWeen added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Jun 28, 2024
* Bump Appium version to 2.11

* Update CarouselViewUITests.UpdateCurrentItem.cs

* Update appium-install.ps1

* Update CarouselViewUITests.UpdateCurrentItem.cs
@PureWeen
Copy link
Member Author

/azp run

Copy link

Pipelines were unable to run due to time out waiting for the pull request to finish merging.

@PureWeen
Copy link
Member Author

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

Takym and others added 2 commits June 28, 2024 19:34
…3345)

* Simplify `NavigationRootManager.Connect` on the Windows platform.

* Use ternary operator syntax

* Removed extra tabs

* Moved `_disconnected = false;` to `if (_disconnected)`
@PureWeen PureWeen force-pushed the merge_main branch 2 times, most recently from 5b41fdd to 3594aeb Compare June 29, 2024 16:05
PureWeen added 2 commits June 29, 2024 16:39
# Conflicts:
#	src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Controls/tests/TestCases.HostApp/Issues/Issue23029.xaml
#	src/Controls/tests/TestCases.HostApp/Issues/Issue23029.xaml.cs
@mattleibow mattleibow merged commit a44823e into net9.0 Jul 1, 2024
47 of 49 checks passed
@mattleibow mattleibow deleted the merge_main branch July 1, 2024 14:19
@mattleibow mattleibow restored the merge_main branch July 1, 2024 14:47
mattleibow added a commit that referenced this pull request Jul 1, 2024
mattleibow added a commit that referenced this pull request Jul 1, 2024
@mattleibow mattleibow deleted the merge_main branch July 1, 2024 14:49
@github-actions github-actions bot locked and limited conversation to collaborators Aug 1, 2024
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Aug 2, 2024
@samhouts samhouts added the fixed-in-net8.0-nightly This may be available in a nightly release! label Dec 16, 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-net8.0-nightly This may be available in a nightly release! 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.

9 participants