Add Microsoft.EntityFrameworkCore.Attributes assembly

Change owned entity type configuration API. Part of #9487
dotnet · Dec 14, 2017 · f94f7a1 · f94f7a1
1 parent 6d7e51c
commit f94f7a1
Show file tree

Hide file tree

Showing 21 changed files with 142 additions and 41 deletions.
diff --git a/EFCore.Runtime.sln b/EFCore.Runtime.sln
@@ -54,6 +54,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		tools\Resources.tt = tools\Resources.tt
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Attributes", "src\EFCore.Attributes\EFCore.Attributes.csproj", "{92C1AEF8-D4FC-4631-98B1-F16FB7103398}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,6 +130,10 @@ Global
 		{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92C1AEF8-D4FC-4631-98B1-F16FB7103398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92C1AEF8-D4FC-4631-98B1-F16FB7103398}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92C1AEF8-D4FC-4631-98B1-F16FB7103398}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92C1AEF8-D4FC-4631-98B1-F16FB7103398}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -150,6 +156,7 @@ Global
 		{07FA2B15-A6A5-4292-A096-7771FB32EEDA} = {258D5057-81B9-40EC-A872-D21E27452749}
 		{D3D0A8E8-EC2F-4E01-8650-8554E186A66F} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
 		{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508} = {258D5057-81B9-40EC-A872-D21E27452749}
+		{92C1AEF8-D4FC-4631-98B1-F16FB7103398} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EC8BCF1F-A206-4420-A292-3E3F2A4CDC54}

diff --git a/EFCore.sln b/EFCore.sln
@@ -83,6 +83,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.targets = Directory.Build.targets
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Attributes", "src\EFCore.Attributes\EFCore.Attributes.csproj", "{11B51A41-47CB-4EDB-9D8A-17095A65034A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -311,6 +313,14 @@ Global
 		{9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9511216F-EC10-480D-AA8D-F72312C96962}.ReleaseNoBenchmarks|Any CPU.ActiveCfg = Release|Any CPU
 		{9511216F-EC10-480D-AA8D-F72312C96962}.ReleaseNoBenchmarks|Any CPU.Build.0 = Release|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.DebugNoBenchmarks|Any CPU.ActiveCfg = Debug|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.DebugNoBenchmarks|Any CPU.Build.0 = Debug|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.ReleaseNoBenchmarks|Any CPU.ActiveCfg = Release|Any CPU
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A}.ReleaseNoBenchmarks|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -345,6 +355,7 @@ Global
 		{8B289879-9CF1-4EFD-AD4B-781AEA94BDBE} = {8C6EFBE5-F0FB-48D1-B138-A651BB95C957}
 		{EA847C1D-EC25-442B-A940-460969577CD5} = {C41FD56B-38CD-40E3-89E6-071A6C58E36C}
 		{9511216F-EC10-480D-AA8D-F72312C96962} = {EA847C1D-EC25-442B-A940-460969577CD5}
+		{11B51A41-47CB-4EDB-9D8A-17095A65034A} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {285A5EB4-BCF4-40EB-B9E1-DF6DBCB5E705}

diff --git a/samples/OracleProvider/OracleProvider.sln b/samples/OracleProvider/OracleProvider.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.27004.2010
 MinimumVisualStudioVersion = 15.0.26730.03
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore", "..\..\src\EFCore\EFCore.csproj", "{715C38E9-B2F5-4DB2-8025-0C6492DEBDD4}"
 EndProject
