Merge NET9 GA into main #25422

PureWeen · 2024-10-21T15:30:59Z

No description provided.

…24693) This reverts commit cb0a332.

…24829) * Add padding for buttons that need it and UITest * lost some spaces in the xaml * android and windows screenshot --------- Co-authored-by: tj-devel709 <tj.devel709@gmail.com>

* test for #24849 * failing test * [C] OR EQUAL ! - fixes #24849 --------- Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

* Update rc2 versions * Update variables.yml * Updateprivate build * Make it coherant * Update NuGet.config * update * Update DotNet.csproj * Update versions * Update arcade * Update provision.yml * Update provision.yml * Update provision.yml * Update provision.yml * Update provision.yml * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10203443 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.101 -> To Version 35.0.0-rc.2.107 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10204821 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.107 -> To Version 35.0.0-rc.2.109 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24463.1+azdo.10221673 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.109 -> To Version 35.0.0-rc.2.111 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24469.1+azdo.10247408 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.111 -> To Version 35.0.0-rc.2.115 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24474.1+azdo.10268209 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.115 -> To Version 35.0.0-rc.2.117 * Update dependencies from https://github.com/dotnet/android build main-e885d694c51db9733305ba331519dd01df6076a4-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.117 -> To Version 35.0.0-rc.2.130 * Try pin windows sdk projection WindowsSdkPackageVersion * Windows appsdk version workaround * Provision less * Update androdi version * Update iOS * update versions * Update Versions.props * Update NuGet.config * Update Directory.Build.props * Fix iOS warning * Ignore CA1422 too * Bump to xcode 16 * Bump xcode * Update NewTaskSceneDelegate.cs * Update ui-tests.yml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24480.1+azdo.10308467 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.134 -> To Version 35.0.0-rc.2.143 * darc update-dependencies --id 240434 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

- fixes #24900 Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

