Add latest version

Add latest version

Author: JonathanMagnan

src/shared/Z.EF.Plus.QueryIncludeFilterCore.Shared/Extensions/IQueryable`.ThenIncludeFilter.cs

@@ -0,0 +1,44 @@
+//// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+//// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+//// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+//// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+//// More projects: http://www.zzzprojects.com/
+//// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Linq.Expressions;
+//using Microsoft.EntityFrameworkCore.Query;
+
+//namespace Z.EntityFramework.Plus
+//{
+//    public static partial class QueryIncludeFilterExtensions
+//    {
+//        /// <summary>
+//        ///     An IQueryable&lt;T&gt; extension method that include and filter related entities.
+//        /// </summary>
+//        /// <typeparam name="T">Generic type parameter.</typeparam>
+//        /// <typeparam name="TChild">Type of the child.</typeparam>
+//        /// <param name="query">The query to filter included related entities.</param>
+//        /// <param name="queryIncludeFilter">The query filter to apply on included related entities.</param>
+//        /// <returns>An IQueryable&lt;T&gt; that include and filter related entities.</returns>
+//        public static IQueryable<T> ThenIncludeFilter<TEntity, TPreviousProperty, TChild>(this IIncludableQueryable<TEntity, IEnumerable<TPreviousProperty>> source, Expression<Func<TPreviousProperty, IEnumerable<TChild>>> queryIncludeFilter) where TPreviousProperty : class where TChild : class
+//        {
+//            return query.IncludeOptimizedSingle(queryIncludeFilter);
+//        }
+
+//        /// <summary>
+//        ///     An IQueryable&lt;T&gt; extension method that include and filter related entities.
+//        /// </summary>
+//        /// <typeparam name="T">Generic type parameter.</typeparam>
+//        /// <typeparam name="TChild">Type of the child.</typeparam>
+//        /// <param name="query">The query to filter included related entities.</param>
+//        /// <param name="queryIncludeFilter">The query filter to apply on included related entities.</param>
+//        /// <returns>An IQueryable&lt;T&gt; that include and filter related entities.</returns>
+//        public static IQueryable<T> ThenIncludeFilter<TEntity, TPreviousProperty, TChild>(this IIncludableQueryable<TEntity, IEnumerable<TPreviousProperty>> source, Expression<Func<TPreviousProperty, TChild>> queryIncludeFilter) where TPreviousProperty : class where TChild : class
+//        {
+//            return query.IncludeOptimizedSingle(queryIncludeFilter);
+//        }
+//    }
+//}

src/shared/Z.EF.Plus.QueryIncludeFilterCore.Shared/QueryIncludeFilterNullCollection.cs

@@ -88,7 +88,7 @@ public static void CheckNullRecursive(object currentItem, List<string> paths, in
 
         private static void CheckAndSetCollection(PropertyOrFieldAccessor accessor, object currentItem, Type propertyType, Type originalType)
         {
-            if (propertyType.GetGenericArguments().Length == 1)
+            if (propertyType.GetGenericArguments().Length == 1 && typeof(IEnumerable).IsAssignableFrom(propertyType))
             {
                 object value;
 

src/shared/Z.EF.Plus.QueryIncludeFilterCore.Shared/Z.EF.Plus.QueryIncludeFilterCore.Shared.projitems

@@ -17,6 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)BaseQueryIncludeFilterChild.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\IQueryable`.ThenIncludeFilter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\IQueryable`.IncludeFilterByPath.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\IQueryable`.IncludeFilter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)QueryIncludeFilterByPath.cs" />

src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedNullCollection.cs

@@ -88,8 +88,8 @@ public static void CheckNullRecursive(object currentItem, List<string> paths, in
 
 	    private static void CheckAndSetCollection(PropertyOrFieldAccessor accessor, object currentItem, Type propertyType, Type originalType)
 	    {
-            if (propertyType.GetGenericArguments().Length == 1)
-            {
+            if (propertyType.GetGenericArguments().Length == 1 && typeof(IEnumerable).IsAssignableFrom(propertyType)) 
+			{
                 object value;
 
                 var genericTypeDefinition = propertyType.GetGenericTypeDefinition();