@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Specifica
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Specification.Tests", "..\..\src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj", "{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Attributes", "..\..\src\EFCore.Attributes\EFCore.Attributes.csproj", "{1561A725-B84F-4E3A-B316-1B3279DFDAF6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,10 @@ Global
 		{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1561A725-B84F-4E3A-B316-1B3279DFDAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1561A725-B84F-4E3A-B316-1B3279DFDAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1561A725-B84F-4E3A-B316-1B3279DFDAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1561A725-B84F-4E3A-B316-1B3279DFDAF6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -56,6 +62,7 @@ Global
 		{6A25DF99-2615-46D8-9532-821764647EE1} = {57595541-E77D-477C-B48B-C69E061C11F9}
 		{07FA2B15-A6A5-4292-A096-7771FB32EEDA} = {57595541-E77D-477C-B48B-C69E061C11F9}
 		{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE} = {57595541-E77D-477C-B48B-C69E061C11F9}
+		{1561A725-B84F-4E3A-B316-1B3279DFDAF6} = {57595541-E77D-477C-B48B-C69E061C11F9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {321B8079-2AC6-45FF-8D19-B2550F017448}

diff --git a/src/EFCore.Attributes/EFCore.Attributes.csproj b/src/EFCore.Attributes/EFCore.Attributes.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Provides attributes that are used to configure Entity Framework Core
+    </Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <MinClientVersion>3.6</MinClientVersion>
+    <AssemblyName>Microsoft.EntityFrameworkCore.Attributes</AssemblyName>
+    <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <CodeAnalysisRuleSet>..\EFCore.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/EFCore.Attributes/OwnedAttribute.cs b/src/EFCore.Attributes/OwnedAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Microsoft.EntityFrameworkCore
+{
+    /// <summary>
+    ///     Marks a type as owned. All references to this type will be configured as owned entity types.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class OwnedAttribute : Attribute
+    {
+    }
+}
diff --git a/src/EFCore.Specification.Tests/DataAnnotationTestBase.cs b/src/EFCore.Specification.Tests/DataAnnotationTestBase.cs
@@ -1793,6 +1793,7 @@ protected class Post
             public Author Author { get; set; }
         }
 
+        [ComplexType]
         protected class PostDetails
         {
             public int Id { get; set; }
@@ -2085,7 +2086,7 @@ protected class Two
             public byte[] Timestamp { get; set; }
         }
 
-        [ComplexType]
+        [Owned]
         protected class Details
         {
             public string Name { get; set; }

diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
@@ -31,6 +31,10 @@ Microsoft.EntityFrameworkCore.DbSet
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\EFCore.Attributes\EFCore.Attributes.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Properties\CoreStrings.Designer.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

diff --git a/src/EFCore/Metadata/Builders/OwnedEntityTypeBuilder.cs b/src/EFCore/Metadata/Builders/OwnedEntityTypeBuilder.cs
@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel;
+
+namespace Microsoft.EntityFrameworkCore.Metadata.Builders
+{
+    /// <summary>
+    ///     <para>
+    ///         Instances of this class are returned from methods when using the <see cref="ModelBuilder" /> API
+    ///         and it is not designed to be directly constructed in your application code.
+    ///     </para>
+    /// </summary>
+    public class OwnedEntityTypeBuilder
+    {
+        #region Hidden System.Object members
+
+        /// <summary>
+        ///     Returns a string that represents the current object.
+        /// </summary>
+        /// <returns> A string that represents the current object. </returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override string ToString() => base.ToString();
+
+        /// <summary>
+        ///     Determines whether the specified object is equal to the current object.
+        /// </summary>
+        /// <param name="obj"> The object to compare with the current object. </param>
+        /// <returns> true if the specified object is equal to the current object; otherwise, false. </returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => base.Equals(obj);
+
+        /// <summary>
+        ///     Serves as the default hash function.
+        /// </summary>
+        /// <returns> A hash code for the current object. </returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => base.GetHashCode();
+
+        #endregion
+    }
+}
diff --git a/src/EFCore/Metadata/Builders/OwnedEntityTypeBuilder`.cs b/src/EFCore/Metadata/Builders/OwnedEntityTypeBuilder`.cs
@@ -0,0 +1,14 @@
+namespace Microsoft.EntityFrameworkCore.Metadata.Builders
+{
+    /// <summary>
+    ///     <para>
+    ///         Instances of this class are returned from methods when using the <see cref="ModelBuilder" /> API
+    ///         and it is not designed to be directly constructed in your application code.
+    ///     </para>
+    /// </summary>
+    /// <typeparam name="T"> The entity type being configured. </typeparam>
+    // ReSharper disable once UnusedTypeParameter
+    public class OwnedEntityTypeBuilder<T> : OwnedEntityTypeBuilder
+    {
+    }
+}
diff --git a/src/EFCore/Metadata/Conventions/Internal/OwnedEntityTypeAttributeConvention.cs b/src/EFCore/Metadata/Conventions/Internal/OwnedEntityTypeAttributeConvention.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal
@@ -10,13 +9,13 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal
     ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
     ///     directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    public class OwnedEntityTypeAttributeConvention : EntityTypeAttributeConvention<ComplexTypeAttribute>
+    public class OwnedEntityTypeAttributeConvention : EntityTypeAttributeConvention<OwnedAttribute>
     {
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public override InternalEntityTypeBuilder Apply(InternalEntityTypeBuilder entityTypeBuilder, ComplexTypeAttribute attribute)
+        public override InternalEntityTypeBuilder Apply(InternalEntityTypeBuilder entityTypeBuilder, OwnedAttribute attribute)
             => (entityTypeBuilder.Metadata.HasClrType()
                 ? entityTypeBuilder.ModelBuilder.OwnedEntity(entityTypeBuilder.Metadata.ClrType, ConfigurationSource.DataAnnotation)
                 : entityTypeBuilder.ModelBuilder.OwnedEntity(entityTypeBuilder.Metadata.Name, ConfigurationSource.DataAnnotation))

diff --git a/src/EFCore/ModelBuilder.cs b/src/EFCore/ModelBuilder.cs
@@ -240,33 +240,27 @@ public virtual ModelBuilder ApplyConfiguration<TEntity>([NotNull] IEntityTypeCon
         ///     Marks an entity type as owned. All references to this type will be configured as
         ///     separate owned type instances.
         /// </summary>
-        /// <typeparam name="TEntity"> The entity type to be configured. </typeparam>
-        public virtual void OwnedEntity<TEntity>()
-            where TEntity : class
-            => Builder.OwnedEntity(typeof(TEntity), ConfigurationSource.Explicit);
+        /// <typeparam name="T"> The entity type to be configured. </typeparam>
+        public virtual OwnedEntityTypeBuilder<T> Owned<T>()
+            where T : class
+        {
+            Builder.OwnedEntity(typeof(T), ConfigurationSource.Explicit);
+
+            return null;
+        }
 
         /// <summary>
         ///     Marks an entity type as owned. All references to this type will be configured as
         ///     separate owned type instances.
         /// </summary>
         /// <param name="type"> The entity type to be configured. </param>
-        public virtual void OwnedEntity([NotNull] Type type)
+        public virtual OwnedEntityTypeBuilder Owned([NotNull] Type type)
         {
             Check.NotNull(type, nameof(type));
 
             Builder.OwnedEntity(type, ConfigurationSource.Explicit);
-        }
-
-        /// <summary>
-        ///     Marks an entity type as owned. All references to this type will be configured as
-        ///     separate owned type instances.
-        /// </summary>
-        /// <param name="name"> The name of the entity type to be configured. </param>
-        public virtual void OwnedEntity([NotNull] string name)
-        {
-            Check.NotEmpty(name, nameof(name));
 
-            Builder.OwnedEntity(name, ConfigurationSource.Explicit);
+            return null;
         }
 
         /// <summary>

diff --git a/test/EFCore.Tests/ApiConsistencyTest.cs b/test/EFCore.Tests/ApiConsistencyTest.cs
@@ -61,7 +61,6 @@ where type.GetTypeInfo().IsVisible
                   from method in type.GetMethods(PublicInstance)
                   where method.DeclaringType == type
                         && method.ReturnType == typeof(void)
-                        && method.Name != nameof(ModelBuilder.OwnedEntity)
                   select type.Name + "." + method.Name;
 
             Assert.Equal("", string.Join(Environment.NewLine, voidMethods));

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipStringTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipStringTest.cs
@@ -49,8 +49,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity<TEntity>();
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned<TEntity>();
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipTypeStringTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipTypeStringTest.cs
@@ -35,8 +35,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity<TEntity>();
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned<TEntity>();
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipTypeTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericRelationshipTypeTest.cs
@@ -36,8 +36,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity<TEntity>();
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned<TEntity>();
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderGenericTest.cs
@@ -123,8 +123,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity<TEntity>();
+            public override void Owned<T>()
+                => ModelBuilder.Owned<T>();
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericStringTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericStringTest.cs
@@ -180,11 +180,8 @@ public NonGenericStringTestEntityTypeBuilder Entity(Type type)
             public NonGenericStringTestEntityTypeBuilder Entity(string name)
                 => new NonGenericStringTestEntityTypeBuilder(ModelBuilder.Entity(name));
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity(typeof(TEntity));
-
-            public void OwnedEntity(string name)
-                => ModelBuilder.OwnedEntity(name);
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned(typeof(TEntity));
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericTest.cs
@@ -70,8 +70,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity(typeof(TEntity));
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned(typeof(TEntity));
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericUnqualifiedStringTest.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderNonGenericUnqualifiedStringTest.cs
@@ -49,8 +49,8 @@ public override TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TE
                 return this;
             }
 
-            public override void OwnedEntity<TEntity>()
-                => ModelBuilder.OwnedEntity<TEntity>();
+            public override void Owned<TEntity>()
+                => ModelBuilder.Owned<TEntity>();
 
             public override TestModelBuilder Ignore<TEntity>()
             {

diff --git a/test/EFCore.Tests/ModelBuilding/ModelBuilderTestBase.cs b/test/EFCore.Tests/ModelBuilding/ModelBuilderTestBase.cs
@@ -127,7 +127,7 @@ public abstract TestEntityTypeBuilder<TEntity> Entity<TEntity>()
                 where TEntity : class;
 
 
-            public abstract void OwnedEntity<TEntity>()
+            public abstract void Owned<TEntity>()
                 where TEntity : class;
 
             public abstract TestModelBuilder Entity<TEntity>(Action<TestEntityTypeBuilder<TEntity>> buildAction)

diff --git a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs
@@ -214,7 +214,7 @@ public virtual void Can_configure_all_ownerships_with_one_call()
             {
                 var modelBuilder = CreateModelBuilder();
 
-                modelBuilder.OwnedEntity<BookLabel>();
+                modelBuilder.Owned<BookLabel>();
                 modelBuilder.Entity<Book>().OwnsOne(b => b.Label);
 
                 modelBuilder.Validate();