update source

Author: JonathanMagnan

src/.vs/Z.EntityFramework.Plus/DesignTimeBuild/.dtbcache.v2

@@ -5,7 +5,42 @@
       "ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
       "DisplayName": "Miscellaneous Files",
       "ColorIndex": -1
+    },
+    "1b28efb7-e679-4275-aca9-da7cd589a56a": {
+      "ProjectGuid": "1b28efb7-e679-4275-aca9-da7cd589a56a",
+      "DisplayName": "Z.EntityFramework.Plus.EF5",
+      "ColorIndex": 0
+    },
+    "e4c2af73-caeb-4429-bcb6-0a359484e064": {
+      "ProjectGuid": "e4c2af73-caeb-4429-bcb6-0a359484e064",
+      "DisplayName": "Z.EntityFramework.Plus.EF5.NET40",
+      "ColorIndex": 1
+    },
+    "6ea3675a-ab66-4aba-94d1-3da69fa88d4e": {
+      "ProjectGuid": "6ea3675a-ab66-4aba-94d1-3da69fa88d4e",
+      "DisplayName": "Z.EntityFramework.Plus.EF6",
+      "ColorIndex": 2
+    },
+    "ac398eb8-0a31-4d06-a804-84d10b6da96d": {
+      "ProjectGuid": "ac398eb8-0a31-4d06-a804-84d10b6da96d",
+      "DisplayName": "Z.EntityFramework.Plus.EF6.NET40",
+      "ColorIndex": 3
+    },
+    "ef1cbe03-3b93-4f28-8d98-3166320f62db": {
+      "ProjectGuid": "ef1cbe03-3b93-4f28-8d98-3166320f62db",
+      "DisplayName": "Z.EntityFramework.Plus.EFCore.NETStandard20",
+      "ColorIndex": 4
+    },
+    "61add154-ff1b-4683-80c9-ec6468a84c36": {
+      "ProjectGuid": "61add154-ff1b-4683-80c9-ec6468a84c36",
+      "DisplayName": "Z.EntityFramework.Plus.EFCore3x.NETStandard20",
+      "ColorIndex": 5
+    },
+    "d7434620-9c01-4260-9c84-4574b3e2827a": {
+      "ProjectGuid": "d7434620-9c01-4260-9c84-4574b3e2827a",
+      "DisplayName": "Z.EntityFramework.Plus.EFCore3x.NETStandard21",
+      "ColorIndex": 6
     }
   },
-  "NextColorIndex": 0
+  "NextColorIndex": 7
 }

src/.vs/Z.EntityFramework.Plus/project-colors.json

@@ -262,12 +262,29 @@ public static void ForceAlwaysEmptyQueryCacheManager(DbContext context)
         public static void ClearAllCache()
         {
             var propertyValues = CacheWeakFilterContext.GetType().GetProperty("Values", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-            var values = (List<QueryFilterContextInterceptor>) propertyValues.GetValue(CacheWeakFilterContext, null);
+            
+            if(propertyValues != null)
+            {
+                var values = (List<QueryFilterContextInterceptor>)propertyValues.GetValue(CacheWeakFilterContext, null);
 
-            foreach (var value in values)
+                foreach (var value in values)
+                {
+                    value.ClearCache();
+                }
+            }
+#if NETSTANDARD2_1
+            // Only do it when propertyValues is null for backward compatibility
+            else
             {
-                value.ClearCache();
+                var keyValues = CacheWeakFilterContext.ToList();
+                var values = keyValues.Select(x => x.Value).ToList();
+
+                foreach (var value in values)
+                {
+                    value.ClearCache();
+                }
             }
+#endif
         }
 
         /// <summary>Clears the global filter.</summary>

src/.vs/Z.EntityFramework.Plus/v17/.futdcache.v1

@@ -21,6 +21,9 @@ internal static partial class InternalExtensions
     {
         public static DbContext GetDbContext<T>(this IQueryable<T> source)
         {
+#if EFCORE
+            source = Z.EntityFramework.Extensions.PublicExtensions.GetInnerForLinqKit(source);
+#endif
             var compilerField = typeof (EntityQueryProvider).GetField("_queryCompiler", BindingFlags.NonPublic | BindingFlags.Instance);
             var compiler = (QueryCompiler) compilerField.GetValue(source.Provider);
 
@@ -88,6 +91,10 @@ public static DbContext GetDbContext<T>(this IQueryable<T> source)
         /// <returns>The database context from the query.</returns>
         public static DbContext GetDbContext(this IQueryable query)
         {
+#if EFCORE
+            query = Z.EntityFramework.Extensions.PublicExtensions.GetInnerForLinqKit(query);
+#endif
+
             var compilerField = typeof (EntityQueryProvider).GetField("_queryCompiler", BindingFlags.NonPublic | BindingFlags.Instance);
             var compiler = (QueryCompiler) compilerField.GetValue(query.Provider);
 

src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorManager.cs

@@ -20,6 +20,8 @@ internal static partial class InternalExtensions
     {
         public static DbContext GetInMemoryContext<T>(this IQueryable<T> source)
 		{
+			source = Z.EntityFramework.Extensions.PublicExtensions.GetInnerForLinqKit(source);
+
 			var compilerField = typeof(EntityQueryProvider).GetField("_queryCompiler", BindingFlags.NonPublic | BindingFlags.Instance);
 			var compiler = (QueryCompiler)compilerField.GetValue(source.Provider);
 

src/shared/Z.EF.Plus._Core.Shared/EFCore/IQueryable`/GetDbContext.cs

@@ -31,6 +31,8 @@ internal static partial class InternalExtensions
     {
         public static bool IsInMemoryQueryContext<T>(this IQueryable<T> query)
         {
+            query = Z.EntityFramework.Extensions.PublicExtensions.GetInnerForLinqKit(query);
+
             var compilerField = typeof(EntityQueryProvider).GetField("_queryCompiler", BindingFlags.NonPublic | BindingFlags.Instance);
             var compiler = (QueryCompiler)compilerField.GetValue(query.Provider);