…licate groups or crashes when adding a new item to a group or when adding a new group. (#25030) * [iOS] CollectionView issue fix. * Added test case. * Added snapshots. --------- Co-authored-by: Tamilarasan Paranthaman <tamilarasan.paranthaman@syncfusion.com>

I recorded these with the `35.0.0-rc.2.145` Android workload as there was one change that disables `$(AndroidEnableMarshalMethods)` that impacts `.aotprofile` files: * dotnet/android@afb5f7e With this change in place, managed C# methods like these will reappear in the profile: bool Android.Runtime.AndroidTypeManager:FastRegisterNativeMembers (Java.Interop.JniType,System.Type,System.ReadOnlySpan`1<char>) ... bool Android.Runtime.JNINativeWrapper:Wrap_JniMarshal_PPJ_Z (_JniMarshal_PPJ_Z,intptr,intptr,long) bool Android.Runtime.JNINativeWrapper:Wrap_JniMarshal_PPL_Z (_JniMarshal_PPL_Z,intptr,intptr,intptr) bool Android.Runtime.JNINativeWrapper:Wrap_JniMarshal_PPLLJ_Z (_JniMarshal_PPLLJ_Z,intptr,intptr,intptr,intptr,long) ... System.Delegate Android.App.Activity:GetOnActivityResult_IILandroid_content_Intent_Handler () System.Delegate Android.App.Activity:GetOnBackPressedHandler () In the future, we hope to bring back `$(AndroidEnableMarshalMethods)` once the known issues are worked out. Measuring the new profile on a Pixel 7 Pro, an average of 10 runs of the `dotnet new maui` project template: Before: Average(ms): 475.2 Std Err(ms): 3.96316371938716 Std Dev(ms): 12.5326240934078 After: Average(ms): 447.1 Std Err(ms): 1.75404294892305 Std Dev(ms): 5.54677083235522 So, this change likely avoids some startup regression on Android, as the C# methods that run on startup when `AndroidEnableMarshalMethods=false` are now AOT-compiled. I also added `-bl` to the `README.md`, as I thought that was useful. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

The 0.0.0.0 address stopped working in iOS 18/MacCat, and is possibly going to stop working in other platforms/webviews, so it's being changed to 0.0.0.1, which has been verified to work. Fixes #24364 Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

…ttempt 2) (#25041) * Move HybridWebView platform code to handlers And run everything through the mappers. Fixes #24269 * Run Android tests * `@android.webkit.JavascriptInterface` is missing! By changing `HybridJavaScriptInterface` to a class, the JCW now says: @android.webkit.JavascriptInterface public void sendMessage (java.lang.String p0) --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

* [testing] Enable test again * [testing] Enable CollectionViewHandler2 on UITests * Try new changes * try new fix * [iOS] Dont call InitialUpdatePosition on attach, wait for LayoutSubViews * Try update when navigating back * Try this * Add missing usings * Try this * Fix more stuff * Fix test on mac * Try again * Ignore tests on windows and android * Use the ItemsView position on compare * Try this * Fix * Cleanup * Fix test naming * Cleanup * try skip android install on public bots * Update device-tests-steps.yml * Use our bots

…0-rc.2.24502.1+azdo.10320367 (#25058) Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.145 -> To Version 35.0.0-rc.2.152 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…#25075) * [X] allow namescope resolution before parenting when an element doesn't override the NameScope (DataTemplate, etc...) FindName fails until the element is parented. this PR sets a field (less expensive than a BP) used only during that time, and allow VSM to be applied. - fixes #22001 * fix * fixes #16208 --------- Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

…ad of `postInvalidate` (#25121) * Revert #24222 and simply use `invalidate` instead of `postInvalidate` * - update aar file --------- Co-authored-by: Alberto Aldegheri <albyrock87@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* [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>

…able) Ruins Entry Controls (#25159)

…xt or image change (#25214) * allow remeasure for title and image change * more screenshots 2 * more screenshots 3

…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

* [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>

* Patch 001 * Add WebView2 ref to Controls.Core * Add another package ref * Bump SDK versions * Bump winappsdk version * Add missing package ref * Update NuGet.config * Update Directory.Build.props * Use SDK v38 * Remove refs to WebView2, use `WindowsAppSDK` * Add more package refs * Use the correct way to check for a window style (see: OverlappedPresenter.HasTitlebar impl) * More pkgs for webview * Mark test as unstable * TEST: add monitor info for test context * Revert change, try manually setting button height...?! * Move style * Revert change Ensure font is the same pre-1.6 * Ensure more fonts are consistant * Bump SDK version Add workaround * Update images for tests * Update more images * Huh * Maybe fix crashes * Remove package from test cases * ugh * www * Ehh * Changes for AOT Revert workaround for items list * Font test * Test font again * Remove refs to winappsdk where it's not needed Add explicit ref to WebView2 package * Fix some missing refs * Remove winappsdk ref in graphics projects * Add explcit "Microsoft.Windows.SDK.NET.Ref" versions * NOP failing test Fix build issue * - publish binlogs * - fix logs * Update maui-templates.yml * Fix issue w/ dupe package contents * Throwing stuff at the wall * Update winsdk and dotnet versions * Revert SDK version * Modify AOT compat check * Re-bump winappsdk version * Fix SDK pack version * Fix nested partial types * DOh * Update test image * Remove dupe properties * Remove work-around * Fix merge issues * WTF? * Blah --------- Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

# Conflicts: # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png

…sion to enable browser dev tools (#25330) * Add services.AddHybridWebViewDeveloperTools() extension to enable browser dev tools Previously the browser dev tools were always enabled for HybridWebView. Now it's optional. Fixes #22305 * Tizen --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>

Context: ce01c15 We've decided hold off on this change until .NET 10.

…n when logging warning as error (#25326) * Fix passing message args to BuildException in XamlCTask * Avoid using string.Format with null args --------- Co-authored-by: Simon Rozsival <simon@rozsival.com>

…lation mode (#25298) * Make sure XC0025 is not treated as error unless in strict mode * Remove incorrect comment --------- Co-authored-by: Simon Rozsival <simon@rozsival.com>

…t 🤖 (#25383) * Update dotnet_bot.png * Update net9 template image semantic description --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

{StaticResource} are now compiled when possible, there was an issue, throwing NRE, when the target property of the resource is of generic type. It was only possible to depict in the very contrived and overengineerd design of the converters in Community toolkit. - fixes #25309 Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

### Description of Change Rollup changes that are going into .NET 8 SR9.2 so that they are also released with .NET9 GA

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

…ndalone bindings" (#25295)

…ium (#25401)

# Conflicts: # Directory.Build.props # Directory.Build.targets # NuGet.config # eng/Version.Details.xml # eng/Versions.props # eng/pipelines/common/maui-templates.yml # eng/scripts/appium-install.ps1 # src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs # src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs # src/Controls/tests/TestCases.HostApp/Issues/Issue24583.cs # src/Controls/tests/TestCases.HostApp/Issues/Issue25038.xaml.cs # src/Controls/tests/TestCases.HostApp/Issues/Issue3089.cs # src/Controls/tests/TestCases.HostApp/Issues/Issue3333.cs # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonPaddingIsAddedWhenNeeded.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonResizesWhenTitleOrImageChangesAltered.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonResizesWhenTitleOrImageChangesOriginal.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonTitleFillsSpaceWhenImageChangesAltered.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonTitleFillsSpaceWhenImageChangesOriginal.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntryClearButtonColorShouldMatchTextColor.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue13474Test.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22899Test.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SelectedTabIconShouldChangeColor.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TabbedPageUnselectedBarTextColorConsistency.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsAfterScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TextsInEditorsBeforeScaling.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateToolbarItemAfterNavigate.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ValidateEntryClearButtonVisibilityBehavior.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_NoBorder.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage4.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage6.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibility.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyGreyShades.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyOpaqueModalDefault.png # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTransparentModalShowsPageBeneathModal.png # src/DotNet/DotNet.csproj # src/Graphics/samples/GraphicsTester.WinUI.Desktop/GraphicsTester.WinUI.Desktop.csproj # src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs

PureWeen · 2024-10-22T00:27:53Z

src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs

-			{
-				Controller?.DisposeItemsSource();
-			});
+			Controller?.DisposeItemsSource();


FYI @rmarinho

jsuarezruiz · 2024-10-22T08:52:27Z

Have seen some ListView tests failing in several recent PRs after rebase main:

Differences:

Here lost the selection text color.

No header/footer.

I am going to investigate this more.

rmarinho

Have seen some ListView tests failing in several recent PRs after rebase main:

Differences:

Here lost the selection text color.

No header/footer.

I am going to investigate this more.

As we talked on the chat this is a problem now on main also. and a regression on CV2. #25157 disables that test for now, but we can merge this pr as is

PureWeen and others added 30 commits September 11, 2024 19:13

Revert "[X] do not apply Bindings if DataType doesnt match (#22056)" (#…

f91ee55

…24693) This reverts commit cb0a332.

8.0.90 Release Branding (#24727)

d20d980

[release/8.0.1xx-sr9] Add Padding for iOS Buttons in some scenarios (#…

a249a31

…24829) * Add padding for buttons that need it and UITest * lost some spaces in the xaml * android and windows screenshot --------- Co-authored-by: tj-devel709 <tj.devel709@gmail.com>

[release/8.0.1xx-sr9] [C] fix specificity comparison (#24908)

adcbc7d

* test for #24849 * failing test * [C] OR EQUAL ! - fixes #24849 --------- Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

8.0.91 Release Branding (#24915)

0fce6c7

[mac] Fix NSWindow usage

61dd202

Update windows samples

6e61993

[C] avoid NRE on null GesturRecognizer (#25029)

b2ab38e

- fixes #24900 Co-authored-by: Stephane Delcroix <stephane@delcroix.org>

Preview SR9.2 branding (#25161)

ad27103

[release/8.0.1xx-sr9] Fixed Microsoft.Maui.Controls 8.0.90 (Latest st…

54268ce

…able) Ruins Entry Controls (#25159)

[net9] Enable TSA on release pipeline

d3784a4

[release/8.0.1xx-sr9] Fix Regression with iOS button resizing with te…

0294301

…xt or image change (#25214) * allow remeasure for title and image change * more screenshots 2 * more screenshots 3

Update aar file

57404b8

Fix Missing IXamlDataTypeProvider.cs from Merge

a684dc3

[release/9.0.1xx] Fix tsa file not found (#25255)

227b1b7

* [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

PureWeen and others added 16 commits October 18, 2024 17:28

Fix Test Screenshots (#25381)

20a9123

Merge branch 'release/9.0.1xx' into merge_sr9_into_net9_ga

af43d7e

# Conflicts: # src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png

[nuget-msi-convert] Do not use new VS component IDs (#25355)

f5ca66a

Context: ce01c15 We've decided hold off on this change until .NET 10.

[release/9.0.1xx] [XC] Fix passing message arguments to BuildExceptio…

ee8740a

…n when logging warning as error (#25326) * Fix passing message args to BuildException in XamlCTask * Avoid using string.Format with null args --------- Co-authored-by: Simon Rozsival <simon@rozsival.com>

[release/9.0.1xx] [XC] Report XC0025 as an error only in strict compi…

48fb344

…lation mode (#25298) * Make sure XC0025 is not treated as error unless in strict mode * Remove incorrect comment --------- Co-authored-by: Simon Rozsival <simon@rozsival.com>

[release/9.0.1xx] Update .NET MAUI template with .NET 9 hovercraft bo…

6d7b447

…t 🤖 (#25383) * Update dotnet_bot.png * Update net9 template image semantic description --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>

Merge branch 'release/9.0.1xx' into merge_sr9_into_net9_ga

676fcbb

Fix ScreenShots for New visual comparison code

11d68e2

Merge sr9 into net9 ga (#25265)

7cef4c0

### Description of Change Rollup changes that are going into .NET 8 SR9.2 so that they are also released with .NET9 GA

[release/9.0.1xx] Re-enable tests (#25268)

0f5642c

Disable TitleViewSetOnShellWorksAfterNavigation (#25400)

72d04a4

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

[release/9.0.1xx] [XC] Propagate x:DataType from parent scope to "sta…

59ed3a7

…ndalone bindings" (#25295)

[release/9.0.1xx] Move TitleViewSetOnShellWorksAfterNavigation to App…

8f72974

…ium (#25401)

Fix Titlebar name API and add templates (#25390)

35ec88f

PureWeen requested a review from a team as a code owner October 21, 2024 15:30

PureWeen requested review from Eilon, tj-devel709 and rmarinho October 21, 2024 15:31

PureWeen force-pushed the merge_ga_into_main branch from 03c1135 to af52ebf Compare October 21, 2024 15:39

PureWeen changed the title ~~Merge NET9 GA in MAIN~~ Merge NET9 GA into main Oct 21, 2024

PureWeen commented Oct 22, 2024

View reviewed changes

rmarinho approved these changes Oct 22, 2024

View reviewed changes

PureWeen merged commit 0f79050 into main Oct 22, 2024
106 of 108 checks passed

PureWeen deleted the merge_ga_into_main branch October 22, 2024 14:26

github-actions bot locked and limited conversation to collaborators Nov 23, 2024

samhouts added the fixed-in-9.0.10 label Dec 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge NET9 GA into main #25422

Merge NET9 GA into main #25422

PureWeen commented Oct 21, 2024

PureWeen Oct 22, 2024

jsuarezruiz commented Oct 22, 2024

rmarinho left a comment

Merge NET9 GA into main #25422

Merge NET9 GA into main #25422

Conversation

PureWeen commented Oct 21, 2024

PureWeen Oct 22, 2024

Choose a reason for hiding this comment

jsuarezruiz commented Oct 22, 2024

rmarinho left a comment

Choose a reason for hiding this comment