Replace DbContext.DesignTimeModel with IDesignTimeModel service

src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs

@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Update;
@@ -21,7 +20,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal
     public class CosmosDatabaseCreator : IDatabaseCreator
     {
         private readonly ICosmosClientWrapper _cosmosClient;
-        private readonly IModel _designModel;
+        private readonly IDesignTimeModel _designTimeModel;
         private readonly IUpdateAdapterFactory _updateAdapterFactory;
         private readonly IDatabase _database;
 
@@ -33,12 +32,12 @@ public class CosmosDatabaseCreator : IDatabaseCreator
         /// </summary>
         public CosmosDatabaseCreator(
             ICosmosClientWrapper cosmosClient,
-            ICurrentDbContext context,
+            IDesignTimeModel designTimeModel,
             IUpdateAdapterFactory updateAdapterFactory,
             IDatabase database)
         {
             _cosmosClient = cosmosClient;
-            _designModel = context.Context.DesignTimeModel;
+            _designTimeModel = designTimeModel;
             _updateAdapterFactory = updateAdapterFactory;
             _database = database;
         }
@@ -52,7 +51,7 @@ public CosmosDatabaseCreator(
         public virtual bool EnsureCreated()
         {
             var created = _cosmosClient.CreateDatabaseIfNotExists();
-            foreach (var entityType in _designModel.GetEntityTypes())
+            foreach (var entityType in _designTimeModel.Model.GetEntityTypes())
             {
                 var containerName = entityType.GetContainer();
                 if (containerName != null)
@@ -81,7 +80,7 @@ public virtual async Task<bool> EnsureCreatedAsync(CancellationToken cancellatio
         {
             var created = await _cosmosClient.CreateDatabaseIfNotExistsAsync(cancellationToken)
                 .ConfigureAwait(false);
-            foreach (var entityType in _designModel.GetEntityTypes())
+            foreach (var entityType in _designTimeModel.Model.GetEntityTypes())
             {
                 var containerName = entityType.GetContainer();
                 if (containerName != null)
@@ -131,7 +130,7 @@ public virtual Task SeedAsync(CancellationToken cancellationToken = default)
         private IUpdateAdapter AddSeedData()
         {
             var updateAdapter = _updateAdapterFactory.CreateStandalone();
-            foreach (var entityType in _designModel.GetEntityTypes())
+            foreach (var entityType in _designTimeModel.Model.GetEntityTypes())
             {
                 IEntityType? targetEntityType = null;
                 foreach (var targetSeed in entityType.GetSeedData())

src/EFCore.Design/Design/DesignTimeServiceCollectionExtensions.cs

@@ -120,7 +120,7 @@ public static IServiceCollection AddDbContextDesignTimeServices(
                 .AddTransient(_ => context.GetService<IMigrationsModelDiffer>())
                 .AddTransient(_ => context.GetService<IMigrator>())
                 .AddTransient(_ => context.GetService<IRelationalTypeMappingSource>())
-                .AddTransient(_ => context.DesignTimeModel)
+                .AddTransient(_ => context.GetService<IDesignTimeModel>().Model)
                 .AddTransient(_ => context.GetService<IModelRuntimeInitializer>());
     }
 }

src/EFCore.InMemory/Storage/Internal/InMemoryDatabase.cs

@@ -34,7 +34,7 @@ public class InMemoryDatabase : Database, IInMemoryDatabase
         private readonly IInMemoryStore _store;
         private readonly IUpdateAdapterFactory _updateAdapterFactory;
         private readonly IDiagnosticsLogger<DbLoggerCategory.Update> _updateLogger;
-        private readonly Func<IModel> _getDesignModel;
+        private readonly IDesignTimeModel _designTimeModel;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -46,7 +46,7 @@ public InMemoryDatabase(
             DatabaseDependencies dependencies,
             IInMemoryStoreCache storeCache,
             IDbContextOptions options,
-            ICurrentDbContext context,
+            IDesignTimeModel designTimeModel,
             IUpdateAdapterFactory updateAdapterFactory,
             IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger)
             : base(dependencies)
@@ -57,7 +57,7 @@ public InMemoryDatabase(
             Check.NotNull(updateLogger, nameof(updateLogger));
 
             _store = storeCache.GetStore(options);
-            _getDesignModel = () => context.Context.DesignTimeModel;
+            _designTimeModel = designTimeModel;
             _updateAdapterFactory = updateAdapterFactory;
             _updateLogger = updateLogger;
         }
@@ -98,6 +98,6 @@ public override Task<int> SaveChangesAsync(
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual bool EnsureDatabaseCreated()
-            => _store.EnsureCreated(_updateAdapterFactory, _getDesignModel(), _updateLogger);
+            => _store.EnsureCreated(_updateAdapterFactory, _designTimeModel.Model, _updateLogger);
     }
 }

src/EFCore.Relational/Storage/RelationalDatabaseCreator.cs

@@ -7,6 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Transactions;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -143,10 +145,13 @@ public virtual Task CreateTablesAsync(CancellationToken cancellationToken = defa
         /// <returns> The generated commands. </returns>
         protected virtual IReadOnlyList<MigrationCommand> GetCreateTablesCommands(
             MigrationsSqlGenerationOptions options = MigrationsSqlGenerationOptions.Default)
-            => Dependencies.MigrationsSqlGenerator.Generate(
-                Dependencies.ModelDiffer.GetDifferences(null, Dependencies.CurrentContext.Context.DesignTimeModel.GetRelationalModel()),
-                Dependencies.CurrentContext.Context.DesignTimeModel,
+        {
+            var model = Dependencies.CurrentContext.Context.GetService<IDesignTimeModel>().Model;
+            return Dependencies.MigrationsSqlGenerator.Generate(
+                Dependencies.ModelDiffer.GetDifferences(null, model.GetRelationalModel()),
+                model,
                 options);
+        }
 
         /// <summary>
         ///     Determines whether the database contains any tables. No attempt is made to determine if

src/EFCore.SqlServer/Storage/Internal/SqlServerDatabaseCreator.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Operations;
@@ -178,7 +179,7 @@ private IReadOnlyList<MigrationCommand> CreateCreateOperations()
                     {
                         Name = builder.InitialCatalog,
                         FileName = builder.AttachDBFilename,
-                        Collation = Dependencies.CurrentContext.Context.DesignTimeModel.GetCollation()
+                        Collation = Dependencies.CurrentContext.Context.GetService<IDesignTimeModel>().Model.GetCollation()
                     }
                 },
                 null);

src/EFCore/DbContext.cs

@@ -146,16 +146,6 @@ public virtual IModel Model
             get => ContextServices.Model;
         }
 
-        /// <summary>
-        ///     The metadata about the shape of entities, the relationships between them, and how they map to the database.
-        ///     Also includes all the information necessary to initialize the database.
-        /// </summary>
-        public virtual IModel DesignTimeModel
-        {
-            [DebuggerStepThrough]
-            get => ContextServices.DesignTimeModel;
-        }
-
         /// <summary>
         ///     <para>
         ///         A unique identifier for the context instance and pool lease, if any.

src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs

@@ -121,6 +121,7 @@ public static readonly IDictionary<Type, ServiceCharacteristics> CoreServices
                 { typeof(IQueryCompiler), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(ICompiledQueryCacheKeyGenerator), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IModel), new ServiceCharacteristics(ServiceLifetime.Scoped) },
+                { typeof(IDesignTimeModel), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IUpdateAdapterFactory), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(ICurrentDbContext), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IDbContextDependencies), new ServiceCharacteristics(ServiceLifetime.Scoped) },
@@ -253,6 +254,7 @@ public virtual EntityFrameworkServicesBuilder TryAddCoreServices()
             TryAdd<ISingletonOptions, ILoggingOptions>(p => p.GetRequiredService<ILoggingOptions>());
             TryAdd<ISingletonOptions, ICoreSingletonOptions>(p => p.GetRequiredService<ICoreSingletonOptions>());
             TryAdd(p => GetContextServices(p).Model);
+            TryAdd<IDesignTimeModel>(p => new DesignTimeModel(GetContextServices(p)));
             TryAdd(p => GetContextServices(p).CurrentContext);
             TryAdd(p => GetContextServices(p).ContextOptions);
             TryAdd<IResettableService, IStateManager>(p => p.GetRequiredService<IStateManager>());

src/EFCore/Metadata/IDesignTimeModel.cs

@@ -0,0 +1,28 @@
+// 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.Metadata
+{
+    /// <summary>
+    ///     <para>
+    ///         The metadata about the shape of entities, the relationships between them, and how they map to the database.
+    ///         Also includes all the information necessary to initialize the database.
+    ///     </para>
+    ///     <para>
+    ///         The service lifetime is <see cref="ServiceLifetime.Scoped" />. This means that each
+    ///         <see cref="DbContext" /> instance will use its own instance of this service.
+    ///         The implementation may depend on other services registered with any lifetime.
+    ///         The implementation does not need to be thread-safe.
+    ///     </para>
+    /// </summary>
+    public interface IDesignTimeModel
+    {
+        /// <summary>
+        ///     Gets the metadata about the shape of entities, the relationships between them, and how they map to the database.
+        ///     Also includes all the information necessary to initialize the database.
+        /// </summary>
+        public IModel Model { get; }
+    }
+}

src/EFCore/Metadata/Internal/DesignTimeModel.cs

@@ -0,0 +1,37 @@
+// 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.EntityFrameworkCore.Internal;
+
+namespace Microsoft.EntityFrameworkCore.Metadata.Internal
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public class DesignTimeModel : IDesignTimeModel
+    {
+        private readonly IDbContextServices _contextServices;
+
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        public DesignTimeModel(IDbContextServices contextServices)
+        {
+            _contextServices = contextServices;
+        }
+
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        public virtual IModel Model => _contextServices.DesignTimeModel;
+    }
+}

test/EFCore.Design.Tests/Migrations/Design/SnapshotModelProcessorTest.cs

@@ -203,7 +203,8 @@ public void Can_diff_against_older_ownership_model(Type snapshotType)
             var processor = new SnapshotModelProcessor(reporter, modelRuntimeInitializer);
             var model = processor.Process(snapshot.Model);
 
-            var differences = differ.GetDifferences(model.GetRelationalModel(), context.DesignTimeModel.GetRelationalModel());
+            var differences = differ.GetDifferences(model.GetRelationalModel(),
+                context.GetService<IDesignTimeModel>().Model.GetRelationalModel());
 
             Assert.Empty(differences);
         }

test/EFCore.Proxies.Tests/ChangeDetectionProxyTests.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
@@ -89,7 +90,8 @@ public void Sets_default_change_tracking_strategy()
         {
             using var context = new ChangeContext<ChangeValueEntity>();
 
-            Assert.Equal(ChangeTrackingStrategy.ChangingAndChangedNotifications, context.DesignTimeModel.GetChangeTrackingStrategy());
+            Assert.Equal(ChangeTrackingStrategy.ChangingAndChangedNotifications,
+                context.GetService<IDesignTimeModel>().Model.GetChangeTrackingStrategy());
         }
 
         [ConditionalFact]

test/EFCore.Relational.Specification.Tests/Migrations/MigrationsInfrastructureTestBase.cs

@@ -312,7 +312,7 @@ protected virtual void DiffSnapshot(ModelSnapshot snapshot, DbContext context)
             var modelDiffer = context.GetService<IMigrationsModelDiffer>();
             var operations = modelDiffer.GetDifferences(
                 sourceModel.GetRelationalModel(),
-                context.DesignTimeModel.GetRelationalModel());
+                context.GetService<IDesignTimeModel>().Model.GetRelationalModel());
 
             Assert.Equal(0, operations.Count);
         }

