Update editorConfig

.editorconfig

@@ -27,106 +27,147 @@ indent_size = 2
 [*.json]
 indent_size = 2
 
+# Powershell files
+[*.ps1]
+indent_size = 2
+
 # Shell scripts
 [*.sh]
 end_of_line = lf
+indent_size = 2
 
 [*.{cmd,bat}]
 end_of_line = crlf
+indent_size = 2
 
 ## Language conventions
 # Dotnet code style settings:
 [*.{cs,vb}]
-# Avoid "this." and "Me." if not necessary
-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 : suggestion
-dotnet_style_predefined_type_for_member_access = true : suggestion
+# "This." and "Me." qualifiers
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = always:suggestion
+dotnet_style_readonly_field = true:warning
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
 
 # Expression-level preferences
-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
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
+
+# Null-checking preferences
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
 
 # CSharp code style settings:
 [*.cs]
-# Prefer "var" everywhere (Implicit and explicit types)
-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 : suggestion
-csharp_style_expression_bodied_indexers = true : suggestion
-csharp_style_expression_bodied_operators = true : suggestion
-csharp_style_expression_bodied_properties = true : suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,const,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# Implicit and explicit types
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Expression-bodied members
 # Explicitly disabled due to difference in coding style between source and tests
-#csharp_style_expression_bodied_constructors = true : suggestion
-#csharp_style_expression_bodied_methods = true : suggestion
+#csharp_style_expression_bodied_methods = false:silent
+#csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
 
 # Pattern matching
-csharp_style_pattern_matching_over_as_with_null_check = true : suggestion
-csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 
 # Inlined variable declarations
-csharp_style_inlined_variable_declaration = true : suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
 
 # Expression-level preferences
-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 : suggestion
-csharp_style_pattern_local_over_anonymous_function = true : suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+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 : suggestion
-csharp_style_throw_expression = true : suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
 
 # Code block preferences
-csharp_prefer_braces = true : suggestion
+csharp_prefer_braces = true:suggestion
 
 ## Formatting conventions
 # Dotnet formatting settings:
 [*.{cs,vb}]
 # Organize usings
 dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
 
 # CSharp formatting settings:
 [*.cs]
 # Newline options
-csharp_new_line_before_catch = true
+csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
+csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
 
 # Identation options
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents_when_block = true
+csharp_indent_switch_labels = true
 csharp_indent_case_contents = true
 csharp_indent_labels = no_change
-csharp_indent_switch_labels = true
 
 # Spacing options
 csharp_space_after_cast = false
 csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_between_method_call_parameter_list_parentheses = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
-
-# Wrapping options
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_square_brackets = false
+
+# Wrap options
+csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false
 
 ## Naming conventions
 [*.{cs,vb}]
@@ -150,57 +191,66 @@ dotnet_naming_style._camelCase.required_prefix = _
 
 ## Rules
 # Interfaces
+dotnet_naming_symbols.interface_symbol.applicable_kinds = interface
+dotnet_naming_symbols.interface_symbol.applicable_accessibilities = *
 dotnet_naming_rule.interface_naming.symbols = interface_symbol
 dotnet_naming_rule.interface_naming.style = interface_style
 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_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, event, namespace
+dotnet_naming_symbols.class_symbol.applicable_accessibilities = *
+
 dotnet_naming_rule.class_naming.symbols = class_symbol
 dotnet_naming_rule.class_naming.style = pascal_case_style
 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_symbols.type_parameter_symbol.applicable_kinds = type_parameter
+dotnet_naming_symbols.type_parameter_symbol.applicable_accessibilities = *
+
 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 = *
+# Private const fields
+dotnet_naming_symbols.const_field_symbol.applicable_kinds = field
+dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = private
+dotnet_naming_symbols.const_field_symbol.required_modifiers = const
 
-# 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.style = _camelCase
 dotnet_naming_rule.const_field_naming.severity = suggestion
 
+# Other const fields
 dotnet_naming_symbols.const_field_symbol.applicable_kinds = field
 dotnet_naming_symbols.const_field_symbol.applicable_accessibilities = *
 dotnet_naming_symbols.const_field_symbol.required_modifiers = const
 
+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 = suggestion
+
 # Public fields
+dotnet_naming_symbols.public_field_symbol.applicable_kinds = field
+dotnet_naming_symbols.public_field_symbol.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
+
 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 = 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_symbols.other_field_symbol.applicable_kinds = field
+dotnet_naming_symbols.other_field_symbol.applicable_accessibilities = *
+
 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 = 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 = suggestion
