diff --git a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs index 60a3d5d887d3..52e1a5c9b17f 100644 --- a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs +++ b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs @@ -132,6 +132,7 @@ protected IdentityUserContext() { } /// /// Gets the schema version used for versioning. /// + [Obsolete("SchemaVersion is not used by IdentityUserContext. Configure the schema version using IdentityOptions.Stores.SchemaVersion instead.")] protected virtual Version SchemaVersion { get => GetStoreOptions()?.SchemaVersion ?? IdentitySchemaVersions.Version1; } private StoreOptions? GetStoreOptions() => this.GetService() diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs index 8e4ed3143493..56b6ee86dbcf 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs @@ -41,7 +41,10 @@ public EmptyDbContext(DbContextOptions options) protected override void OnModelCreating(ModelBuilder builder) { - if (SchemaVersion >= new Version(10, 0)) + var storeOptions = this.GetService>()?.Value?.Stores; + var schemaVersion = storeOptions?.SchemaVersion ?? IdentitySchemaVersions.Version1; + + if (schemaVersion >= new Version(10, 0)) { builder.Ignore(); @@ -84,7 +87,10 @@ protected override void OnModelCreating(ModelBuilder builder) { base.OnModelCreating(builder); - if (SchemaVersion >= new Version(3, 0)) + var storeOptions = this.GetService>()?.Value?.Stores; + var schemaVersion = storeOptions?.SchemaVersion ?? IdentitySchemaVersions.Version1; + + if (schemaVersion >= new Version(3, 0)) { builder.Entity(b => {