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

Merged
merged 33 commits into from
Feb 27, 2024
Merged

[net9.0] Merge main to net9 #20865

merged 33 commits into from
Feb 27, 2024

Conversation

rmarinho
Copy link
Member

Description of Change

Bring latest changes

simonrozsival and others added 30 commits February 16, 2024 19:03
* Add parser for single type expression

* Allow generic types in x:DataType

* Allow generic types in x:Type

* Add test

* Improve test
* Fix modal page push in immersive mode

* Change GetInsetsIgnoringVisibility to GetInsets

* Revert "Fix modal page push in immersive mode"

This reverts commit a2526ea.
…xt receiver for network callback (#20651)

* No need to export app specific broadcast receivers

We are the only ones invoking these, so there's no need to export.  The export made things 'work' on android 14 because of changes to that api level, but that wasn't the most correct fix.

* Set package on connectivity intent

With changes in android 14, we need to scope the connectivity intent we use to trigger our own internal broadcast receiver to the current app package (which we get from the application context).
I think this comes from a time where our branching strategy was still different and we needed this. .NET 7 is old now so this can be removed. 

I don't think we need to have it for net8/9, again because our strategy is different? Let's see if we still need it when we somehow find ourselves in that situation.
* [Samples] Add repro case for issue #15815

* [iOS] Remove dead code

* [iOS] Try find a better EstimatedItemSize for horizontal list

* [uitest] Add Uitest for CollectionView

* Fix test

* Pink color
…40212.4 (#20701)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.24112.1 -> To Version 9.0.0-prerelease.24112.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update Sdk and stable iOS and Android workloads

* [ci] Don't provision mono

* Rollback to 8.0.100
* Setup Android App With More Accurate settings

* - fix iOS reset

* - fix windows

* Update HelperExtensions.cs
…te (#20725)

* Invoke ProcessNavigatedAsync for MauiWKWebView

* Add underlying API back

* Revert sandbox changes

* Use FireAndForget
* Fix transforms being offset by 0.5x0.5

* Added visual regression test

* Adjust tests

* Fix ref image

* update baseline img again...

---------

Co-authored-by: Mike Corsaro <[email protected]>
* Update Versions.targets

* Fix variable
This is just to be consistent and avoid a potential issue I saw when
testing the potential Win2D update. I am not sure why this is needed,
but appears to sometimes be needed in net7.0 scenarios.
* [iOS] NRE in GridViewLayout & xaml test (#18828)

* Added a UiTest (#19803)
* - Restructured CodeBehindGenerator pipeline to maximize SourceGen cachability
- Split out CSS SourceGen, which does not depend on Compilation at all
- Added TrackingNames to support new SourceGen unit test project

Fixes Issue #12978 CodeBehindGenerator has improper pipeline
Fixes AB#1947659: `CodeBehindGenerator` has improper pipeline

* - Use file-scoped namespaces throughout PR
- Use raw string literals for SourceGen tests
* [ci] Upload build asset data to darc/maestro

The `maui-release` pipeline has been updated to publish information
about MAUI .NET .nupkg files to the dotnet Maestro server.

With this data being published, the `darc` tool can now be used to
manage a MAUI .NET  product dependency.

For dependency updating to work, we must configure "default channel"
associations for all MAUI branches that other products may be interested
in tracking.  The `darc` tool can be used to do this manually:

    darc add-default-channel --channel ".NET 9.0.1xx SDK" --branch "net9.0" --repo https://github.com/dotnet/maui

This default channel configuration ensures that all new builds produced
by the net9.0 branch will be associated with the .NET 9 channel.  MAUI
consumers can then update to the latest build available from net9.0 with
the `update-dependencies` command:

    darc update-dependencies --channel ".NET 9.0.1xx SDK"

* Remove test props

* Fix argument indent

* Fix version prefix

* Add EnsureTrailingSlash to outdir

* Remove variable condition
* Explicitly filter to issues for comment events

* Remove references to project events
arbitary -> arbitrary
For sample MAUI projects that don't set UseMaui=true, we need to instead set DefaultXamlRuntime=true for Visual Studio intellisense and XAML hot reload to work.
…40219.1 (#20846)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.24112.4 -> To Version 9.0.0-prerelease.24119.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This fix is for MAUI devs that edit and debug sample projects in Visual
Studio (like `Maui.Controls.Sample.Sandbox`).


![image](https://github.com/dotnet/maui/assets/2523431/cfa16f54-056a-4dfd-89ee-ba3a4f0d9894)

Those sample projects normally don't set `UseMaui=true` since control
library projects are referenced directly in the solution. We need to
instead set `DefaultXamlRuntime=Maui` in order for Visual Studio
intellisense and XAML hot reload to work. VS uses either `UseMaui` or
`DefaultXamlRuntime` to determine the XAML runtime.
* Fix page swap from background

* - fix test page

* - disconnect if fragment is destroyed

* - fix tests
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	eng/devices/windows.cake
#	eng/pipelines/common/ui-tests.yml
#	src/Controls/src/SourceGen/CodeBehindGenerator.cs
@rmarinho rmarinho requested review from a team as code owners February 27, 2024 12:58
@rmarinho rmarinho changed the base branch from main to net9.0 February 27, 2024 12:58
This reverts commit 0de4f22.

# Conflicts:
#	eng/devices/windows.cake
#	eng/pipelines/common/ui-tests.yml
@rmarinho rmarinho merged commit a59e49b into net9.0 Feb 27, 2024
43 of 48 checks passed
@rmarinho rmarinho deleted the merge-main-to-net9 branch February 27, 2024 20:17
@github-actions github-actions bot locked and limited conversation to collaborators Mar 29, 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.