Skip to content

[net9.0] Merge main to net9 #28936

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

Merged
merged 30 commits into from
Apr 14, 2025
Merged

[net9.0] Merge main to net9 #28936

merged 30 commits into from
Apr 14, 2025

Conversation

rmarinho
Copy link
Member

Description of Change

Bring latest changes from main to net9.0

VitalyKnyazev and others added 29 commits April 1, 2025 12:57
* [iOS] CollectionView footer sizing fix

* Added snapshots

* Added Macos snapshot

* Update StructuredItemsViewController.cs

* Update StructuredItemsViewController.cs
* [ci] Add maui release internal

* [ci] cleanup

---------

Co-authored-by: Rui Marinho <[email protected]>
…28670)

* Fix iOS CollectionView not reacting properly to orientation changes

* Fix 28658

* Additional fixes

* Additional fixes and screenshots

* Fix EmptyView vs Header/Footer on CV1

* Update UI tests and fix one remaining failure

* Small improvement

* Enable tests on android and take screenshots to verify iOS behaves correctly

* Avoid Linq

* Reduce number of arrange passes on header/footer/empty view
)

* improve stability to flaky tests

* Updated changes

* Update CarouselViewUITests.LoopNoFreeze.cs

* Update EntryClearButtonColorShouldMatchTextColor.png
…8510)

* Update CommunityToolkit.Maui & Mvvm reference in template

* Fix MAUI Toolkit breaking changes

* Debump MVVM Toolkit

* Update MauiApp.1.csproj

* Update package version in MauiApp.1.csproj

* Add framework-specific validation flags and update package version

* Swap TextValidationBehavior Flags for frameworks
)

* Fixed flaky tests related to entry control

* Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs

Co-authored-by: Copilot <[email protected]>

* Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs

Co-authored-by: Copilot <[email protected]>

* fixed 19500 test

* reverted the common changes

* Fix typo in Issue19500.cs comments

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Shane Neuville <[email protected]>
…50403.2 (#28819)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Fixed something that looks like copy/paste error

* Fixed memory leak caused by not disposed ContextActionsCell
)

* improve stability to flaky test

* Update Issue7678.cs
* Improve TFM condition for sample content template

* Update ManageMetaPage.xaml
…fix (#28864)

* Update StructuredItemsViewController.cs

* Add UI test

---------

Co-authored-by: Alberto Aldegheri <[email protected]>
…8804)

* fixed webview backgroundcolor issue

* Test script changes

* test sample changes

* Test script changes

* Added Mac snapshots
…28872)" (#28873)

* Revert "Revert "Cleanup virtual layer measure invalidation (#28756)" (#28872)"

This reverts commit 4ff875a.

* Fix compatibility unit test
…50407.3 (#28892)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
# Conflicts:
#	eng/Version.Details.xml
@Copilot Copilot bot review requested due to automatic review settings April 11, 2025 14:33
@rmarinho rmarinho requested a review from a team as a code owner April 11, 2025 14:33
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request.

Files not reviewed (4)
  • NuGet.config: Language not supported
  • eng/Version.Details.xml: Language not supported
  • eng/Versions.props: Language not supported
  • src/DotNet/DotNet.csproj: Language not supported

@rmarinho rmarinho changed the base branch from main to net9.0 April 11, 2025 14:33
@rmarinho rmarinho changed the title [net9.0 Merge main to net9 [net9.0] Merge main to net9 Apr 11, 2025
@rmarinho
Copy link
Member Author

/azp run MAUI-public

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@rmarinho
Copy link
Member Author

/azp run MAUI-DeviceTests-public

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@rmarinho
Copy link
Member Author

rmarinho commented Apr 11, 2025

@ivanpovazan do you know why these AOT tests can t find these files , its fa
"/_/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs",

@ivanpovazan
Copy link
Member

The test failures seems to come from the fact that an expected build warning with NativeAOT, is not reported anymore in the build.

The expected list of warnings is defined here:

private static readonly List<WarningsPerFile> expectedNativeAOTWarnings = new()
{
// NOTE: this one is only expected when rooting all assemblies
new WarningsPerFile
{
File = "/_/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs",
WarningsPerCode = new List<WarningsPerCode>
{
new WarningsPerCode
{
Code = "IL3050",
Messages = new List<string>
{
"System.Text.Json.Serialization.Converters.EnumConverterFactory.CreateConverter(Type,JsonSerializerOptions): Using member 'System.Text.Json.Serialization.Converters.EnumConverterFactory.Create(Type,EnumConverterOptions,JsonNamingPolicy,JsonSerializerOptions)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation. Use System.Text.Json source generation for native AOT applications.",
}
},
}
},
};

and got introduced in: 14f33bf

I suggest retrying with the empty list of warnings ie: expectedNativeAOTWarnings = new();

@rmarinho
Copy link
Member Author

/azp run

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@rmarinho rmarinho merged commit 52f7f83 into net9.0 Apr 14, 2025
5 of 6 checks passed
@rmarinho rmarinho deleted the merge-main-net9 branch April 14, 2025 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.