Skip to content

Conversation

@rmarinho
Copy link
Member

Description of Change

Bring latest changes from main to net9.0 branch

rmarinho and others added 30 commits April 11, 2025 15:38
* [ai]Add release notes prompt

* Improve prompt release notes

* [ai] improve prompt

* [ai] Try map commits to github users

* Small update to get correct github user

* [ai] Add list of common users

* [ai] Remove extra vriable
…50409.2 (#28963)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ted Constraint (#28479)

* Stop iOS SetNeedsLayout propagation by looking at VisualElement computed constraints

* Do measure when MauiView is acting as root view due to fixed constraints
* Fix some Flaky UI tests that fails on android

* Add helper to wait for more button

* throw when platform is not supported

* space
…ignment (#25827)

* Fixed Keyboard scrolling in editors with Center or end VerticalTextAlignment is off

* Modified the code change to consider content offset value

* Removed unwanted file changes

* Removed test cases

* Modified changes

* Modified the code changes and included UI test

* Removed unwanted code changes

* updated changes

* optimized changes

* updated test case

* Added a button for Start

* Changes in MauiTextView

---------

Co-authored-by: Matthew Leibowitz <[email protected]>
Co-authored-by: Dhivya-SF4094 <[email protected]>
…8545)

* [iOS] Changing carousel view orientation with disabled loop - fix

* Added snapshots
* Fixed - 18418 : ScrollView Orientation=Neither not working

* updated ScrollViewerExtensions.cs

* Disable the scroll in ios when orientation is neither.

* updated ScrollViewHandler.iOS.cs

* testcases updated.

* Apply suggestions from code review

* Apply suggestions from code review

---------

Co-authored-by: Gerald Versluis <[email protected]>
* fix for 26792

* Update HideSoftInputOnTappedChangedManager.Platform.cs

* Testcases added

* Comments updated

* Condition modification
…s into device tests - 3 (#28103)

* Added the CornerRadius and IsEnabled property for DeviceTest

* IsEnabled property for Device tests

* Addressed the feedbacks

* Update BoxViewTests.cs

* modified code changes

* resolved windows build error

* Update RadioButtonTests.Windows.cs

* Update CheckBoxTests.iOS.cs

* removed unwanted namespace

* Update CheckBoxTests.cs

* Update SwipeViewTests.Android.cs

* Update BoxViewTests.Android.cs

* Resolved build error in windows

* Update RadioButtonTests.Windows.cs

* Added the CornerRadius and IsEnabled property for DeviceTest

* IsEnabled property for Device tests

* Addressed the feedbacks

* Update BoxViewTests.cs

* modified code changes

* resolved windows build error

* Update RadioButtonTests.Windows.cs

* Update CheckBoxTests.iOS.cs

* removed unwanted namespace

* Update CheckBoxTests.cs

* Update SwipeViewTests.Android.cs

* Resolved build error in windows

* Update RadioButtonTests.Windows.cs

* Update CheckBoxTests.Android.cs

* Resolved conflict errors

* Update BoxViewTests.Android.cs

---------

Co-authored-by: nivetha-nagalingam <[email protected]>
…igation (#28240)

* Fixed drawer toggle button visiblity

* Update ToolbarExtensions.cs

* added test cases

* added shell test cases

* Update NavigationPageToolbar.cs
…not update text in the search box (#28400)

* Fix for query not updating during runtime

* Fix for SearchHandler

* Fix for SearchHandler Dynamic Update

* Fix for Dynamic SearchHandler QueryProperty

* Fix for query not updating in runtime

* Fix for searchHandler

* Updating the images

* Revert "Updating the images"

This reverts commit d3959fe.

* Modified Test case for search Handler

* Modifying the testcase and. the code
…g Between Groups in CollectionView (#28623)

* Fixed the CanMixGroups Set to False Still Allows Reordering Between Groups in CollectionView

* Committed the test case and sample

* Committed the pending snap
…ed at runtime (#28636)

* Placeholder issue fix

* Added Android snapshot

* Added Mac and Windows snapshots
…s into device tests - 8 (#28496)

* code changes added

* updated code
* Resolved the ScrollView TestFailures in Inflight.

* updated ReorderBetweenGroupsShouldNotOccurWhenCanMixGroupsIsFalse ios image

* Updated EntryClearButtonColorShouldMatchTextColor mac image
…r Feature (#28938)

* Added feature tests for Header/Footer

* added test cases

* update the test cases

* update the changes

* modified

* updated the test cases

* update the changes

* update the changes

* updated the UI and Test cases

* Updated test cases

* add fails attributes

* updated

* modified changes

* updated changes

* renamed
* Resolved the flakey 28530 test

* Resolved the test failures

* Removed unwanted changes

* Committed the Android image for the modified test
…9005)

Use an explicit XML namespace for Component, avoiding use
qualified name syntax in the x:Type binding. Qualified names
(like `local:Components.Routes`) aren't currently supported by
XAML Hot Reload, producing the error
"Nested types are not supported: Components.Routes"
and causing XAML Hot Reload to not work. This support
is coming in a future VS update, but for now it's best to avoid
using of the qualified name syntax in our templates, to keep
things broadly compatible and working for new users. We
don't use qualified names in XAML bindings anywhere else
in MAUI XAML templates; this is the last occurrence.

Fixes #20669
### Description of Change

Only PRs related to fixing this branch should be merge here

For more information about inflight process check
#28486
* Changes to try to fix android emulators boot issues on Linux

* More changes

* More changes, manually authorize emulator

* More changes

* More changes

* More changes
NirmalKumarYuvaraj and others added 15 commits May 5, 2025 12:04
* Fixed flaky editor test

* Added scroll down again to double check

* Optimized code changes and added new test snapshots

* Added missing WinUI snap
* fix

* enable Bugzilla31255Test

* add device test

* make _element a weak reference directly

* fix device test

* Use AssertMemoryTest in UITest
…nputView will increase the Label's height (#29210)

* Fixed the Label Measurement issue in Android

* Included the test sample and case

* Committed the fix changes and included the images

* Committed the test sample changes

* Android image added

* Updated the mac image

* Modified the review changes
* work for iOS and Android

* sample code to remove later

* working when changing selectionMode with iOS and android

* UITests

* Adds windows to UITest

* add tests for CV2

* screenshots 1

* screenshots 2

* screenshots 3

* screenshots 4

* add windows delay and rename similarly named tests

* screenshots 5

* screenshots 6

* screenshots 7

* typo in class name

* removing android stuff
…sample (#29315)

* Applied CV1 to all the failing test cases.

* Update src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue7678_1.cs

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

* Update src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue7678.cs

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

* Addressed the feedback

---------

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

* fix for flaky tests fails on candidate branch

* fix some more flaky tests on android

* Update Issue2809.cs

* Update HelperExtensions.cs

* Update Issue2809.cs
For more information about inflight process check
https://github.com/dotnet/maui/wiki/Inflight-Branch-Process

## .NET MAUI Release Notes - inflight/candidate

This document contains release notes for changes from main branch to
inflight/candidate branch.

### MAUI Product Fixes
* [iOS] Fix: FlyoutPage memory leak by @bhavanesh001 in
#28769
* [Windows] Fix for CarouselView IsSwipeEnabled=False Prevents Visual
Navigation by @SubhikshaSF4852 in
#29286
* [Windows] Fix for Argument Exception raised when the GetStringSize
method of ICanvas called with default font by @SyedAbdulAzeemSF4852 in
#29048
* Removed frame styles by @Vignesh-SF3580 in
#29222
* [Android] Fixed the CollectionView Header and Footer Do Not Align with
Horizontal ItemsLayout When EmptyView is Displayed by @Ahamed-Ali in
#28779
* Add global xmlns in template by @StephaneDelcroix in
#29203
* Fixed - On iOS GestureRecognizers don't work on Span in a Label, which
doesn't get IsVisible (=true) update from its parent by
@KarthikRajaKalaimani in #29024
* Fixed Footer not displayed at the Bottom When EmptyView in CV2 by
@Dhivya-SF4094 in #28681
* Fixed typo in Connectivity.shared.cs by @corvinsz in
#29213

### Testing
* Re-enabled flaky UI test TextInEditorShouldScroll by
@NirmalKumarYuvaraj in #29167
* [Testing] Re-Enabled UI Test - Issue10222Test by @TamilarasanSF4853 in
#29226
* [Testing] Feature Matrix UITest Cases for CollectionView Selection
Feature by @LogishaSelvarajSF4525 in
#29165

### Dependency Updates
*No dependency updates in this release*

### Docs
*No documentation changes in this release*

### Housekeeping
*No housekeeping changes in this release*

## New Contributors
* @corvinsz made their first contribution in
#29213

**Full Changelog**:
main...inflight/candidate
…and image cropping issue (#29204)

* removed EnterFullScreen workaround for ScrollViewUITests

* Updated mac images from CI

* Update SwitchOnOffVisualStatesTest_SwitchOn.png
* Setup Stage for Validating CarouselView2

* Update ui-tests.yml

* Update ui-tests.yml

* - force LineBreakModeInCarouselViewShouldWork to only use CV1
* [ci] meta to publish

remove that extra

Try this

try version

try without build

Try push rollbacks and sdks

[ci] Suffix with sdk/rollback

* Update Microsoft.NET.Sdk.Maui.Manifest.csproj
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
Copilot AI review requested due to automatic review settings May 10, 2025 11:29
@rmarinho rmarinho requested a review from a team as a code owner May 10, 2025 11:29
@rmarinho rmarinho requested a review from a team as a code owner May 10, 2025 11:29
@rmarinho rmarinho requested review from PureWeen and jfversluis May 10, 2025 11:29
Copy link
Contributor

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.

Pull Request Overview

This pull request brings the net9.0 branch up to date with main.

  • Merges in the latest pipeline configuration updates including additional branch support and parameterized timeouts.
  • Introduces a new Cake task to generate the cgmanifest.json file with corresponding documentation updates.
  • Applies several adjustments to device preparation and build scripts to improve reliability.

Reviewed Changes

Copilot reviewed 582 out of 591 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
eng/pipelines/common/variables.yml Added 'refs/heads/inflight/current' to the signing condition branch list.
eng/pipelines/common/ui-tests.yml Updated timeout values to use a parameter and added a new stage for iOS Mono CarouselView2 tests.
eng/pipelines/common/ui-tests-steps.yml Expanded Appium doctor check to include Linux and increased the retry count.
eng/pipelines/arcade/stage-pack.yml Inlined build commands for pack and sign, with commented-out legacy scripts.
eng/devices/android.cake Adjusted the ADB restart interval and introduced a new EnsureAdbKeys function.
eng/cake/dotnet.cake Added a new task "GenerateCgManifest" for cgmanifest.json generation.
docs/README.md Documented the new CG Manifest file and its purpose.
docs/CgManifest.md Added new documentation for the Component Governance Manifest.
build.cake Minor formatting updates.
.github/policies/resourceManagement.yml Updated policy responses for API change notifications.
.github/PULL_REQUEST_TEMPLATE.md Inserted a note to prompt testing of the resulting artifacts.
Files not reviewed (9)
  • .config/dotnet-tools.json: Language not supported
  • .vscode/mcp.json: Language not supported
  • eng/CgManifest.targets: Language not supported
  • eng/Publishing.props: Language not supported
  • eng/Signing.props: Language not supported
  • eng/Version.Details.xml: Language not supported
  • eng/Versions.props: Language not supported
  • eng/Versions.targets: Language not supported
  • eng/automation/cspell/cSpell.json: Language not supported

Run the `GenerateCgManifest` task:

```bash
dotnet tool resotre
Copy link

Copilot AI May 10, 2025

Choose a reason for hiding this comment

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

Possible typo detected: 'resotre' should be corrected to 'restore'.

Suggested change
dotnet tool resotre
dotnet tool restore

Copilot uses AI. Check for mistakes.
@rmarinho
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

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

@rmarinho
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

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

@rmarinho rmarinho merged commit 531120a into net9.0 May 12, 2025
6 of 7 checks passed
@rmarinho rmarinho deleted the merge-main-net9 branch May 12, 2025 16:47
@github-actions github-actions bot locked and limited conversation to collaborators Jun 12, 2025
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.