test/EFCore.Specification.Tests/FieldMappingTestBase.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
@@ -2182,7 +2183,7 @@ protected override void Seed(PoolableDbContext context)
                     context.Add(CreateBlogAndPosts<BlogFullExplicit, PostFullExplicit>(new List<PostFullExplicit>()));
                     context.AddRange(CreatePostsAndBlog<BlogFullExplicit, PostFullExplicit>());
 
-                    if (context.DesignTimeModel.GetPropertyAccessMode() != PropertyAccessMode.Property)
+                    if (context.GetService<IDesignTimeModel>().Model.GetPropertyAccessMode() != PropertyAccessMode.Property)
                     {
                         context.Add(CreateBlogAndPosts<BlogReadOnly, PostReadOnly>(new ObservableCollection<PostReadOnly>()));
                         context.AddRange(CreatePostsAndBlog<BlogReadOnly, PostReadOnly>());

test/EFCore.Tests/DbContextTest.cs

@@ -763,7 +763,7 @@ public async Task It_throws_object_disposed_exception(bool async)
                 (await Assert.ThrowsAsync<ObjectDisposedException>(() => context.FindAsync(typeof(Random), 77).AsTask())).Message);
 
             var methodCount = typeof(DbContext).GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly).Count();
-            var expectedMethodCount = 51;
+            var expectedMethodCount = 50;
             Assert.True(
                 methodCount == expectedMethodCount,
                 userMessage: $"Expected {expectedMethodCount} methods on DbContext but found {methodCount}. "
@@ -780,14 +780,13 @@ public async Task It_throws_object_disposed_exception(bool async)
 
             Assert.StartsWith(
                 CoreStrings.ContextDisposed,
-                Assert.Throws<ObjectDisposedException>(() => context.DesignTimeModel).Message);
+                Assert.Throws<ObjectDisposedException>(() => context.GetService<IDesignTimeModel>().Model).Message);
 
             var expectedProperties = new List<string>
             {
                 nameof(DbContext.ChangeTracker),
                 nameof(DbContext.ContextId), // By-design, does not throw for disposed context
                 nameof(DbContext.Database),
-                nameof(DbContext.DesignTimeModel),
                 nameof(DbContext.Model)
             };
 

test/EFCore.Tests/ModelSourceTest.cs

@@ -155,15 +155,15 @@ public void Model_from_options_is_preserved()
 
             var context = new ModelContext(model);
 
-            Assert.NotSame(context.Model, context.DesignTimeModel);
+            Assert.NotSame(context.Model, context.GetService<IDesignTimeModel>().Model);
             Assert.Same(model, context.Model);
-            Assert.NotSame(model, context.DesignTimeModel);
+            Assert.NotSame(model, context.GetService<IDesignTimeModel>().Model);
 
             var designTimeContext = new ModelContext(designTimeModel);
 
-            Assert.NotSame(context.Model, designTimeContext.DesignTimeModel);
+            Assert.NotSame(context.Model, designTimeContext.GetService<IDesignTimeModel>().Model);
             Assert.NotSame(model, designTimeContext.Model);
-            Assert.Same(designTimeModel, designTimeContext.DesignTimeModel);
+            Assert.Same(designTimeModel, designTimeContext.GetService<IDesignTimeModel>().Model);
         }
 
         private class ModelContext : DbContext