Fix logic in TPT sproc validation where the root type is abstract

src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs

@@ -343,6 +343,11 @@ private static void ValidateSproc(IStoredProcedure sproc, string mappingStrategy
 
                     foreach (var property in baseType.GetDeclaredProperties())
                     {
+                        if (property.IsPrimaryKey())
+                        {
+                            continue;
+                        }
+
                         properties.Add(property.Name, property);
                     }
 
@@ -351,8 +356,6 @@ private static void ValidateSproc(IStoredProcedure sproc, string mappingStrategy
             }
         }
 
-        var originalValueProperties = new Dictionary<string, IProperty>(properties);
-
         var storeGeneratedProperties = storeObjectIdentifier.StoreObjectType switch
         {
             StoreObjectType.InsertStoredProcedure
@@ -418,6 +421,7 @@ private static void ValidateSproc(IStoredProcedure sproc, string mappingStrategy
             }
         }
 
+        var originalValueProperties = new Dictionary<string, IProperty>(properties);
         var parameterNames = new HashSet<string>();
         foreach (var parameter in sproc.Parameters)
         {
@@ -615,7 +619,7 @@ protected virtual void ValidateBoolsWithDefaults(
 
         static bool IsNotNullAndFalse(object? value)
             => value != null
-                && (!(value is bool asBool) || asBool);
+                && (value is not bool asBool || asBool);
     }
 
     /// <summary>

src/EFCore.Relational/Metadata/Internal/StoreStoredProcedureParameter.cs

@@ -44,23 +44,23 @@ public StoreStoredProcedureParameter(
     /// </summary>
     public virtual StoreStoredProcedure StoredProcedure
         => (StoreStoredProcedure)Table;
-    
+
     /// <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 ParameterDirection Direction { get; }
-    
+
     /// <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 int Position { get; }
-    
+
     /// <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

src/EFCore.Relational/Metadata/Internal/StoreStoredProcedureReturnValue.cs

@@ -37,7 +37,7 @@ public StoreStoredProcedureReturnValue(
     /// </summary>
     public virtual StoreStoredProcedure StoredProcedure
         => (StoreStoredProcedure)Table;
-    
+
     /// <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

src/EFCore.Relational/Metadata/Internal/StoredProcedureMapping.cs

@@ -39,7 +39,7 @@ public virtual IStoreStoredProcedure StoreStoredProcedure
 
     /// <inheritdoc />
     public virtual StoreObjectIdentifier StoredProcedureIdentifier { get; }
-    
+
     /// <inheritdoc />
     public virtual ITableMapping? TableMapping { get; }
 

src/EFCore.Relational/Metadata/Internal/StoredProcedureParameter.cs

@@ -77,7 +77,7 @@ public virtual bool IsInModel
     /// </summary>
     public virtual void SetRemovedFromModel()
         => _builder = null;
-    
+
     /// <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
@@ -94,7 +94,7 @@ public override bool IsReadOnly
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual StoredProcedure StoredProcedure { get; }
-    
+
     /// <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
@@ -110,7 +110,7 @@ public override bool IsReadOnly
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual string? PropertyName { get; }
-    
+
     /// <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
@@ -172,7 +172,7 @@ public virtual string SetName(string name, ConfigurationSource configurationSour
 
         return name;
     }
-    
+
     /// <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
@@ -181,7 +181,7 @@ public virtual string SetName(string name, ConfigurationSource configurationSour
     /// </summary>
     public virtual ConfigurationSource? GetNameConfigurationSource()
         => _nameConfigurationSource;
-    
+
     /// <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
@@ -208,7 +208,7 @@ public virtual ParameterDirection SetDirection(ParameterDirection direction, Con
                 RelationalStrings.StoredProcedureParameterInvalidConfiguration(
                     nameof(Direction), Name, ((IReadOnlyStoredProcedure)StoredProcedure).GetStoreIdentifier()?.DisplayName()));
         }
-        
+
         if (!IsValid(direction))
         {
             throw new InvalidOperationException(RelationalStrings.StoredProcedureParameterInvalidDirection(
@@ -276,28 +276,28 @@ IReadOnlyStoredProcedure IReadOnlyStoredProcedureParameter.StoredProcedure
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IMutableStoredProcedure IMutableStoredProcedureParameter.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IConventionStoredProcedure IConventionStoredProcedureParameter.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IStoredProcedure IStoredProcedureParameter.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IConventionStoredProcedureParameterBuilder IConventionStoredProcedureParameter.Builder
     {
@@ -308,7 +308,7 @@ IConventionStoredProcedureParameterBuilder IConventionStoredProcedureParameter.B
     /// <inheritdoc />
     string IConventionStoredProcedureParameter.SetName(string name, bool fromDataAnnotation)
         => SetName(name, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
-    
+
     /// <inheritdoc />
     ParameterDirection IConventionStoredProcedureParameter.SetDirection(ParameterDirection direction, bool fromDataAnnotation)
         => SetDirection(direction, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);

src/EFCore.Relational/Metadata/Internal/StoredProcedureParameterMapping.cs

@@ -25,7 +25,7 @@ public StoredProcedureParameterMapping(
         : base(property, storeParameter, storedProcedureMapping)
     {
         Parameter = parameter;
-    }    
+    }
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/StoredProcedureResultColumn.cs

@@ -16,7 +16,7 @@ public class StoredProcedureResultColumn :
     IRuntimeStoredProcedureResultColumn
 {
     private string _name = "RowsAffected";
-    
+
     private ConfigurationSource? _nameConfigurationSource;
     private InternalStoredProcedureResultColumnBuilder? _builder;
 
@@ -66,7 +66,7 @@ public virtual bool IsInModel
     /// </summary>
     public virtual void SetRemovedFromModel()
         => _builder = null;
-    
+
     /// <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
@@ -83,7 +83,7 @@ public override bool IsReadOnly
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual StoredProcedure StoredProcedure { get; }
-    
+
     /// <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
@@ -99,7 +99,7 @@ public override bool IsReadOnly
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual string? PropertyName { get; }
-    
+
     /// <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
@@ -136,21 +136,21 @@ public virtual string Name
             _name = name;
 
             _nameConfigurationSource = configurationSource.Max(_nameConfigurationSource);
-            
+
             return name;
         }
-        
+
         if (configurationSource == ConfigurationSource.Explicit)
         {
             GetProperty().SetColumnName(name, ((IReadOnlyStoredProcedure)StoredProcedure).GetStoreIdentifier()!.Value);
             return name;
         }
-        
+
         return ((IConventionProperty)GetProperty()).SetColumnName(
             name, ((IReadOnlyStoredProcedure)StoredProcedure).GetStoreIdentifier()!.Value,
             fromDataAnnotation: configurationSource == ConfigurationSource.DataAnnotation);
     }
-    
+
     /// <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
@@ -195,28 +195,28 @@ IReadOnlyStoredProcedure IReadOnlyStoredProcedureResultColumn.StoredProcedure
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IMutableStoredProcedure IMutableStoredProcedureResultColumn.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IConventionStoredProcedure IConventionStoredProcedureResultColumn.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IStoredProcedure IStoredProcedureResultColumn.StoredProcedure
     {
         [DebuggerStepThrough]
         get => StoredProcedure;
     }
-    
+
     /// <inheritdoc />
     IConventionStoredProcedureResultColumnBuilder IConventionStoredProcedureResultColumn.Builder
     {

src/EFCore.Relational/Metadata/Internal/StoredProcedureResultColumnMapping.cs

@@ -34,7 +34,7 @@ public StoredProcedureResultColumnMapping(
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual IStoredProcedureResultColumn ResultColumn { get; }
-    
+
     /// <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

src/EFCore.Relational/Metadata/RuntimeStoredProcedure.cs

@@ -132,7 +132,7 @@ IEntityType IStoredProcedure.EntityType
         [DebuggerStepThrough]
         get => _name;
     }
-    
+
     /// <inheritdoc />
     string IStoredProcedure.Name
     {
@@ -160,7 +160,7 @@ IReadOnlyList<IReadOnlyStoredProcedureParameter> IReadOnlyStoredProcedure.Parame
         [DebuggerStepThrough]
         get => _parameters;
     }
-    
+
     /// <inheritdoc />
     IReadOnlyList<IStoredProcedureParameter> IStoredProcedure.Parameters
     {
@@ -172,12 +172,12 @@ IReadOnlyList<IStoredProcedureParameter> IStoredProcedure.Parameters
     IReadOnlyStoredProcedureParameter? IReadOnlyStoredProcedure.FindParameter(string propertyName)
         => _parameters.FirstOrDefault((IReadOnlyStoredProcedureParameter p)
             => p.ForOriginalValue == false && p.PropertyName == propertyName);
-    
+
     /// <inheritdoc />
     [DebuggerStepThrough]
     IStoredProcedureParameter? IStoredProcedure.FindParameter(string propertyName)
         => (IStoredProcedureParameter?)((IReadOnlyStoredProcedure)this).FindParameter(propertyName);
-    
+
     /// <inheritdoc />
     IReadOnlyStoredProcedureParameter? IReadOnlyStoredProcedure.FindOriginalValueParameter(string propertyName)
         => _parameters.FirstOrDefault((IReadOnlyStoredProcedureParameter p)
@@ -186,12 +186,12 @@ IReadOnlyList<IStoredProcedureParameter> IStoredProcedure.Parameters
     /// <inheritdoc />
     IStoredProcedureParameter? IStoredProcedure.FindOriginalValueParameter(string propertyName)
         => (IStoredProcedureParameter?)((IReadOnlyStoredProcedure)this).FindOriginalValueParameter(propertyName);
-    
+
     /// <inheritdoc />
     IReadOnlyStoredProcedureParameter? IReadOnlyStoredProcedure.FindRowsAffectedParameter()
         => _parameters.FirstOrDefault((IStoredProcedureParameter p)
             => p.ForRowsAffected);
-    
+
     /// <inheritdoc />
     IStoredProcedureParameter? IStoredProcedure.FindRowsAffectedParameter()
         => (IStoredProcedureParameter?)((IReadOnlyStoredProcedure)this).FindRowsAffectedParameter();
@@ -202,7 +202,7 @@ IReadOnlyList<IReadOnlyStoredProcedureResultColumn> IReadOnlyStoredProcedure.Res
         [DebuggerStepThrough]
         get => _resultColumns;
     }
-    
+
     /// <inheritdoc />
     IReadOnlyList<IStoredProcedureResultColumn> IStoredProcedure.ResultColumns
     {
@@ -214,7 +214,7 @@ IReadOnlyList<IStoredProcedureResultColumn> IStoredProcedure.ResultColumns
     IReadOnlyStoredProcedureResultColumn? IReadOnlyStoredProcedure.FindResultColumn(string propertyName)
         => _resultColumns.FirstOrDefault((IReadOnlyStoredProcedureResultColumn c)
             => c.PropertyName == propertyName);
-    
+
     /// <inheritdoc />
     IStoredProcedureResultColumn? IStoredProcedure.FindResultColumn(string propertyName)
         => (IStoredProcedureResultColumn?)((IReadOnlyStoredProcedure)this).FindResultColumn(propertyName);
@@ -223,7 +223,7 @@ IReadOnlyList<IStoredProcedureResultColumn> IStoredProcedure.ResultColumns
     IReadOnlyStoredProcedureResultColumn? IReadOnlyStoredProcedure.FindRowsAffectedResultColumn()
         => _resultColumns.FirstOrDefault((IReadOnlyStoredProcedureResultColumn c)
                 => c.ForRowsAffected);
-    
+
     /// <inheritdoc />
     IStoredProcedureResultColumn? IStoredProcedure.FindRowsAffectedResultColumn()
         => (IStoredProcedureResultColumn?)((IReadOnlyStoredProcedure)this).FindRowsAffectedResultColumn();
@@ -234,7 +234,7 @@ IStoreStoredProcedure IStoredProcedure.StoreStoredProcedure
         [DebuggerStepThrough]
         get => _storeStoredProcedure!;
     }
-    
+
     /// <inheritdoc />
     IStoreStoredProcedure IRuntimeStoredProcedure.StoreStoredProcedure
     {