From d7edfba775c9f33e15d45411c9c2005387c9e8bd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:30:42 +0000
Subject: [PATCH 1/2] Initial plan


From 12a479e836663344870ca3d08416eb98b909cdb0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:52:20 +0000
Subject: [PATCH 2/2] Obsolete IdentityUserContext.SchemaVersion property

Co-authored-by: MackinnonBuck <10456961+MackinnonBuck@users.noreply.github.com>
---
 .../EntityFrameworkCore/src/IdentityUserContext.cs     |  1 +
 .../test/EF.Test/VersionTestDbContext.cs               | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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() { }
     /// <summary>
     /// Gets the schema version used for versioning.
     /// </summary>
+    [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<IDbContextOptions>()
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<Microsoft.Extensions.Options.IOptions<IdentityOptions>>()?.Value?.Stores;
+        var schemaVersion = storeOptions?.SchemaVersion ?? IdentitySchemaVersions.Version1;
+
+        if (schemaVersion >= new Version(10, 0))
         {
             builder.Ignore<IdentityUser>();
 
@@ -84,7 +87,10 @@ protected override void OnModelCreating(ModelBuilder builder)
     {
         base.OnModelCreating(builder);
 
-        if (SchemaVersion >= new Version(3, 0))
+        var storeOptions = this.GetService<Microsoft.Extensions.Options.IOptions<IdentityOptions>>()?.Value?.Stores;
+        var schemaVersion = storeOptions?.SchemaVersion ?? IdentitySchemaVersions.Version1;
+
+        if (schemaVersion >= new Version(3, 0))
         {
             builder.Entity<CustomColumn>(b =>
             {