Fix Register Issue

Fix Register Issue

Author: zzzprojects

src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.4.13")]
-[assembly: AssemblyFileVersion("1.4.13")]
+[assembly: AssemblyVersion("1.4.14")]
+[assembly: AssemblyFileVersion("1.4.14")]

src/Z.EntityFramework.Plus.EF6.NET40/QueryFilterInterceptor/QueryFilterInterceptorContext.cs

@@ -212,11 +212,23 @@ private void Initialize(DbContext context)
                 var internalQueryProperty = typeof(DbQuery<>).MakeGenericType(elementType).GetProperty("InternalQuery", BindingFlags.NonPublic | BindingFlags.Instance);
                 var internalQuery = internalQueryProperty.GetValue(dbSet, null);
 
-                // DbSet<>.InternalQuery.EntitySet
-                var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-                var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
+              
 
-                var entityTypebase = entitySet.ElementType.FullName;
+                var entityTypebase = type.FullName;
+
+                try
+                {
+                    // DbSet<>.InternalQuery.EntitySet
+                    var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                    var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
+
+                    entityTypebase = entitySet.ElementType.FullName;
+                }
+                catch
+                {
+                    // Silence catch, it's k... it doesn't always exist!
+                   
+                }
 
                 // TypeByEntitySetBase
                 {

src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.4.13")]
-[assembly: AssemblyFileVersion("1.4.13")]
+[assembly: AssemblyVersion("1.4.14")]
+[assembly: AssemblyFileVersion("1.4.14")]

src/Z.EntityFramework.Plus.EF6/QueryFilterInterceptor/QueryFilterInterceptorContext.cs

@@ -212,11 +212,23 @@ private void Initialize(DbContext context)
                 var internalQueryProperty = typeof(DbQuery<>).MakeGenericType(elementType).GetProperty("InternalQuery", BindingFlags.NonPublic | BindingFlags.Instance);
                 var internalQuery = internalQueryProperty.GetValue(dbSet, null);
 
-                // DbSet<>.InternalQuery.EntitySet
-                var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-                var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
+              
 
-                var entityTypebase = entitySet.ElementType.FullName;
+                var entityTypebase = type.FullName;
+
+                try
+                {
+                    // DbSet<>.InternalQuery.EntitySet
+                    var entitySetProperty = internalQuery.GetType().GetProperty("EntitySet", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                    var entitySet = (EntitySet)entitySetProperty.GetValue(internalQuery, null);
+
+                    entityTypebase = entitySet.ElementType.FullName;
+                }
+                catch
+                {
+                    // Silence catch, it's k... it doesn't always exist!
+                   
+                }
 
                 // TypeByEntitySetBase
                 {

version.txt

@@ -1 +1 @@
-v1.4.13
+v1.4.14