Cleanup pending 9914

dotnet · Jul 9, 2020 · 395bce0 · 395bce0
1 parent 9a7f5e7
commit 395bce0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 33 deletions.
diff --git a/src/EFCore/Metadata/Builders/CollectionCollectionBuilder.cs b/src/EFCore/Metadata/Builders/CollectionCollectionBuilder.cs
@@ -99,14 +99,6 @@ public virtual EntityTypeBuilder UsingEntity(
             Check.NotNull(configureRight, nameof(configureRight));
             Check.NotNull(configureLeft, nameof(configureLeft));
 
-            if (((Model)LeftEntityType.Model).IsShared(joinEntityType))
-            {
-                //TODO #9914 - when the generic version of "please use the shared-type entity type version of this API"
-                // is available then update to use that.
-                throw new InvalidOperationException(
-                    CoreStrings.DoNotUseUsingEntityOnSharedClrType(joinEntityType.GetType().Name));
-            }
-
             var existingAssociationEntityType = (EntityType)
                 (LeftNavigation.ForeignKey?.DeclaringEntityType
                     ?? RightNavigation.ForeignKey?.DeclaringEntityType);

diff --git a/src/EFCore/Metadata/Builders/CollectionCollectionBuilder`.cs b/src/EFCore/Metadata/Builders/CollectionCollectionBuilder`.cs
@@ -56,14 +56,6 @@ public virtual EntityTypeBuilder<TAssociationEntity> UsingEntity<TAssociationEnt
             Check.NotNull(configureRight, nameof(configureRight));
             Check.NotNull(configureLeft, nameof(configureLeft));
 
-            if (((Model)LeftEntityType.Model).IsShared(typeof(TAssociationEntity)))
-            {
-                //TODO #9914 - when the generic version of "please use the shared-type entity type version of this API"
-                // is available then update to use that.
-                throw new InvalidOperationException(
-                    CoreStrings.DoNotUseUsingEntityOnSharedClrType(typeof(TAssociationEntity).Name));
-            }
-
             var existingAssociationEntityType = (EntityType)
                 (LeftNavigation.ForeignKey?.DeclaringEntityType
                     ?? RightNavigation.ForeignKey?.DeclaringEntityType);

diff --git a/src/EFCore/Metadata/Conventions/ManyToManyAssociationEntityTypeConvention.cs b/src/EFCore/Metadata/Conventions/ManyToManyAssociationEntityTypeConvention.cs
@@ -106,12 +106,9 @@ private void CreateAssociationEntityType(
                     inverseEntityType.ShortName()),
                 otherIdentifiers,
                 int.MaxValue);
-            //TODO #9914 - when the shared-type entity type version of model.Entity() is available call that instead
-            var associationEntityTypeBuilder =
-                model.AddEntityType(
-                    associationEntityTypeName,
-                    Model.DefaultPropertyBagType,
-                    ConfigurationSource.Convention).Builder;
+
+            var associationEntityTypeBuilder = model.Builder.Entity(
+                associationEntityTypeName, Model.DefaultPropertyBagType, ConfigurationSource.Convention);
 
             // Create left and right foreign keys from the outer entity types to
             // the association entity type and configure the skip navigations.

diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs
diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx
@@ -1421,9 +1421,6 @@
   <data name="PrincipalKeylessType" xml:space="preserve">
     <value>The entity type '{entityType}' cannot be on the principal end of the relationship between '{firstNavigationSpecification}' and '{secondNavigationSpecification}'. The principal entity type must have a key.</value>
   </data>
-  <data name="DoNotUseUsingEntityOnSharedClrType" xml:space="preserve">
-    <value>Cannot use UsingEntity() passing type '{clrType}' because the model contains shared entity type(s) with same type. Use a type which uniquely defines an entity type.</value>
-  </data>
   <data name="ClashingMismatchedSharedType" xml:space="preserve">
     <value>The shared type entity type '{entityType}' cannot be added to the model because a shared entity type with the same name but different clr type already exists.</value>
   </data>