Revert changes from #1887, which changed extension method invocation in same class

Author: bkoelman

JsonApiDotNetCore.slnx.DotSettings

@@ -51,6 +51,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ExtractCommonPropertyPattern/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IntroduceOptionalParameters_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMemberFromSameClass/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LambdaExpressionMustBeStatic/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalFunctionCanBeMadeStatic/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>

src/JsonApiDotNetCore.Annotations/TypeExtensions.cs

@@ -7,7 +7,7 @@ internal static class TypeExtensions
     /// </summary>
     public static bool IsOrImplementsInterface<TInterface>(this Type? source)
     {
-        return source.IsOrImplementsInterface(typeof(TInterface));
+        return IsOrImplementsInterface(source, typeof(TInterface));
     }
 
     /// <summary>

src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs

@@ -21,7 +21,7 @@ public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection
         Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null)
         where TDbContext : DbContext
     {
-        return services.AddJsonApi(options, discovery, resources, mvcBuilder, [typeof(TDbContext)]);
+        return AddJsonApi(services, options, discovery, resources, mvcBuilder, [typeof(TDbContext)]);
     }
 
     /// <summary>

test/TestBuildingBlocks/DbContextExtensions.cs

@@ -13,14 +13,14 @@ public static void AddInRange(this DbContext dbContext, params object[] entities
     public static async Task ClearTableAsync<TEntity>(this DbContext dbContext)
         where TEntity : class
     {
-        await dbContext.ClearTablesAsync(typeof(TEntity));
+        await ClearTablesAsync(dbContext, typeof(TEntity));
     }
 
     public static async Task ClearTablesAsync<TEntity1, TEntity2>(this DbContext dbContext)
         where TEntity1 : class
         where TEntity2 : class
     {
-        await dbContext.ClearTablesAsync(typeof(TEntity1), typeof(TEntity2));
+        await ClearTablesAsync(dbContext, typeof(TEntity1), typeof(TEntity2));
     }
 
     private static async Task ClearTablesAsync(this DbContext dbContext, params Type[] modelTypes)
@@ -40,7 +40,7 @@ private static async Task ClearTablesAsync(this DbContext dbContext, params Type
             {
                 // There is no table for the specified abstract base type when using TablePerConcreteType inheritance.
                 IEnumerable<IEntityType> derivedTypes = entityType.GetConcreteDerivedTypesInclusive();
-                await dbContext.ClearTablesAsync(derivedTypes.Select(derivedType => derivedType.ClrType).ToArray());
+                await ClearTablesAsync(dbContext, derivedTypes.Select(derivedType => derivedType.ClrType).ToArray());
             }
             else
             {

test/TestBuildingBlocks/FluentJsonElementExtensions.cs

@@ -18,7 +18,7 @@ public static JsonElementAssertions Should(this JsonElement source)
     [CustomAssertion]
     public static SchemaReferenceIdContainer ShouldBeSchemaReferenceId(this JsonElement source, string value)
     {
-        string schemaReferenceId = source.GetSchemaReferenceId();
+        string schemaReferenceId = GetSchemaReferenceId(source);
         schemaReferenceId.Should().Be(value);
 
         return new SchemaReferenceIdContainer(value);
@@ -38,7 +38,7 @@ public static string GetSchemaReferenceId(this JsonElement source)
     [CustomAssertion]
     public static void WithSchemaReferenceId(this JsonElement subject, [InstantHandle] Action<string> continuation)
     {
-        string schemaReferenceId = subject.GetSchemaReferenceId();
+        string schemaReferenceId = GetSchemaReferenceId(subject);
 
         continuation(schemaReferenceId);
     }

test/TestBuildingBlocks/TimeExtensions.cs

@@ -12,7 +12,7 @@ public static DateTimeOffset TruncateToWholeMilliseconds(this DateTimeOffset val
         // Because PostgreSQL does not store the UTC offset in the database, it cannot round-trip
         // values with a non-zero UTC offset, and therefore always rejects such values.
 
-        DateTime dateTime = value.DateTime.TruncateToWholeMilliseconds();
+        DateTime dateTime = TruncateToWholeMilliseconds(value.DateTime);
         return new DateTimeOffset(dateTime, TimeSpan.Zero);
     }