Skip to content

Commit df64619

Browse files
committed
Revert "Phase 1.3 complete"
This reverts commit c063064.
1 parent a952c93 commit df64619

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

.editorconfig

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
[*]
22
# VSSPELL: Spell checker settings from Meraki.Api.sln.vsspell
3-
vsspell_section_id = 380de64fe2c54b63871cbe33f596d333
4-
vsspell_ignored_words_380de64fe2c54b63871cbe33f596d333 = File:Halo.Api.dic
3+
vsspell_section_id = 380de64fe2c54b63871cbe33f596ddb9
4+
vsspell_ignored_words_380de64fe2c54b63871cbe33f596ddb9 = File:Meraki.Api.sln.vsspell.dic
55

66
# Remove the line below if you want to inherit .editorconfig settings from higher directories
77
root = true
8-
indent_style = tab
9-
dotnet_style_coalesce_expression = true:warning
10-
dotnet_style_operator_placement_when_wrapping = beginning_of_line
11-
tab_width = 4
12-
indent_size = 4
13-
end_of_line = crlf
148

159
# C# files
1610
[*.cs]
@@ -119,7 +113,7 @@ csharp_prefer_braces = true:warning
119113
csharp_prefer_simple_using_statement = true:warning
120114
csharp_style_namespace_declarations = file_scoped:warning
121115
csharp_style_prefer_method_group_conversion = true:warning
122-
csharp_style_prefer_top_level_statements = true:silent
116+
csharp_style_prefer_top_level_statements = true
123117

124118
# Expression-level preferences
125119
csharp_prefer_simple_default_expression = true:warning
@@ -211,26 +205,26 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
211205

212206
dotnet_naming_symbols.interface.applicable_kinds = interface
213207
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
214-
dotnet_naming_symbols.interface.required_modifiers =
208+
dotnet_naming_symbols.interface.required_modifiers =
215209

216210
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
217211
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
218-
dotnet_naming_symbols.types.required_modifiers =
212+
dotnet_naming_symbols.types.required_modifiers =
219213

220214
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
221215
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
222-
dotnet_naming_symbols.non_field_members.required_modifiers =
216+
dotnet_naming_symbols.non_field_members.required_modifiers =
223217

224218
# Naming styles
225219

226-
dotnet_naming_style.pascal_case.required_prefix =
227-
dotnet_naming_style.pascal_case.required_suffix =
228-
dotnet_naming_style.pascal_case.word_separator =
220+
dotnet_naming_style.pascal_case.required_prefix =
221+
dotnet_naming_style.pascal_case.required_suffix =
222+
dotnet_naming_style.pascal_case.word_separator =
229223
dotnet_naming_style.pascal_case.capitalization = pascal_case
230224

231225
dotnet_naming_style.begins_with_i.required_prefix = I
232-
dotnet_naming_style.begins_with_i.required_suffix =
233-
dotnet_naming_style.begins_with_i.word_separator =
226+
dotnet_naming_style.begins_with_i.required_suffix =
227+
dotnet_naming_style.begins_with_i.word_separator =
234228
dotnet_naming_style.begins_with_i.capitalization = pascal_case
235229

236230
# Instance fields are camelCase and start with _
@@ -247,7 +241,7 @@ dotnet_naming_style.instance_field_style.required_prefix = _
247241
# Instance fields are camelCase and start with _
248242
dotnet_naming_rule.constant_fields_should_be_camel_case.severity = suggestion
249243
dotnet_naming_rule.constant_fields_should_be_camel_case.symbols = constant_fields
250-
dotnet_naming_rule.constant_fields_should_be_camel_case.style = pascal_case
244+
dotnet_naming_rule.constant_fields_should_be_camel_case.style = constant_field_style
251245

252246
dotnet_naming_symbols.constant_fields.applicable_kinds = field
253247
dotnet_naming_symbols.constant_fields.required_modifiers = const
@@ -257,6 +251,3 @@ dotnet_naming_style.constant_field_style.capitalization = pascal_case
257251
#dotnet_naming_style.constant_field_style.required_prefix = _ NOPE.
258252
# CA1848: Use the LoggerMessage delegates
259253
dotnet_diagnostic.CA1848.severity = none
260-
csharp_style_prefer_primary_constructors = true:suggestion
261-
csharp_prefer_system_threading_lock = true:suggestion
262-
csharp_style_prefer_simple_property_accessors = true:suggestion

0 commit comments

Comments
 (0)