Removed EntityFrameworkCoreSupport (no longer needed for EF Core 5+)

Author: Bart Koelman

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs

@@ -186,25 +186,6 @@ private Expression CreateCollectionInitializer(LambdaScope lambdaScope, Property
 
             Expression layerExpression = builder.ApplyQuery(layer);
 
-            // Earlier versions of EF Core 3.x failed to understand `query.ToHashSet()`, so we emit `new HashSet(query)` instead.
-            // Interestingly, EF Core 5 RC1 fails to understand `new HashSet(query)`, so we emit `query.ToHashSet()` instead.
-            // https://github.com/dotnet/efcore/issues/22902
-
-            if (EntityFrameworkCoreSupport.Version.Major < 5)
-            {
-                Type enumerableOfElementType = typeof(IEnumerable<>).MakeGenericType(elementType);
-                Type typedCollection = CollectionConverter.ToConcreteCollectionType(collectionProperty.PropertyType);
-
-                ConstructorInfo typedCollectionConstructor = typedCollection.GetConstructor(enumerableOfElementType.AsArray());
-
-                if (typedCollectionConstructor == null)
-                {
-                    throw new InvalidOperationException($"Constructor on '{typedCollection.Name}' that accepts '{enumerableOfElementType.Name}' not found.");
-                }
-
-                return Expression.New(typedCollectionConstructor, layerExpression);
-            }
-
             string operationName = CollectionConverter.TypeCanContainHashSet(collectionProperty.PropertyType) ? "ToHashSet" : "ToList";
             return CopyCollectionExtensionMethodCall(layerExpression, operationName, elementType);
         }

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs

@@ -103,14 +103,6 @@ protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer layer)
 
             ArgumentGuard.NotNull(layer, nameof(layer));
 
-            QueryLayer rewrittenLayer = layer;
-
-            if (EntityFrameworkCoreSupport.Version.Major < 5)
-            {
-                var writer = new MemoryLeakDetectionBugRewriter();
-                rewrittenLayer = writer.Rewrite(layer);
-            }
-
             IQueryable<TResource> source = GetAll();
 
             // @formatter:wrap_chained_method_calls chop_always
@@ -136,7 +128,7 @@ protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer layer)
             var builder = new QueryableBuilder(source.Expression, source.ElementType, typeof(Queryable), nameFactory, _resourceFactory, _resourceGraph,
                 _dbContext.Model);
 
-            Expression expression = builder.ApplyQuery(rewrittenLayer);
+            Expression expression = builder.ApplyQuery(layer);
             return source.Provider.CreateQuery<TResource>(expression);
         }
 

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreSupport.cs

@@ -105,7 +105,7 @@ private static Expression CreateTupleAccessExpressionForConstant(object value, T
             return Expression.Property(tupleCreateCall, "Item1");
         }
 
-        internal static bool HasSingleConstructorWithoutParameters(Type type)
+        private static bool HasSingleConstructorWithoutParameters(Type type)
         {
             ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();