De-nest ServiceCharacteristics

src/EFCore.Relational/Infrastructure/EntityFrameworkRelationalServicesBuilder.cs

@@ -106,10 +106,10 @@ public EntityFrameworkRelationalServicesBuilder([NotNull] IServiceCollection ser
         }
 
         /// <summary>
-        ///     Gets the <see cref="EntityFrameworkServicesBuilder.ServiceCharacteristics" /> for the given service type.
+        ///     Gets the <see cref="ServiceCharacteristics" /> for the given service type.
         /// </summary>
         /// <param name="serviceType"> The type that defines the service API. </param>
-        /// <returns> The <see cref="EntityFrameworkServicesBuilder.ServiceCharacteristics" /> for the type. </returns>
+        /// <returns> The <see cref="ServiceCharacteristics" /> for the type. </returns>
         /// <exception cref="InvalidOperationException"> when the type is not an EF service. </exception>
         protected override ServiceCharacteristics GetServiceCharacteristics(Type serviceType)
             => RelationalServices.TryGetValue(serviceType, out var characteristics)

src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs

@@ -451,32 +451,5 @@ public virtual EntityFrameworkServicesBuilder TryAdd(
 
             return this;
         }
-
-        /// <summary>
-        ///     Characteristics of a given EF service.
-        /// </summary>
-        public readonly struct ServiceCharacteristics
-        {
-            /// <summary>
-            ///     Creates a new <see cref="ServiceCharacteristics" /> struct.
-            /// </summary>
-            /// <param name="lifetime"> The service lifetime. </param>
-            /// <param name="multipleRegistrations"> True if multiple registrations of the service is allowed; false otherwise. </param>
-            public ServiceCharacteristics(ServiceLifetime lifetime, bool multipleRegistrations = false)
-            {
-                Lifetime = lifetime;
-                MultipleRegistrations = multipleRegistrations;
-            }
-
-            /// <summary>
-            ///     The service lifetime.
-            /// </summary>
-            public ServiceLifetime Lifetime { get; }
-
-            /// <summary>
-            ///     True if multiple registrations of the service is allowed; false otherwise.
-            /// </summary>
-            public bool MultipleRegistrations { get; }
-        }
     }
 }

src/EFCore/Infrastructure/ServiceCharacteristics.cs

@@ -0,0 +1,34 @@
+// 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 Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.EntityFrameworkCore.Infrastructure
+{
+    /// <summary>
+    ///     Characteristics of a given EF service.
+    /// </summary>
+    public readonly struct ServiceCharacteristics
+    {
+        /// <summary>
+        ///     Creates a new <see cref="ServiceCharacteristics" /> struct.
+        /// </summary>
+        /// <param name="lifetime"> The service lifetime. </param>
+        /// <param name="multipleRegistrations"> True if multiple registrations of the service is allowed; false otherwise. </param>
+        public ServiceCharacteristics(ServiceLifetime lifetime, bool multipleRegistrations = false)
+        {
+            Lifetime = lifetime;
+            MultipleRegistrations = multipleRegistrations;
+        }
+
+        /// <summary>
+        ///     The service lifetime.
+        /// </summary>
+        public ServiceLifetime Lifetime { get; }
+
+        /// <summary>
+        ///     True if multiple registrations of the service is allowed; false otherwise.
+        /// </summary>
+        public bool MultipleRegistrations { get; }
+    }
+}

test/EFCore.Specification.Tests/EntityFrameworkServiceCollectionExtensionsTestBase.cs

@@ -45,7 +45,7 @@ public virtual void Required_services_are_registered_with_expected_lifetimes()
         }
 
         protected virtual void LifetimeTest(
-            params IDictionary<Type, EntityFrameworkServicesBuilder.ServiceCharacteristics>[] serviceDefinitions)
+            params IDictionary<Type, ServiceCharacteristics>[] serviceDefinitions)
         {
             var services = AddServices(new ServiceCollection());