-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[X] do not apply Bindings if DataType doesnt match #22056
Conversation
cdef2e5
to
f0d623a
Compare
f0d623a
to
18a2881
Compare
/rebase |
18a2881
to
81df685
Compare
/rebase |
81df685
to
df5f343
Compare
Make sure the behavior of bindings is consistent accross implementations (compiled/not compiled) fixes a bunch of issues
df5f343
to
a494445
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One the compatibility UI tests pass on this run
https://dev.azure.com/xamarin/public/_build/results?buildId=119409&view=results
let's merge
/backport to net9.0 |
Started backporting to net9.0: https://github.com/dotnet/maui/actions/runs/10060482744 |
@PureWeen backporting to net9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [X] do not apply Bindings if DataType doesnt match
.git/rebase-apply/patch:180: trailing whitespace.
.git/rebase-apply/patch:181: trailing whitespace.
[Test]
.git/rebase-apply/patch:190: trailing whitespace.
.git/rebase-apply/patch:191: trailing whitespace.
[Test]
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Binding.cs
M src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
M src/Controls/src/Xaml/XamlServiceProvider.cs
M src/Controls/tests/Xaml.UnitTests/BindingsCompiler.xaml.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/Xaml.UnitTests/BindingsCompiler.xaml.cs
Auto-merging src/Controls/src/Xaml/XamlServiceProvider.cs
CONFLICT (content): Merge conflict in src/Controls/src/Xaml/XamlServiceProvider.cs
Auto-merging src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
CONFLICT (content): Merge conflict in src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
Auto-merging src/Controls/src/Core/Binding.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 [X] do not apply Bindings if DataType doesnt match
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@PureWeen an error occurred while backporting to net9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This reverts commit cb0a332. # Conflicts: # src/Controls/src/Core/Binding.cs # src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs # src/Controls/src/Xaml/XamlServiceProvider.cs
Hi @simonrozsival ,
Is it possible to add more infos to this warning which can help to find easier the cause? Perhaps the type specified in x:DataType and current BindingContext type which not match?! Thank you |
@AlleSchonWeg thanks for the feedback. What you suggest makes sense. Could you please open a new issue so that we can track it more easily? |
@simonrozsival |
Reverted for SR8
#24046
This should be part of SR9
#23989
Description of Change
Make sure the behavior of bindings is consistent accross implementations (compiled/not compiled)
fixes a bunch of issues
Issues Fixed