[net10.0] Merge main to net10.0 #30134
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This pull request merges the latest changes from main into the net10.0 branch, updating several image resizing routines and aligning a wide range of PublicAPI definitions across Graphics, Essentials, and Core. Key changes include replacing asynchronous pump logic with a synchronous manual reset pattern in PlatformImage.cs, updating type references in PlatformCanvas.cs, and modifying numerous PublicAPI files which introduce new API signatures.
Reviewed Changes
Copilot reviewed 140 out of 264 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/Graphics/src/Graphics/Platforms/Windows/PlatformImage.cs | Updated image downsize logic; replaces async pump code with a synchronous wait tied to render target saving. |
| src/Graphics/src/Graphics/Platforms/Windows/PlatformCanvas.cs | Adjusted type checking for image conversion in the paint setting logic. |
| Various PublicAPI files (Graphics.Skia, Essentials, Core, etc.) | Added new API signatures and modified existing ones to reflect the latest design changes from main. |
Comments suppressed due to low confidence (2)
src/Graphics/src/Graphics.Skia/PublicAPI/netstandard/PublicAPI.Shipped.txt:15
- Public API signature changes have been introduced here; please confirm that these breaking changes are intentional and that corresponding documentation is updated accordingly.
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
src/Essentials/src/PublicAPI/netstandard/PublicAPI.Shipped.txt:1208
- The addition of DateTimeOffset overloads and similar modifications in public API signatures may represent breaking changes; ensure these are intentional and that they match the corresponding public documentation.
static Microsoft.Maui.Storage.Preferences.Get(string! key, System.DateTimeOffset defaultValue, string? sharedName) -> System.DateTimeOffset
…dler (#29887) * Add null check for ItemsSource before Selection/ Deselection * Add an UI test * Update null check * more null checks * Update namespace * update namespace again
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Changes in provisioning to fix fails installing Appium on Linux * Fix mistake * More changes, try to install appium drivers with elevated privileges (if normal install fails) * More changes * Display the installed drivers
* Initial plan for issue * Initial assessment and plan for Copilot development environment setup Co-authored-by: PureWeen <[email protected]> * Add comprehensive GitHub Copilot development environment instructions Co-authored-by: PureWeen <[email protected]> * Remove dotnet workload restore recommendations and enhance with DEVELOPMENT.md content Co-authored-by: PureWeen <[email protected]> * Address feedback: remove platform build commands, simplify instructions, add platform folder info Co-authored-by: PureWeen <[email protected]> * Remove cgmanifest.json and templatestrings.json files from PR and update .NET version info Co-authored-by: PureWeen <[email protected]> * Add note about DeviceTest projects not working with dotnet test Co-authored-by: PureWeen <[email protected]> * Address feedback: remove sections, fix branch name, add test paths Co-authored-by: jonathanpeppers <[email protected]> * Address all feedback: remove sections, add platform-specific file extensions info Co-authored-by: PureWeen <[email protected]> * Remove DeviceTest references and combine testing sections Co-authored-by: PureWeen <[email protected]> * Add additional test projects and remove "run all tests" instruction Co-authored-by: PureWeen <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: PureWeen <[email protected]> Co-authored-by: jonathanpeppers <[email protected]>
* Recover the uitest-build task on Android cake * Update android.cake --------- Co-authored-by: Shane Neuville <[email protected]>
* Updated FlakyTestAttribute to allow retries * Updated attribute comment based on feedback * Loggin attempt with TestExecutionContext.CurrentResult * Avoid static var * [housekeeping] Automated PR to fix formatting errors on update-flakytestattribute * Fix build errors --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update copilot-setup-steps.yml to add the local dotnet to PATH * Update copilot-setup-steps.yml * Update copilot-setup-steps.yml * Update copilot-setup-steps.yml * Update copilot-setup-steps.yml
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* added sample and test class files * Added android snap * Updated images for android and ios * Update CorePageView.cs * updated base images for windows and catalyst platform * removed unused references
) * Don’t call NSAttributedString with HTML from a background thread * Added a UITest * Refactor * add more comments and move to Controls --------- Co-authored-by: Matthew Leibowitz <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
#29371) * Fixed the shadow transparent issue on android * Updated the fix. * Added the test case and updated the fix * Added the output images. * Updated the fix. * Updated the comment. * Added the output images for mac and Windows * Updated the test case and added output images. * Added the output images
* ToolbarItem behavior with ImageSource iOS - fix * Added snapshots
* Update the comment for the test properties * Apply suggestions from code review Co-authored-by: Copilot <[email protected]> * Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs Co-authored-by: Rui Marinho <[email protected]> * Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs * Update BaseBuildTest.cs --------- Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Shane Neuville <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
#25393) * [create-pull-request] automated change (#29793) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Convert HybridWebView.js to TypeScript and embed (#27183) * Fix up relevant CA1416 warnings - Set 3 (#26751) * [Testing] Feature Matrix UITest Cases for CollectionView Dynamic changes (#29424) * Added FeatureTests for CollectionView * changes updated * changes updated * [create-pull-request] automated change (#29505) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * CA1416 warning fix * Added snapshots * Reverting files changes * Removed the old approach * Revert unwanted changes * Reverted unwanted changes * Reverted unwanted changes * Revert unwanted changes --------- Co-authored-by: NafeelaNazhir <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix up relevant CA1416 warnings - Set 1 (#26696) * Changed Syncfusion toolkit version from 1.0.4 to 1.0.5 (#29659) * [ci] Update dependencies from 9.0.4 to 9.0.5 (#29667) * [ci] Update dependencies from 9.0.4 to 9.0.5 * Update the net8 version * Add missing version MicrosoftJSInteropPackageVersion * Page.OnBackButtonPressed remove outdated API documentation (#29543) * Fixed KeepLastItemInView Does Not Scroll to Last Item When Adding Items at Top (#29632) * Fixed KeepLastItem not scrolled to last item * Updated Fix * Updated test sample * Added comment line * Updated test sample for iOS and mac * Added Snapshots for android and WinUI * Added UI tests. * Test sample changes. * script changes * script changes * Added snapshots * Resaved Mac images and the gradient image size issue has been fixed * CA1416 warning changes * Reverted unwanted changes --------- Co-authored-by: Paul Anderson <[email protected]> Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Gerald Versluis <[email protected]> Co-authored-by: Dhivya-SF4094 <[email protected]> * [iOS/Mac]Fix StrokeDashArray Property not Rendering (#29670) * fix added * Test added * snap added * [Android/ iOS] Fix Flyout icon is displayed when flyout is disabled (#29637) * fix added * modified the fix * test case added * test case added * summary added * Script name changed * [Android & iOS] Fix for SearchHandler Character Spacing Property (#29497) * [Android & iOS] Fix for character spacing in searchHandler * Updated test sample concerns * Update on naming * Update on formatting * Allowing updating character spacing to zero * Updated Andorid, iOS, Mac images * [create-pull-request] automated change (#29724) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [Windows] Fix for SearchHandler Visibility Not Updating During In-Section Navigation (#29441) * fix-17521-Updates the SearchHandler when navigating to another page within same ShellSection. * fix-17521-Added testcase and added snapshot for Android and iOS. * fix-17521-Renamed Shell_Navigated to OnShellNavigated. * fix-17521-Modified the Location string value from "Ethopia" to "Ethiopia". * fix-17521-Snapshot updated. * fix-17521-Updated Windows and Mac Snapshot. * [Windows] - Fix view position shift when shadows are added or removed at runtime (#29681) * Fix-view-position-shift-when-toggling-shadows * Added-Pending-SnapShots * Resaved-image * [Testing] Feature Matrix UITest Cases for Shadows (#27701) * Added sample to Matrix UITest Cases for Shadow * Renamed sample page * Renamed sample page * More tests * More tests * More tests * More tests * Added shadow tests * Updated sample * Added Windows snapshots * Updated tests * Added link to issue * More changes * Updated sample reset logic * Updated sample * More changes * More changes * More changes * Updated sample * Added snapshots * Hide cursor * More changes * More snapshots * Updated tests * Updated iOS snapshots * Updated iOS snapshots * Updated snapshots * Updated snapshots * Updated tests * [housekeeping] Automated PR to fix formatting errors on uitest-shadow-feature * Updated tests * Fix build errors * More changes * More changes * More changes * More changes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [iOS] Fixed Shell.SearchHandler ClearPlaceholderIcon Color Issue (#28601) * SearchHandler ClearPlaceholderIcon color fix * Added Mac snapshot * Updated SearchBar Icon changes * Test script changes. * Revert unwanted changes * Updated custom icon changes * Fix -[iOS] - CarouselView Throws ArgumentOutOfRangeException Immediately on Application Launch in CV2 (#29316) * Update ItemsSourceFactory2.cs * Update CarouselViewPositionVisibility.xaml * [Windows] Fix for ItemsSource Does Not Dynamically Set to null in CarouselView (#29660) * [Windows] Fix for ItemsSource Does Not Dynamically Set to null in CarouselView * Have added test case * Updated AutomationId for better clarity and readability * Have modified the context of the description label * Have committed the snapshots * [Testing] Feature Matrix UITest Cases for Label (#29690) * Added Label Feature tests * changes updated * changes updated * changes updated * Added Screenshots * Added Snapshots for iOS * Corrected Mistakes * Added snapshots * Added images * Renamed file --------- Co-authored-by: Rui Marinho <[email protected]> * updated base images for candidate PR failures (#29766) * [Android] Fix: Modal Animation Repeats When Returning from Background 3 (#29702) * fix * dispose listner once not needed * Revert "dispose listner once not needed" * call invalidate * add device test to check for leaks * null check and remove strong references in callback * Throw if rootview is null before adding animation * fix spelling mistake * [Testing] Include a tolerance parameter in the Verifyscreenshot method (#29776) * Added tolerance parameter to the VerifyScreenshot method * More changes * Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs Co-authored-by: Copilot <[email protected]> * Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]> * [Testing] Update Appium to v8 (#29774) * Update Appium to the latest version * Removed deprecated logic * Update comment * [create-pull-request] automated change (#29831) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Perf : ButtonContentTypeConverter now using InvariantCulture to parse double --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthew Leibowitz <[email protected]> Co-authored-by: Tamilarasan Paranthaman <[email protected]> Co-authored-by: NafeelaNazhir <[email protected]> Co-authored-by: Paul Anderson <[email protected]> Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Gerald Versluis <[email protected]> Co-authored-by: Dhivya-SF4094 <[email protected]> Co-authored-by: devanathan-vaithiyanathan <[email protected]> Co-authored-by: Subhiksha Chandrasekaran <[email protected]> Co-authored-by: BagavathiPerumal <[email protected]> Co-authored-by: prakashKannanSf3972 <[email protected]> Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: SuthiYuvaraj <[email protected]> Co-authored-by: SyedAbdulAzeemSF4852 <[email protected]> Co-authored-by: Anandhan Rajagopal <[email protected]> Co-authored-by: Bhavanesh N <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Shane Neuville <[email protected]>
* Fixed ItemSpacing on CarouselView * Added snapshot for Android and Mac * Resaved image for CarouselViewShouldRenderCorrectly
* FeatureMatrix for stepper control * Added the snapshot for windows platform * Updated StepperFeatureTests.cs * Updated StepperControlPage.xaml
…Feature (#29322) * added ItemsSource feature Tests * modified changes * updated changes * Update src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ItemsSource/CollectionViewItemsSourcePage.xaml.cs Co-authored-by: Copilot <[email protected]> * modified changes * added snapshots * modified changes * modified changes * modified changes --------- Co-authored-by: Copilot <[email protected]>
…nView in the SelectionChanged event does not clear the selection (#29288) * Fix for 10025 (Setting the CollectionView's SelectedItem to null on selection changed event does nothing) * Have added the test case * Have added the snapshots
… rotate your screen. (#29171) * fix-15154-Added proper Auto Layout constraints to ensure content wraps instead of truncating in landscape mode. * fix-15154-Prepared the testcase and snapshot added for android and iOS. * fix-15154-Modified the test condition. * fix-15154-Modified the code to align the edges of ContentView with the edges of platformView. * fix-15154-Adjusted inset constraints to respect view margins in FlyoutItem and updated Android snapshot. * fix-15154-Replaced individual .Active=true calls with batch NSLayoutConstraint.ActivateConstraints() for better performance with Shell flyout margins.
* Added changes * Fixed broken test * Updated test
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…29765) * Fixed the issue and added the test case * Modified the test case * Modified the fix * Committed the image
* added test cases * modified test cases * added test case * added snapshots * added iOS snapshots * code modified * added new test cases * added new test cases * Copilot suggestions * modified UI * added new snapshots * added the windows and mac snapshots --------- Co-authored-by: Anandhan Rajagopal <[email protected]>
…ge class (#29138) * Fix for GraphicsView ImagePaint * update for the graphics view imagePaint * Added testcase * Implementation for Downsize * Revert "Added testcase" This reverts commit ef22fa8. * Added test case * Added CreateResizedMethod * Implemented Resize method * Fix modification * Added testcase * Revert "Added test case" This reverts commit a79de0d. * Updated the changes * Update changes * Updated the testcase * Commited the changes * Updating code * Update TestCase * Code Update * Modify TestCase * TestCase Updation * Code update * Adding Snapshots * Added snapshots * Revert "Added snapshots" This reverts commit cac6f45. * Refactor code
* Fixed Test case failure in PR 25642 - snapshots * Fixed Test case failure in PR 25642 - snapshots
* Initial plan for issue * Initial plan for copilot workspace cleanup Co-authored-by: mattleibow <[email protected]> * Add copilot workspace cleanup and reset guidelines Co-authored-by: mattleibow <[email protected]> * Remove git command lines from copilot instructions per review feedback Co-authored-by: mattleibow <[email protected]> * Reset cgmanifest.json and templatestrings.json files to original state Co-authored-by: mattleibow <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: mattleibow <[email protected]>
This reverts commit 52a7f9f.
This reverts commit 315a50c.
rmarinho
force-pushed
the
merge-main-net10.0
branch
from
49b7353 to
09347e3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Bring latest changes from main to net10.0 branch