Move IBinding to BindingBase and tidy up some binding APIs (#19589)

* Update ncrunch config.

* Tidy up reflection and multi-binding APIs:

- Move `BindingBase` and `MultiBinding` into Avalonia.Base
- `BindingBase` becomes a true base class for all bindings, and contains only the `Instance` method
- Properties common between reflection and compiled bindings are moved into `StandardBindingBase`
- `Binding` is moved to Avalonia.Base and renamed to `ReflectionBinding`
- A compatibility shim for `Binding` remains in Avalonia.Markup
- Remove `IBinding` and `IBinding2`
- Remove `ITreeDataTemplate's usage of `InstancedBinding`
- Remove `NativeMenuBarPresenter`s usage of `InstancedBinding`
- Remove `InstancedBinding` as it is now unused

This required an update to the DataGrid submodule: cell data validation has been temporarily removed as this used `InstancedBinding`.

* `Instance()` => `CreateInstance()`.

The use of "Instance" as a verb is quite unusual apparently ;)

* Seal classes where appropriate.

* Seal classes where appropriate.

* Remove `StandardBindingBase`.

Simply duplicate the members in reflection and compiled binding classes.

* Delete deleted submodule directory.

* Add missing attribute.

Fixes compile error.

* Fix reference to removed class.

* Update suppressions.

Author: grokys

.ncrunch/Avalonia.Diagnostics.net6.0.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>

.ncrunch/Avalonia.Diagnostics.net8.0.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>

.ncrunch/Avalonia.Diagnostics.netstandard2.0.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>

api/Avalonia.nupkg.xml

@@ -46,7 +46,7 @@ public IDisposable BindSetter(IAnimationSetter setter, Animatable targetControl)
             Property = setter.Property;
             var value = setter.Value;
 
-            if (value is IBinding binding)
+            if (value is BindingBase binding)
             {
                 return Bind(ValueProperty, binding, targetControl);
             }

src/Avalonia.Base/Animation/AnimatorKeyFrame.cs

@@ -98,7 +98,7 @@ public object? this[AvaloniaProperty property]
         /// Gets or sets a binding for a <see cref="AvaloniaProperty"/>.
         /// </summary>
         /// <param name="binding">The binding information.</param>
-        public IBinding this[IndexerDescriptor binding]
+        public BindingBase this[IndexerDescriptor binding]
         {
             get { return new IndexerBinding(this, binding.Property!, binding.Mode); }
             set { this.Bind(binding.Property!, value); }
@@ -417,14 +417,14 @@ public void SetCurrentValue<T>(StyledProperty<T> property, T value)
         }
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an <see cref="IBinding"/>.
+        /// Binds a <see cref="AvaloniaProperty"/> to an <see cref="BindingBase"/>.
         /// </summary>
         /// <param name="property">The property.</param>
         /// <param name="binding">The binding.</param>
         /// <returns>
         /// The binding expression which represents the binding instance on this object.
         /// </returns>
-        public BindingExpressionBase Bind(AvaloniaProperty property, IBinding binding)
+        public BindingExpressionBase Bind(AvaloniaProperty property, BindingBase binding)
         {
             return Bind(property, binding, null);
         }
@@ -474,9 +474,9 @@ public IDisposable Bind<T>(
             VerifyAccess();
             ValidatePriority(priority);
 
-            if (source is IBinding2 b)
+            if (source is BindingBase b)
             {
-                if (b.Instance(this, property, null) is not UntypedBindingExpressionBase expression)
+                if (b.CreateInstance(this, property, null) is not UntypedBindingExpressionBase expression)
                     throw new NotSupportedException($"Binding returned unsupported {nameof(BindingExpressionBase)}.");
 
                 if (priority != expression.Priority)
@@ -574,9 +574,9 @@ public IDisposable Bind<T>(
                 throw new ArgumentException($"The property {property.Name} is readonly.");
             }
 
-            if (source is IBinding2 b)
+            if (source is BindingBase b)
             {
-                if (b.Instance(this, property, null) is not UntypedBindingExpressionBase expression)
+                if (b.CreateInstance(this, property, null) is not UntypedBindingExpressionBase expression)
                     throw new NotSupportedException($"Binding returned unsupported {nameof(BindingExpressionBase)}.");
                 return GetValueStore().AddBinding(property, expression);
             }
@@ -643,7 +643,7 @@ public IDisposable Bind<T>(
         public void CoerceValue(AvaloniaProperty property) => _values.CoerceValue(property);
 
         /// <summary>
-        /// Binds a <see cref="AvaloniaProperty"/> to an <see cref="IBinding"/>.
+        /// Binds a <see cref="AvaloniaProperty"/> to an <see cref="BindingBase"/>.
         /// </summary>
         /// <param name="property">The property.</param>
         /// <param name="binding">The binding.</param>
@@ -656,11 +656,9 @@ public IDisposable Bind<T>(
         /// <returns>
         /// The binding expression which represents the binding instance on this object.
         /// </returns>
-        internal BindingExpressionBase Bind(AvaloniaProperty property, IBinding binding, object? anchor)
+        internal BindingExpressionBase Bind(AvaloniaProperty property, BindingBase binding, object? anchor)
         {
-            if (binding is not IBinding2 b)
-                throw new NotSupportedException($"Unsupported IBinding implementation '{binding}'.");
-            if (b.Instance(this, property, anchor) is not UntypedBindingExpressionBase expression)
+            if (binding.CreateInstance(this, property, anchor) is not UntypedBindingExpressionBase expression)
                 throw new NotSupportedException($"Binding returned unsupported {nameof(BindingExpressionBase)}.");
 
             return GetValueStore().AddBinding(property, expression);

src/Avalonia.Base/AvaloniaObject.cs

@@ -11,12 +11,12 @@ namespace Avalonia
     public static class AvaloniaObjectExtensions
     {
         /// <summary>
-        /// Converts an <see cref="IObservable{T}"/> to an <see cref="IBinding"/>.
+        /// Converts an <see cref="IObservable{T}"/> to an <see cref="BindingBase"/>.
         /// </summary>
         /// <typeparam name="T">The type produced by the observable.</typeparam>
         /// <param name="source">The observable</param>
-        /// <returns>An <see cref="IBinding"/>.</returns>
-        public static IBinding ToBinding<T>(this IObservable<T> source)
+        /// <returns>An <see cref="BindingBase"/>.</returns>
+        public static BindingBase ToBinding<T>(this IObservable<T> source)
         {
             return new BindingAdaptor(
                 typeof(T).IsValueType
@@ -228,7 +228,7 @@ public static IDisposable Bind<T>(
         }
 
         /// <summary>
-        /// Binds a property on an <see cref="AvaloniaObject"/> to an <see cref="IBinding"/>.
+        /// Binds a property on an <see cref="AvaloniaObject"/> to an <see cref="BindingBase"/>.
         /// </summary>
         /// <param name="target">The object.</param>
         /// <param name="property">The property to bind.</param>
@@ -244,7 +244,7 @@ public static IDisposable Bind<T>(
         public static IDisposable Bind(
             this AvaloniaObject target,
             AvaloniaProperty property,
-            IBinding binding,
+            BindingBase binding,
             object? anchor = null)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));
@@ -359,7 +359,7 @@ public static IDisposable AddClassHandler<TTarget, TValue>(
             return observable.Subscribe(new ClassHandlerObserver<TTarget, TValue>(action));
         }
 
-        private class BindingAdaptor : IBinding2
+        private class BindingAdaptor : BindingBase
         {
             private readonly IObservable<object?> _source;
 
@@ -368,17 +368,10 @@ public BindingAdaptor(IObservable<object?> source)
                 this._source = source;
             }
 
-            public InstancedBinding? Initiate(
+            internal override BindingExpressionBase CreateInstance(
                 AvaloniaObject target,
-                AvaloniaProperty? targetProperty,
-                object? anchor = null,
-                bool enableDataValidation = false)
-            {
-                var expression = new UntypedObservableBindingExpression(_source, BindingPriority.LocalValue);
-                return new InstancedBinding(expression, BindingMode.OneWay, BindingPriority.LocalValue);
-            }
-
-            BindingExpressionBase IBinding2.Instance(AvaloniaObject target, AvaloniaProperty? property, object? anchor)
+                AvaloniaProperty? property,
+                object? anchor)
             {
                 return new UntypedObservableBindingExpression(_source, BindingPriority.LocalValue);
             }

src/Avalonia.Base/AvaloniaObjectExtensions.cs

@@ -12,7 +12,7 @@ internal static class ClassBindingManager
         private static readonly Dictionary<string, AvaloniaProperty> s_RegisteredProperties =
             new Dictionary<string, AvaloniaProperty>();
 
-        public static IDisposable Bind(StyledElement target, string className, IBinding source, object anchor)
+        public static IDisposable Bind(StyledElement target, string className, BindingBase source, object anchor)
         {
             var prop = GetClassProperty(className);
             return target.Bind(prop, source);

src/Avalonia.Base/ClassBindingManager.cs

@@ -0,0 +1,28 @@
+namespace Avalonia.Data;
+
+/// <summary>
+/// Base class for the various types of binding supported by Avalonia.
+/// </summary>
+public abstract class BindingBase
+{
+    /// <summary>
+    /// Creates a <see cref="BindingExpressionBase"/> from a binding.
+    /// </summary>
+    /// <param name="target">The target of the binding.</param>
+    /// <param name="targetProperty">The target property of the binding.</param>
+    /// <param name="anchor">
+    /// If <paramref name="target"/> is not a control, provides an anchor object from which to
+    /// locate a data context or other controls.
+    /// </param>
+    /// <returns>
+    /// A newly instantiated <see cref="BindingExpressionBase"/>.
+    /// </returns>
+    /// <remarks>
+    /// This is a low-level method which returns a binding expression that is not yet connected to
+    /// a binding sink, and so is inactive.
+    /// </remarks>
+    internal abstract BindingExpressionBase CreateInstance(
+        AvaloniaObject target,
+        AvaloniaProperty? targetProperty,
+        object? anchor);
+}

src/Avalonia.Base/Data/BindingBase.cs

@@ -10,8 +10,6 @@ private protected BindingExpressionBase()
     {
     }
 
-    internal BindingMode Mode { get; private protected set; }
-
     public virtual void Dispose()
     {
         GC.SuppressFinalize(this);