Update .editorconfig

- Add naming scheme for generic type arguments
- Change severity to suggestion

Resolves #13001

.editorconfig

@@ -38,61 +38,61 @@ end_of_line = crlf
 # Dotnet code style settings:
 [*.{cs,vb}]
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_event = false : warning
-dotnet_style_qualification_for_field = false : warning
-dotnet_style_qualification_for_method = false : warning
-dotnet_style_qualification_for_property = false : warning
+dotnet_style_qualification_for_event = false : suggestion
+dotnet_style_qualification_for_field = false : suggestion
+dotnet_style_qualification_for_method = false : suggestion
+dotnet_style_qualification_for_property = false : suggestion
 
 # Use language keywords instead of framework type names for type references
-dotnet_style_predefined_type_for_locals_parameters_members = true : warning
-dotnet_style_predefined_type_for_member_access = true : warning
+dotnet_style_predefined_type_for_locals_parameters_members = true : suggestion
+dotnet_style_predefined_type_for_member_access = true : suggestion
 
 # Expression-level preferences
-dotnet_style_coalesce_expression = true : warning
-dotnet_style_collection_initializer = true : warning
-dotnet_style_explicit_tuple_names = true : warning
-dotnet_style_null_propagation = true : warning
-dotnet_style_object_initializer = true : warning
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true : warning
-dotnet_style_require_accessibility_modifiers = always : warning
+dotnet_style_coalesce_expression = true : suggestion
+dotnet_style_collection_initializer = true : suggestion
+dotnet_style_explicit_tuple_names = true : suggestion
+dotnet_style_null_propagation = true : suggestion
+dotnet_style_object_initializer = true : suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true : suggestion
+dotnet_style_require_accessibility_modifiers = always : suggestion
 
 # CSharp code style settings:
 [*.cs]
 # Prefer "var" everywhere (Implicit and explicit types)
-csharp_style_var_elsewhere = true : warning
-csharp_style_var_for_built_in_types = true : warning
-csharp_style_var_when_type_is_apparent = true : warning
+csharp_style_var_elsewhere = true : suggestion
+csharp_style_var_for_built_in_types = true : suggestion
+csharp_style_var_when_type_is_apparent = true : suggestion
 
 # Expression-Bodied members
-csharp_style_expression_bodied_accessors = true : warning
-csharp_style_expression_bodied_indexers = true : warning
-csharp_style_expression_bodied_operators = true : warning
-csharp_style_expression_bodied_properties = true : warning
+csharp_style_expression_bodied_accessors = true : suggestion
+csharp_style_expression_bodied_indexers = true : suggestion
+csharp_style_expression_bodied_operators = true : suggestion
+csharp_style_expression_bodied_properties = true : suggestion
 # Explicitly disabled due to difference in coding style between source and tests
-#csharp_style_expression_bodied_constructors = true : warning
-#csharp_style_expression_bodied_methods = true : warning
+#csharp_style_expression_bodied_constructors = true : suggestion
+#csharp_style_expression_bodied_methods = true : suggestion
 
 # Pattern matching
-csharp_style_pattern_matching_over_as_with_null_check = true : warning
-csharp_style_pattern_matching_over_is_with_cast_check = true : warning
+csharp_style_pattern_matching_over_as_with_null_check = true : suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion
 
 # Inlined variable declarations
-csharp_style_inlined_variable_declaration = true : warning
+csharp_style_inlined_variable_declaration = true : suggestion
 
 # Expression-level preferences
-csharp_prefer_inferred_anonymous_type_member_names = true : warning
-csharp_prefer_inferred_tuple_names = true : warning
-csharp_prefer_simple_default_expression = true : warning
+csharp_prefer_inferred_anonymous_type_member_names = true : suggestion
+csharp_prefer_inferred_tuple_names = true : suggestion
+csharp_prefer_simple_default_expression = true : suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,const,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
-csharp_style_deconstructed_variable_declaration = true : warning
-csharp_style_pattern_local_over_anonymous_function = true : warning
+csharp_style_deconstructed_variable_declaration = true : suggestion
+csharp_style_pattern_local_over_anonymous_function = true : suggestion
 
 # Null-checking preference
-csharp_style_conditional_delegate_call = true : warning
-csharp_style_throw_expression = true : warning
+csharp_style_conditional_delegate_call = true : suggestion
+csharp_style_throw_expression = true : suggestion
 
 # Code block preferences
-csharp_prefer_braces = true : warning
+csharp_prefer_braces = true : suggestion
 
 ## Formatting conventions
 # Dotnet formatting settings:
@@ -140,6 +140,10 @@ dotnet_naming_style.camel_case_style.capitalization = camel_case
 dotnet_naming_style.interface_style.capitalization = pascal_case
 dotnet_naming_style.interface_style.required_prefix = I
 
+# PascalCase with T prefix
+dotnet_naming_style.type_parameter_style.capitalization = pascal_case
+dotnet_naming_style.type_parameter_style.required_prefix = T
+
 # camelCase with _ prefix
 dotnet_naming_style._camelCase.capitalization = camel_case
 dotnet_naming_style._camelCase.required_prefix = _