-
 dotnet_naming_symbols.everything_else.applicable_kinds = *
 dotnet_naming_symbols.everything_else.applicable_accessibilities = *
+
+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 = suggestion

benchmark/EFCore.SqlServer.Benchmarks/Models/AdventureWorks/AdventureWorksFixture.cs

@@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Models.AdventureWorks
 {
     public static class AdventureWorksFixture
     {
-        private static string _connectionString = $"{BenchmarkEnvironment.Instance.BenchmarkDatabase}Database=AdventureWorks2014;";
+        private static readonly string _connectionString = $"{BenchmarkEnvironment.Instance.BenchmarkDatabase}Database=AdventureWorks2014;";
 
         // This method is called from timed code, be careful when changing it
         public static AdventureWorksContextBase CreateContext()

benchmark/EFCore.Sqlite.Benchmarks/Models/AdventureWorks/AdventureWorksFixture.cs

@@ -8,10 +8,10 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Models.AdventureWorks
 {
     public static class AdventureWorksFixture
     {
-        private static string _baseDirectory
+        private static readonly string _baseDirectory
             = Path.GetDirectoryName(new Uri(typeof(AdventureWorksFixture).Assembly.CodeBase).LocalPath);
 
-        private static string _connectionString
+        private static readonly string _connectionString
             = $"Data Source={Path.Combine(_baseDirectory, "AdventureWorks2014.db")}";
 
         // This method is called from timed code, be careful when changing it

benchmark/EFCore.Sqlite.Benchmarks/Models/Orders/OrdersFixture.cs

@@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks.Models.Orders
 {
     public class OrdersFixture : OrdersFixtureBase
     {
-        private static string _baseDirectory
+        private static readonly string _baseDirectory
             = Path.GetDirectoryName(new Uri(typeof(OrdersFixture).Assembly.CodeBase).LocalPath);
 
         private readonly string _connectionString;

benchmark/Shared/Program.cs

@@ -17,7 +17,7 @@ namespace Microsoft.EntityFrameworkCore.Benchmarks
 {
     public static class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             var config = DefaultConfig.Instance
                 .With(DefaultConfig.Instance.GetDiagnosers().Concat(new[] { MemoryDiagnoser.Default }).ToArray());

src/EFCore.Cosmos/Query/Pipeline/ContainsTranslator.cs

@@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Pipeline
 {
     public class ContainsTranslator : IMethodCallTranslator
     {
-        private static MethodInfo _containsMethod = typeof(Enumerable).GetTypeInfo()
+        private static readonly MethodInfo _containsMethod = typeof(Enumerable).GetTypeInfo()
             .GetDeclaredMethods(nameof(Enumerable.Contains))
             .Single(mi => mi.GetParameters().Length == 2)
             .GetGenericMethodDefinition();

src/EFCore.Cosmos/Query/Pipeline/CosmosProjectionBindingExpressionVisitor.cs

@@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Pipeline
 {
     public class CosmosProjectionBindingExpressionVisitor : ExpressionVisitor
     {
-        private CosmosSqlTranslatingExpressionVisitor _sqlTranslator;
+        private readonly CosmosSqlTranslatingExpressionVisitor _sqlTranslator;
         private SelectExpression _selectExpression;
         private bool _clientEval;
         private readonly IDictionary<ProjectionMember, Expression> _projectionMapping

src/EFCore.Cosmos/Query/Pipeline/CosmosShapedQueryCompilingExpressionVisitor.cs

@@ -89,8 +89,6 @@ private static readonly MethodInfo _isNullMethodInfo
             private ParameterExpression _jObjectParameter;
             private readonly CosmosShapedQueryCompilingExpressionVisitor _shapedQueryCompilingExpressionVisitor;
 
-            private readonly IDictionary<ProjectionBindingExpression, Expression> _valueBufferBindings
-                = new Dictionary<ProjectionBindingExpression, Expression>();
             private readonly IDictionary<ParameterExpression, Expression> _materializationContextBindings
                 = new Dictionary<ParameterExpression, Expression>();
             private int _currentEntityIndex;
@@ -575,7 +573,7 @@ public ValueTask DisposeAsync()
         private class InExpressionValuesExpandingExpressionVisitor : ExpressionVisitor
         {
             private readonly ISqlExpressionFactory _sqlExpressionFactory;
-            private IReadOnlyDictionary<string, object> _parametersValues;
+            private readonly IReadOnlyDictionary<string, object> _parametersValues;
 
             public InExpressionValuesExpandingExpressionVisitor(
                 ISqlExpressionFactory sqlExpressionFactory, IReadOnlyDictionary<string, object> parametersValues)