More changes from API review (#31324)

src/EFCore.Relational/Extensions/RelationalDbFunctionExtensions.cs → src/EFCore.Relational/Extensions/RelationalDbFunctionsExtensions.cs

@@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-database-functions">Database functions</see> for more information and examples.
 /// </remarks>
-public static class RelationalDbFunctionExtensions
+public static class RelationalDbFunctionsExtensions
 {
     /// <summary>
     ///     Explicitly specifies a collation to be used in a LINQ query. Can be used to generate fragments such as

src/EFCore.Relational/Query/Internal/CollateTranslator.cs

@@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore.Query.Internal;
 public class CollateTranslator : IMethodCallTranslator
 {
     private static readonly MethodInfo MethodInfo
-        = typeof(RelationalDbFunctionExtensions).GetMethod(nameof(RelationalDbFunctionExtensions.Collate))!;
+        = typeof(RelationalDbFunctionsExtensions).GetMethod(nameof(RelationalDbFunctionsExtensions.Collate))!;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Query/RelationalEvaluatableExpressionFilter.cs

@@ -45,7 +45,7 @@ public override bool IsEvaluatableExpression(Expression expression, IModel model
                 return false;
             }
 
-            if (method.DeclaringType == typeof(RelationalDbFunctionExtensions))
+            if (method.DeclaringType == typeof(RelationalDbFunctionsExtensions))
             {
                 return false;
             }

src/EFCore/Infrastructure/AnnotatableBuilder.cs

@@ -137,6 +137,18 @@ private static bool CanSetAnnotationValue(
                 || canOverrideSameSource);
     }
 
+    /// <summary>
+    ///     Removes any annotation with the given name.
+    /// </summary>
+    /// <param name="name">The name of the annotation to remove.</param>
+    /// <param name="configurationSource">The configuration source of the annotation to be set.</param>
+    /// <returns>The same builder so that multiple calls can be chained.</returns>
+    [Obsolete("Use HasNoAnnotation instead")]
+    public virtual AnnotatableBuilder<TMetadata, TModelBuilder>? RemoveAnnotation(
+        string name,
+        ConfigurationSource configurationSource)
+        => HasNoAnnotation(name, configurationSource);
+
     /// <summary>
     ///     Removes any annotation with the given name.
     /// </summary>

test/EFCore.Relational.Tests/RelationalApiConsistencyTest.cs

@@ -295,9 +295,9 @@ public class RelationalApiConsistencyFixture : ApiConsistencyFixtureBase
                 {
                     typeof(IReadOnlyDbFunction),
                     (
-                        typeof(RelationalDbFunctionExtensions),
-                        typeof(RelationalDbFunctionExtensions),
-                        typeof(RelationalDbFunctionExtensions),
+                        typeof(RelationalDbFunctionsExtensions),
+                        typeof(RelationalDbFunctionsExtensions),
+                        typeof(RelationalDbFunctionsExtensions),
                         null,
                         null
                     )