@@ -148,22 +152,30 @@ dotnet_naming_style._camelCase.required_prefix = _
 # Interfaces
 dotnet_naming_rule.interface_naming.symbols = interface_symbol
 dotnet_naming_rule.interface_naming.style = interface_style
-dotnet_naming_rule.interface_naming.severity = warning
+dotnet_naming_rule.interface_naming.severity = suggestion
 dotnet_naming_symbols.interface_symbol.applicable_kinds = interface
 dotnet_naming_symbols.interface_symbol.applicable_accessibilities = *
 
 # Classes, Structs, Enums, Properties, Methods, Events, Namespaces
 dotnet_naming_rule.class_naming.symbols = class_symbol
 dotnet_naming_rule.class_naming.style = pascal_case_style
-dotnet_naming_rule.class_naming.severity = warning
+dotnet_naming_rule.class_naming.severity = suggestion
 
 dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, event, namespace
 dotnet_naming_symbols.class_symbol.applicable_accessibilities = *
 
+# Type Parameters
+dotnet_naming_rule.type_parameter_naming.symbols = type_parameter_symbol
+dotnet_naming_rule.type_parameter_naming.style = type_parameter_style
+dotnet_naming_rule.type_parameter_naming.severity = suggestion
+
+dotnet_naming_symbols.type_parameter_symbol.applicable_kinds = type_parameter
+dotnet_naming_symbols.type_parameter_symbol.applicable_accessibilities = *
+
 # Const fields
 dotnet_naming_rule.const_field_naming.symbols = const_field_symbol
 dotnet_naming_rule.const_field_naming.style = pascal_case_style
-dotnet_naming_rule.const_field_naming.severity = warning
+dotnet_naming_rule.const_field_naming.severity = suggestion
 
 dotnet_naming_symbols.const_field_symbol.applicable_kinds = field
 dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = *
@@ -172,23 +184,23 @@ dotnet_naming_symbols.const_field_symbol.required_modifiers = const
 # Public fields
 dotnet_naming_rule.public_field_naming.symbols = public_field_symbol
 dotnet_naming_rule.public_field_naming.style = pascal_case_style
-dotnet_naming_rule.public_field_naming.severity = warning
+dotnet_naming_rule.public_field_naming.severity = suggestion
 
 dotnet_naming_symbols.public_field_symbol.applicable_kinds = field
 dotnet_naming_symbols.public_field_symbol.applicable_accessibilities = public, internal, protected
 
 # Other fields
 dotnet_naming_rule.other_field_naming.symbols = other_field_symbol
 dotnet_naming_rule.other_field_naming.style = _camelCase
-dotnet_naming_rule.other_field_naming.severity = warning
+dotnet_naming_rule.other_field_naming.severity = suggestion
 
 dotnet_naming_symbols.other_field_symbol.applicable_kinds = field
 dotnet_naming_symbols.other_field_symbol.applicable_accessibilities = *
 
 # Everything Else
 dotnet_naming_rule.everything_else_naming.symbols = everything_else
 dotnet_naming_rule.everything_else_naming.style = camel_case_style
-dotnet_naming_rule.everything_else_naming.severity = warning
+dotnet_naming_rule.everything_else_naming.severity = suggestion
 
 dotnet_naming_symbols.everything_else.applicable_kinds = *
 dotnet_naming_symbols.everything_else.applicable_accessibilities = *

src/EFCore.Specification.Tests/DataAnnotationTestBase.cs

@@ -220,7 +220,9 @@ protected class FieldAnnotationClass
 #pragma warning disable 169
             [Key]
             [Column("dsdsd", Order = 1, TypeName = "nvarchar(128)")]
+#pragma warning disable IDE0044 // Add readonly modifier
             private string _personFirstName;
+#pragma warning restore IDE0044 // Add readonly modifier
 #pragma warning restore 169
         }
 

src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs

@@ -157,11 +157,11 @@ public virtual DatabaseModel Create(DbConnection connection, IEnumerable<string>
 
                 foreach (var table in tableList)
                 {
-                    var (Schema, Table) = Parse(table);
+                    var (parsedSchema, parsedTableName) = Parse(table);
                     if (!databaseModel.Tables.Any(
-                        t => !string.IsNullOrEmpty(Schema)
-                             && t.Schema == Schema
-                             || t.Name == Table))
+                        t => !string.IsNullOrEmpty(parsedSchema)
+                             && t.Schema == parsedSchema
+                             || t.Name == parsedTableName))
                     {
                         _logger.MissingTableWarning(table);
                     }

test/EFCore.Tests/Utilities/TypeExtensionsTest.cs

@@ -319,6 +319,7 @@ private interface IRoleCollection2014 : ICollection<IRole2014>
         {
         }
 
+#pragma warning disable CA1061 // Do not hide base class methods
         private class RoleCollection2014 : List<Role2014>, IRoleCollection2014
         {
             public new IEnumerator<IRole2014> GetEnumerator()
@@ -348,6 +349,7 @@ public bool Remove(IRole2014 item)
 
             public bool IsReadOnly { get; private set; }
         }
+#pragma warning restore CA1061 // Do not hide base class methods
 
         private class Role2014 : IRole2014
         {