Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit b1f6769

Browse files
authored
Merge pull request #6 from marcominerva/develop
Libraries update
2 parents 496c0bd + e4534d9 commit b1f6769

File tree

3 files changed

+56
-26
lines changed

3 files changed

+56
-26
lines changed

.editorconfig

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,55 @@
11
# Remove the line below if you want to inherit .editorconfig settings from higher directories
22
root = true
33

4-
# C# files
5-
[*.cs]
4+
[*]
65

76
#### Core EditorConfig Options ####
87

98
# Indentation and spacing
109
indent_size = 4
1110
indent_style = space
1211
tab_width = 4
12+
trim_trailing_whitespace = true
1313

1414
# New line preferences
1515
end_of_line = unset
1616
insert_final_newline = unset
1717

18+
dotnet_style_null_propagation = true:suggestion
19+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
20+
dotnet_style_prefer_auto_properties = true:suggestion
21+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
22+
dotnet_style_object_initializer = true:suggestion
23+
dotnet_style_coalesce_expression = true:suggestion
24+
dotnet_style_collection_initializer = true:suggestion
25+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
26+
dotnet_style_prefer_conditional_expression_over_assignment = false:silent
27+
dotnet_style_prefer_conditional_expression_over_return = false:silent
28+
dotnet_style_explicit_tuple_names = true:suggestion
29+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
30+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
31+
dotnet_style_prefer_compound_assignment = true:suggestion
32+
dotnet_style_prefer_simplified_interpolation = true:suggestion
33+
dotnet_style_namespace_match_folder = false:silent
34+
dotnet_style_readonly_field = true:suggestion
35+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
36+
dotnet_style_predefined_type_for_member_access = true:silent
37+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
38+
dotnet_style_allow_multiple_blank_lines_experimental = false:error
39+
dotnet_style_allow_statement_immediately_after_block_experimental = false:error
40+
dotnet_code_quality_unused_parameters = all:suggestion
41+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
42+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
43+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
44+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
45+
dotnet_style_qualification_for_event = false:silent
46+
dotnet_style_qualification_for_method = false:silent
47+
dotnet_style_qualification_for_property = false:silent
48+
dotnet_style_qualification_for_field = false:silent
49+
50+
# C# files
51+
[*.cs]
52+
1853
#### .NET Coding Conventions ####
1954

2055
# Organize usings
@@ -42,21 +77,10 @@ dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:sil
4277
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
4378

4479
# Expression-level preferences
45-
dotnet_style_coalesce_expression = true:suggestion
46-
dotnet_style_collection_initializer = true:suggestion
47-
dotnet_style_explicit_tuple_names = true:suggestion
48-
dotnet_style_null_propagation = true:suggestion
49-
dotnet_style_object_initializer = true:suggestion
50-
dotnet_style_operator_placement_when_wrapping = beginning_of_line
51-
dotnet_style_prefer_auto_properties = true:silent
52-
dotnet_style_prefer_compound_assignment = true:suggestion
53-
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
54-
dotnet_style_prefer_conditional_expression_over_return = true:silent
55-
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
56-
dotnet_style_prefer_inferred_tuple_names = true:suggestion
57-
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
58-
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
59-
dotnet_style_prefer_simplified_interpolation = true:suggestion
80+
csharp_style_prefer_local_over_anonymous_function = true:silent
81+
csharp_style_prefer_extended_property_pattern = true:suggestion
82+
csharp_style_implicit_object_creation_when_type_is_apparent = true:silent
83+
csharp_style_prefer_tuple_swap = true:silent
6084

6185
# Field preferences
6286
dotnet_style_readonly_field = true:suggestion
@@ -70,29 +94,31 @@ dotnet_remove_unnecessary_suppression_exclusions = none
7094
#### C# Coding Conventions ####
7195

7296
# var preferences
73-
csharp_style_var_elsewhere = true:silent
74-
csharp_style_var_for_built_in_types = true:silent
75-
csharp_style_var_when_type_is_apparent = true:silent
97+
csharp_style_var_elsewhere = true:suggestion
98+
csharp_style_var_for_built_in_types = true:suggestion
99+
csharp_style_var_when_type_is_apparent = true:suggestion
76100

77101
# Expression-bodied members
78102
csharp_style_expression_bodied_accessors = true:silent
79103
csharp_style_expression_bodied_constructors = false:silent
80104
csharp_style_expression_bodied_indexers = true:silent
81105
csharp_style_expression_bodied_lambdas = true:silent
82106
csharp_style_expression_bodied_local_functions = true:silent
83-
csharp_style_expression_bodied_methods =when_on_single_line:silent
84-
csharp_style_expression_bodied_operators =true:silent
107+
csharp_style_expression_bodied_methods = when_on_single_line:silent
108+
csharp_style_expression_bodied_operators = true:silent
85109
csharp_style_expression_bodied_properties = true:silent
86110

87111
# Pattern matching preferences
88112
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
89113
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
90114
csharp_style_prefer_not_pattern = true:suggestion
91-
csharp_style_prefer_pattern_matching = true:silent
115+
csharp_style_prefer_pattern_matching = true:suggestion
92116
csharp_style_prefer_switch_expression = true:suggestion
93117

94118
# Null-checking preferences
95119
csharp_style_conditional_delegate_call = true:suggestion
120+
csharp_style_prefer_parameter_null_checking = true:suggestion
121+
csharp_style_prefer_null_check_over_type_check = true:suggestion
96122

97123
# Modifier preferences
98124
csharp_prefer_static_local_function = true:suggestion
@@ -102,6 +128,7 @@ csharp_preferred_modifier_order = public,private,protected,internal,static,exter
102128
csharp_prefer_braces = true:silent
103129
csharp_prefer_simple_using_statement = true:suggestion
104130
csharp_style_namespace_declarations = file_scoped:suggestion
131+
csharp_style_prefer_method_group_conversion = true:silent
105132

106133
# Expression-level preferences
107134
csharp_prefer_simple_default_expression = true:suggestion
@@ -127,6 +154,9 @@ csharp_new_line_before_members_in_anonymous_types = true
127154
csharp_new_line_before_members_in_object_initializers = true
128155
csharp_new_line_before_open_brace = all
129156
csharp_new_line_between_query_expression_clauses = true
157+
csharp_style_allow_embedded_statements_on_same_line_experimental = false:error
158+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:error
159+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
130160

131161
# Indentation preferences
132162
csharp_indent_block_contents = true

samples/MinimalSample/MinimalSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
10+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

src/MinimalHelpers.Binding/MinimalHelpers.Binding.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.104">
33+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
37+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.4.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

0 commit comments

Comments
 (0)