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

[net10.0] Merge main to net10.0 #28044

Open
wants to merge 46 commits into
base: net10.0
Choose a base branch
from
Open

[net10.0] Merge main to net10.0 #28044

wants to merge 46 commits into from

Conversation

rmarinho
Copy link
Member

Description of Change

Bring latest changes from main to the net10.0 branch

spadapet and others added 30 commits February 21, 2025 09:44
…27893)

* Run tests verifying snapshots on mac now that's possible

* Added snapshots
… bundles (#27788)

### Description of Change

This is for MAUI Blazor Hybrid apps. CSS Hot Reload from Visual Studio
wasn't working for scoped CSS files that come from Razor Class
Libraries.

During the build, the scoped CSS files get built into a bundle called:
* `LibraryName.<fingerprint>.bundle.scp.css`

At runtime, CSS Hot Reload will trigger a scoped CSS build, which
outputs:
* `LibraryName.bundle.scp.css`

Fingerprints are not included during that part of the build. This fix
will match the original fingerprinted name to the newly built name and
allows CSS hot reload to work.

This was the PR that introduced fingerprinting:
* dotnet/sdk#41244

### Issues Fixed

* [Bug
2272902](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2272902):
[MAUI][Hot Reload] The web page doesn't apply the changes in
RazorClassLibrary\xx.razor.css file after referencing RazorClassLibrary
App from MAUI Blazor App
…s into device tests - 1 (#27695)

* Migrated X.Forms Compatibility Unit test into MAUI Device Test

* reverted ButtonDisabledColorWorks migration

because this test fails unable to get the current color.

* Updated background color tests on more controls

* removed unused usings

* Update ButtonTests.cs

* reverted the searchBar fixes
* Changes in flaky tests

* Updated test

* Increase timeout

* Marked test as flaky
…ion - 12 (#27804)

* enable the test cases for all platforms

* Enable testcases for All platforms

* added snap for issue17884

* updated the changes

* modified changes

* modified changes for issue18193

---------

Co-authored-by: HarishKumarSF4517 <[email protected]>
…ion - 13 (#27904)

* Enable Migrated Cases in All platforms

* Updated Changes

* Update CarouselViewUITests.UpdatePosition.cs
…ion - 4 (#27561)

* Enable Migrated Cases in All platforms

* Updated Issue20842 and UpdateCurrentItem.cs

* Updated Snapshots

* Updated Snapshots

* Update EditorScrollingWhenEnclosedInBorder.png

* Updated Changes

* Update EditorScrollingWhenEnclosedInBorder.png

* Update Issue20736.cs

* Updated Changes

* Updated changes

* Added Mac Snapshot
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…NAL_STORAGE is Granted (#27975)

* fix

* Removed CA1416 warning suppression
…ion - 2 (#27500)

* enable test cases for all platform

* update the changes

* modified the issue25371

* added the snapshot for issues

* update the changes

* reverte the Issue935 and issue12652

* added snapshot for issues

* added the snap

* replace snapshots

* added the snapshot

* remove the mac full screen snapshot

* update the changes

* modified changes

* added the snapshot for Issue9951
…ion - 14 (#27906)

* enable the test case for all platform

* modified changes

* modified

* added the snapshot

* modified

* update the changes

* added a snapshot for windows
… - 2 (#27405)

* Migrated the ContextMenu related test cases

* Addressed the feedback and added one more case

* Removed snapshots and updated the some test cases

* Added the comments
…ion - 9 (#27743)

* Enabled TestCases in All platforms

* Updated changes

* Updated Snapshots

* Updated Mac Snapshots

* Update Issue25362.cs
…ion - 10 (#27751)

* Migrated the 8 cases from issues folder

* Addressed the feedbacks

* Migrated the 8 cases from issues folder

* Updated the snapshots for Mac platform

* Updated the Issue20920

* Updated the Issue20920.cs

* Added the images for mac platform

* Addressed the feedbacks

* Updated the Issue20920

* Issue5191 test enabled for the Mac platform

* Migrated the 8 cases from issues folder

* Migrated the 8 cases from issues folder

* Updated the Issue20920

* Added the images for mac platform

* Addressed the feedbacks

* Updated the Issue22306
)

* enabled flaky UITest cases

* updated changes

* updated changes

* Updated Image

* updated Android image
* Verified the flaky test cases

* Verified the Flaky related test cases

* Addressed the Feedbacks

* Added the Issue20535

* Added the comment to the  Issue2354

* Update the snapshot for Windows platform
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
The `_PublishBlobItems` target in `eng/Publishing.props` needs to hook
into the publishing targets, and it looks like `PublishDependsOnTargets`
can be used to accomplish this.
…View (#27669)

* Added repro sample

* Added UITest

* Some changes based on the issue attached log (cannot repro the issue)
* Fixed the IsEnabled property dynamic updating issue.

* Updated the fix and added the test case.

* Added the output images for android and iOS

* Updated the fix and test case.

* Added the output image.

* Updated the test case and output image

* Added color for check box

* Updated windows image.

* Added the macOS output image
jfversluis and others added 5 commits February 25, 2025 12:42
* [ci] Remove usage on cake script

* [ci] Restore packages with net10  by not using PackagePruning
…ion - 11 (#27764)

* enable test case for all platforms

* update the changes

* modified changes

* replace snapshot

* update the changes

* modified changes

* modified
@rmarinho rmarinho added this to the .NET 10.0-preview2 milestone Feb 25, 2025
@rmarinho rmarinho requested review from tj-devel709 and a team as code owners February 25, 2025 19:37
@rmarinho rmarinho enabled auto-merge February 25, 2025 19:39
@rmarinho rmarinho changed the title Merge main net10 [net10.0] Merge main to net10.0 Feb 25, 2025
@rmarinho
Copy link
Member Author

/azp run

jonathanpeppers and others added 11 commits February 25, 2025 16:08
* [android] move `IsDispatchRequiredImplementation()` to Java

Context: #8919
Context: https://github.com/jonathanpeppers/MAUI_CollectionView/tree/net9.0

Profiling the above sample, I saw a lot of time in:

    46.21ms (0.89%)	0.00ns (<0.01%)	Microsoft!Microsoft.Maui.Dispatching.Dispatcher.IsDispatchRequiredImplementation()

`Microsoft.Maui.Dispatching.Dispatcher.IsDispatchRequired` looks like
it is called *a lot* by .NET MAUI, so it's likely worth improving here.

Almost all of the time is spent on the check:

    _looper != Looper.MyLooper();

`MyLooper()` does interop to Java, and then bookkeeping to create a C#
instance of the `Looper`.

You can see this time spent inside `IsDispatchRequiredImplementation()` as:

    20.18ms (44%) Mono.Android!Java.Lang.Object.GetObject(intptr,Android.Runtime.JniHandleOwnership)

If we instead move the call to Java, C# can instead call a new
`PlatformDispatcher` type that extends `Handler`:

    _dispatcher.IsDispatchRequired;

So now C# calls a Java method that simply returns a `bool`, and no C#
`Looper` instance has to be created or managed. This completely
removes the ~20ms or so we see spent in `Java.Lang.Object.GetObject()`.

This will also help performance tiny amount at startup, as we don't
call `MyLooper()` or `MainLooper` any longer in C#, when creating the
`Dispatcher`.

* Update src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformDispatcher.java
* [ci] Move device tests to Sequoia

* [ci] Fix provisioning uitests

* [ci] Move templates to Sequoia

* [ci] Make sure to run iOS tests on 18.0 simulators
* remove Dispose call on ShellItemRenderer

* update publicAPI txt
* Added UITest for SliderControl

* Modified changes in UI

* Modified UI Test cases

* Added snapshots for Android

* Updated the images for android

* Added images for IOS

* Addressed feedbacks

* Added images for Catalyst and Windows

* Added Markdown File

---------

Co-authored-by: Anandhan Rajagopal <[email protected]>
* Fix naming

* More changes

* Updated test

* Updated snapshot

* More changes
…27610)

* [BindingSG] Added Binding.Create support for xaml generated sources

* Removed redundant checks from BindingCreate verification
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* add DebuggerTypeProxy for Shell

* add DebuggerTypeProxy for ShellItem and BaseShellItem

* add DebuggerTypeProxy for ShellSectionCollection

* add DebuggerTypeProxy for ShellSection and Collection
* [ci] Always provisioning on devdiv

* [ci] Don t provision tvOS

* Provision uitests

* [ci] Fix uitest steps provisioning
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.