[Windows] Fix default item min height in CollectionView #12811
Merged
Conversation
This file contains 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
jsuarezruiz
added
t/bug
hartez
approved these changes
Jan 25, 2023
samhouts
added
backport/suggested
hartez
added
the
backport/approved
|
/backport to net7.0 |
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6003780301 |
|
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix default item min height in Windows CollectionView
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
M src/Controls/tests/DeviceTests/TestCategory.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/DeviceTests/TestCategory.cs
CONFLICT (add/add): Merge conflict in src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
Auto-merging src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.iOS.cs
CONFLICT (add/add): Merge conflict in src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
Auto-merging src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
CONFLICT (add/add): Merge conflict in src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
Auto-merging src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
Auto-merging src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix default item min height in Windows CollectionView
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@PureWeen an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
hartez
added a commit
that referenced
this pull request
Aug 30, 2023
* Fix default item min height in Windows CollectionView * Fixed build error
samhouts
added
the
fixed-in-8.0.0-preview.1.7762
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Fix default item min height in Windows CollectionView. With this changes we align the behavior between Windows and the rest of the platforms.
Issues Fixed
Fixes #12495
Fixes #4520
Fixes #15241