Metadata: Configure backing field by attribute on skip navigation

src/EFCore/Metadata/Builders/IConventionNavigationBuilder.cs

@@ -15,22 +15,13 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Builders
     ///         not used in application code.
     ///     </para>
     /// </summary>
-    public interface IConventionNavigationBuilder : IConventionAnnotatableBuilder
+    public interface IConventionNavigationBuilder : IConventionPropertyBaseBuilder
     {
         /// <summary>
         ///     Gets the navigation being configured.
         /// </summary>
         new IConventionNavigation Metadata { get; }
 
-        /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this navigation
-        ///     from the given configuration source.
-        /// </summary>
-        /// <param name="fieldName"> The field name. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
-
         /// <summary>
         ///     Sets the backing field to use for this navigation.
         /// </summary>
@@ -40,16 +31,7 @@ public interface IConventionNavigationBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionNavigationBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this navigation
-        ///     from the given configuration source.
-        /// </summary>
-        /// <param name="fieldInfo"> The field. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+        new IConventionNavigationBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the backing field to use for this navigation.
@@ -60,16 +42,7 @@ public interface IConventionNavigationBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionNavigationBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the <see cref="PropertyAccessMode" /> can be set for this navigation
-        ///     from the current configuration source.
-        /// </summary>
-        /// <param name="propertyAccessMode"> The <see cref="PropertyAccessMode" /> to use for this navigation. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the <see cref="PropertyAccessMode" /> can be set for this navigation. </returns>
-        bool CanSetPropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
+        new IConventionNavigationBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the <see cref="PropertyAccessMode" /> to use for this navigation.
@@ -80,7 +53,7 @@ public interface IConventionNavigationBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionNavigationBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
+        new IConventionNavigationBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Returns a value indicating whether this navigation can be configured to be automatically included in a query

src/EFCore/Metadata/Builders/IConventionPropertyBaseBuilder.cs

@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Reflection;
+using JetBrains.Annotations;
+
+namespace Microsoft.EntityFrameworkCore.Metadata.Builders
+{
+    /// <summary>
+    ///     <para>
+    ///         Provides a simple API surface for configuring an <see cref="IConventionPropertyBase" /> from conventions.
+    ///     </para>
+    ///     <para>
+    ///         This interface is typically used by database providers (and other extensions). It is generally
+    ///         not used in application code.
+    ///     </para>
+    /// </summary>
+    public interface IConventionPropertyBaseBuilder : IConventionAnnotatableBuilder
+    {
+        /// <summary>
+        ///     Gets the property-like object being configured.
+        /// </summary>
+        new IConventionPropertyBase Metadata { get; }
+
+        /// <summary>
+        ///     Sets the backing field to use for this property-like object.
+        /// </summary>
+        /// <param name="fieldName"> The field name. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns>
+        ///     The same builder instance if the configuration was applied,
+        ///     <see langword="null" /> otherwise.
+        /// </returns>
+        IConventionPropertyBaseBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
+
+        /// <summary>
+        ///     Sets the backing field to use for this property-like object.
+        /// </summary>
+        /// <param name="fieldInfo"> The field. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns>
+        ///     The same builder instance if the configuration was applied,
+        ///     <see langword="null" /> otherwise.
+        /// </returns>
+        IConventionPropertyBaseBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+
+        /// <summary>
+        ///     Returns a value indicating whether the backing field can be set for this property-like object
+        ///     from the current configuration source.
+        /// </summary>
+        /// <param name="fieldName"> The field name. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns> <see langword="true" /> if the backing field can be set for this property-like object. </returns>
+        bool CanSetField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
+
+        /// <summary>
+        ///     Returns a value indicating whether the backing field can be set for this property-like object
+        ///     from the current configuration source.
+        /// </summary>
+        /// <param name="fieldInfo"> The field. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns> <see langword="true" /> if the backing field can be set for this property-like object. </returns>
+        bool CanSetField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+
+        /// <summary>
+        ///     Sets the <see cref="PropertyAccessMode" /> to use for this property-like object.
+        /// </summary>
+        /// <param name="propertyAccessMode"> The <see cref="PropertyAccessMode" /> to use for this property-like object. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns>
+        ///     The same builder instance if the configuration was applied,
+        ///     <see langword="null" /> otherwise.
+        /// </returns>
+        IConventionPropertyBaseBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
+
+        /// <summary>
+        ///     Returns a value indicating whether the <see cref="PropertyAccessMode" /> can be set for this property-like object
+        ///     from the current configuration source.
+        /// </summary>
+        /// <param name="propertyAccessMode"> The <see cref="PropertyAccessMode" /> to use for this property-like object. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        /// <returns> <see langword="true" /> if the <see cref="PropertyAccessMode" /> can be set for this property-like object. </returns>
+        bool CanSetPropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
+    }
+}

src/EFCore/Metadata/Builders/IConventionPropertyBuilder.cs

@@ -19,7 +19,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Builders
     ///         not used in application code.
     ///     </para>
     /// </summary>
-    public interface IConventionPropertyBuilder : IConventionAnnotatableBuilder
+    public interface IConventionPropertyBuilder : IConventionPropertyBaseBuilder
     {
         /// <summary>
         ///     Gets the property being configured.
@@ -117,7 +117,7 @@ public interface IConventionPropertyBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionPropertyBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
+        new IConventionPropertyBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the backing field to use for this property.
@@ -128,25 +128,7 @@ public interface IConventionPropertyBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionPropertyBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this property
-        ///     from the current configuration source.
-        /// </summary>
-        /// <param name="fieldName"> The field name. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this property
-        ///     from the current configuration source.
-        /// </summary>
-        /// <param name="fieldInfo"> The field. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+        new IConventionPropertyBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the <see cref="PropertyAccessMode" /> to use for this property.
@@ -157,16 +139,7 @@ public interface IConventionPropertyBuilder : IConventionAnnotatableBuilder
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionPropertyBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the <see cref="PropertyAccessMode" /> can be set for this property
-        ///     from the current configuration source.
-        /// </summary>
-        /// <param name="propertyAccessMode"> The <see cref="PropertyAccessMode" /> to use for this property. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the <see cref="PropertyAccessMode" /> can be set for this property. </returns>
-        bool CanSetPropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
+        new IConventionPropertyBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Configures the maximum length of data that can be stored in this property.

src/EFCore/Metadata/Builders/IConventionServicePropertyBuilder.cs

@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Builders
     ///         not used in application code.
     ///     </para>
     /// </summary>
-    public interface IConventionServicePropertyBuilder : IConventionAnnotatableBuilder
+    public interface IConventionServicePropertyBuilder : IConventionPropertyBaseBuilder
     {
         /// <summary>
         ///     Gets the service property being configured.
@@ -31,7 +31,7 @@ public interface IConventionServicePropertyBuilder : IConventionAnnotatableBuild
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionServicePropertyBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
+        new IConventionServicePropertyBuilder HasField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the backing field to use for this property.
@@ -42,25 +42,18 @@ public interface IConventionServicePropertyBuilder : IConventionAnnotatableBuild
         ///     The same builder instance if the configuration was applied,
         ///     <see langword="null" /> otherwise.
         /// </returns>
-        IConventionServicePropertyBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+        new IConventionServicePropertyBuilder HasField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
 
         /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this property
-        ///     from the current configuration source.
-        /// </summary>
-        /// <param name="fieldName"> The field name. </param>
-        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] string fieldName, bool fromDataAnnotation = false);
-
-        /// <summary>
-        ///     Returns a value indicating whether the backing field can be set for this property
-        ///     from the current configuration source.
+        ///     Sets the <see cref="PropertyAccessMode" /> to use for this property.
         /// </summary>
-        /// <param name="fieldInfo"> The field. </param>
+        /// <param name="propertyAccessMode"> The <see cref="PropertyAccessMode" /> to use for this property. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        /// <returns> <see langword="true" /> if the backing field can be set for this property. </returns>
-        bool CanSetField([CanBeNull] FieldInfo fieldInfo, bool fromDataAnnotation = false);
+        /// <returns>
+        ///     The same builder instance if the configuration was applied,
+        ///     <see langword="null" /> otherwise.
+        /// </returns>
+        new IConventionServicePropertyBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Sets the <see cref="ServiceParameterBinding" /> for this property.