Don't look for CLR properties on property bag entity types

Fixes #25485 Fixes #14267
dotnet · Sep 1, 2021 · b820df4 · b820df4
1 parent 9ad5a69
commit b820df4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
@@ -576,7 +576,9 @@ public virtual bool CanRemoveKey(ConfigurationSource configurationSource)
                     return null;
                 }
 
-                memberInfo ??= Metadata.ClrType.GetMembersInHierarchy(propertyName).FirstOrDefault();
+                memberInfo ??= Metadata.IsPropertyBag
+                    ? null
+                    : Metadata.ClrType.GetMembersInHierarchy(propertyName).FirstOrDefault();
 
                 if (propertyType == null)
                 {

diff --git a/src/EFCore/Metadata/Internal/Model.cs b/src/EFCore/Metadata/Internal/Model.cs
@@ -264,12 +264,9 @@ public virtual IEnumerable<EntityType> GetEntityTypes()
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual EntityType? FindEntityType(string name)
-        {
-            Check.DebugAssert(!string.IsNullOrEmpty(name), "name is null or empty");
-            return _entityTypes.TryGetValue(name, out var entityType)
+            => !string.IsNullOrEmpty(name) && _entityTypes.TryGetValue(name, out var entityType)
                 ? entityType
                 : null;
-        }
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/test/EFCore.Tests/Metadata/Internal/ModelTest.cs b/test/EFCore.Tests/Metadata/Internal/ModelTest.cs
@@ -253,6 +253,7 @@ public void Can_get_entity_by_type()
             Assert.Same(entityType, model.FindEntityType(typeof(Customer)));
             Assert.Same(entityType, model.FindEntityType(typeof(Customer)));
             Assert.Null(model.FindEntityType(typeof(string)));
+            Assert.Null(model.FindEntityType(typeof(IList<>).GetGenericArguments().Single()));
         }
 
         [ConditionalFact]

diff --git a/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs b/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs
@@ -2071,6 +2071,9 @@ public virtual void Can_add_shared_type_entity_type()
                 modelBuilder.SharedTypeEntity<Dictionary<string, object>>("Shared1", b =>
                 {
                     b.IndexerProperty<int>("Key");
+                    b.Property<int>("Keys");
+                    b.Property<byte[]>("Values");
+                    b.Property<string>("Count");
                     b.HasKey("Key");
                 });
 
@@ -2087,6 +2090,9 @@ public virtual void Can_add_shared_type_entity_type()
                 Assert.NotNull(shared1);
                 Assert.True(shared1.HasSharedClrType);
                 Assert.Null(shared1.FindProperty("Id"));
+                Assert.Equal(typeof(int), shared1.FindProperty("Keys").ClrType);
+                Assert.Equal(typeof(byte[]), shared1.FindProperty("Values").ClrType);
+                Assert.Equal(typeof(string), shared1.FindProperty("Count").ClrType);
 
                 var shared2 = model.FindEntityType("Shared2");
                 Assert.NotNull(shared2);