Skip to content

Commit 026dab0

Browse files
authored
Add editorconfig and fix linting issues (#386)
* Add editorconfig * Update ReSharper settings to match code * Update to latest C# version * Fix linting issues
1 parent 7a1fe9e commit 026dab0

16 files changed

+325
-155
lines changed

src/.editorconfig

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
root = true
2+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Coding Conventions ####
19+
20+
# Organize usings
21+
dotnet_separate_import_directive_groups = false
22+
dotnet_sort_system_directives_first = true
23+
file_header_template =
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = true
27+
dotnet_style_qualification_for_field = true
28+
dotnet_style_qualification_for_method = true
29+
dotnet_style_qualification_for_property = true
30+
31+
# Language keywords vs BCL types preferences
32+
dotnet_style_predefined_type_for_locals_parameters_members = true
33+
dotnet_style_predefined_type_for_member_access = true
34+
35+
# Parentheses preferences
36+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
37+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
38+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
39+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
40+
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
43+
44+
# Expression-level preferences
45+
dotnet_style_coalesce_expression = true
46+
dotnet_style_collection_initializer = true
47+
dotnet_style_explicit_tuple_names = true
48+
dotnet_style_namespace_match_folder = true
49+
dotnet_style_null_propagation = true
50+
dotnet_style_object_initializer = true
51+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
52+
dotnet_style_prefer_auto_properties = true
53+
dotnet_style_prefer_compound_assignment = true
54+
dotnet_style_prefer_conditional_expression_over_assignment = true
55+
dotnet_style_prefer_conditional_expression_over_return = true
56+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
57+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
58+
dotnet_style_prefer_inferred_tuple_names = true
59+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
60+
dotnet_style_prefer_simplified_boolean_expressions = true
61+
dotnet_style_prefer_simplified_interpolation = true
62+
63+
# Field preferences
64+
dotnet_style_readonly_field = true
65+
66+
# Parameter preferences
67+
dotnet_code_quality_unused_parameters = all
68+
69+
# Suppression preferences
70+
dotnet_remove_unnecessary_suppression_exclusions = 0
71+
72+
# New line preferences
73+
dotnet_style_allow_multiple_blank_lines_experimental = true
74+
dotnet_style_allow_statement_immediately_after_block_experimental = true
75+
76+
#### C# Coding Conventions ####
77+
78+
# var preferences
79+
csharp_style_var_elsewhere = true:suggestion
80+
csharp_style_var_for_built_in_types = true:suggestion
81+
csharp_style_var_when_type_is_apparent = true:suggestion
82+
83+
# Expression-bodied members
84+
csharp_style_expression_bodied_accessors = true
85+
csharp_style_expression_bodied_constructors = false
86+
csharp_style_expression_bodied_indexers = true
87+
csharp_style_expression_bodied_lambdas = true
88+
csharp_style_expression_bodied_local_functions = false
89+
csharp_style_expression_bodied_methods = false
90+
csharp_style_expression_bodied_operators = false
91+
csharp_style_expression_bodied_properties = true
92+
93+
# Pattern matching preferences
94+
csharp_style_pattern_matching_over_as_with_null_check = true
95+
csharp_style_pattern_matching_over_is_with_cast_check = true
96+
csharp_style_prefer_extended_property_pattern = true
97+
csharp_style_prefer_not_pattern = true
98+
csharp_style_prefer_pattern_matching = true
99+
csharp_style_prefer_switch_expression = true
100+
101+
# Null-checking preferences
102+
csharp_style_conditional_delegate_call = true
103+
104+
# Modifier preferences
105+
csharp_prefer_static_local_function = true
106+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
107+
csharp_style_prefer_readonly_struct = true
108+
109+
# Code-block preferences
110+
csharp_prefer_braces = true
111+
csharp_prefer_simple_using_statement = false
112+
csharp_style_namespace_declarations = block_scoped
113+
csharp_style_prefer_method_group_conversion = true
114+
csharp_style_prefer_top_level_statements = true
115+
116+
# Expression-level preferences
117+
csharp_prefer_simple_default_expression = true
118+
csharp_style_deconstructed_variable_declaration = true
119+
csharp_style_implicit_object_creation_when_type_is_apparent = true
120+
csharp_style_inlined_variable_declaration = true
121+
csharp_style_prefer_index_operator = true
122+
csharp_style_prefer_local_over_anonymous_function = true
123+
csharp_style_prefer_null_check_over_type_check = true
124+
csharp_style_prefer_range_operator = true
125+
csharp_style_prefer_tuple_swap = true
126+
csharp_style_prefer_utf8_string_literals = true
127+
csharp_style_throw_expression = true
128+
csharp_style_unused_value_assignment_preference = discard_variable
129+
csharp_style_unused_value_expression_statement_preference = discard_variable
130+
131+
# 'using' directive preferences
132+
csharp_using_directive_placement = inside_namespace:error
133+
134+
# New line preferences
135+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
136+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
137+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
138+
139+
#### C# Formatting Rules ####
140+
141+
# New line preferences
142+
csharp_new_line_before_catch = true
143+
csharp_new_line_before_else = true
144+
csharp_new_line_before_finally = true
145+
csharp_new_line_before_members_in_anonymous_types = true
146+
csharp_new_line_before_members_in_object_initializers = true
147+
csharp_new_line_before_open_brace = all
148+
csharp_new_line_between_query_expression_clauses = true
149+
150+
# Indentation preferences
151+
csharp_indent_block_contents = true
152+
csharp_indent_braces = false
153+
csharp_indent_case_contents = true
154+
csharp_indent_case_contents_when_block = true
155+
csharp_indent_labels = no_change
156+
csharp_indent_switch_labels = true
157+
158+
# Space preferences
159+
csharp_space_after_cast = false
160+
csharp_space_after_colon_in_inheritance_clause = true
161+
csharp_space_after_comma = true
162+
csharp_space_after_dot = false
163+
csharp_space_after_keywords_in_control_flow_statements = true
164+
csharp_space_after_semicolon_in_for_statement = true
165+
csharp_space_around_binary_operators = before_and_after
166+
csharp_space_around_declaration_statements = false
167+
csharp_space_before_colon_in_inheritance_clause = true
168+
csharp_space_before_comma = false
169+
csharp_space_before_dot = false
170+
csharp_space_before_open_square_brackets = false
171+
csharp_space_before_semicolon_in_for_statement = false
172+
csharp_space_between_empty_square_brackets = false
173+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
174+
csharp_space_between_method_call_name_and_opening_parenthesis = false
175+
csharp_space_between_method_call_parameter_list_parentheses = false
176+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
177+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
178+
csharp_space_between_method_declaration_parameter_list_parentheses = false
179+
csharp_space_between_parentheses = false
180+
csharp_space_between_square_brackets = false
181+
182+
# Wrapping preferences
183+
csharp_preserve_single_line_blocks = true
184+
csharp_preserve_single_line_statements = true
185+
186+
#### Naming styles ####
187+
188+
# Naming rules
189+
190+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
191+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
192+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
193+
194+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
195+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
196+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
197+
198+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
199+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
200+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
201+
202+
# Symbol specifications
203+
204+
dotnet_naming_symbols.interface.applicable_kinds = interface
205+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
206+
dotnet_naming_symbols.interface.required_modifiers =
207+
208+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
209+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
210+
dotnet_naming_symbols.types.required_modifiers =
211+
212+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
213+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
214+
dotnet_naming_symbols.non_field_members.required_modifiers =
215+
216+
# Naming styles
217+
218+
dotnet_naming_style.pascal_case.required_prefix =
219+
dotnet_naming_style.pascal_case.required_suffix =
220+
dotnet_naming_style.pascal_case.word_separator =
221+
dotnet_naming_style.pascal_case.capitalization = pascal_case
222+
223+
dotnet_naming_style.begins_with_i.required_prefix = I
224+
dotnet_naming_style.begins_with_i.required_suffix =
225+
dotnet_naming_style.begins_with_i.word_separator =
226+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

src/Cake.AzureDevOps.Tests/Repos/PullRequest/BasePullRequestFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal abstract class BasePullRequestFixture
99
public const string ValidAzureDevOpsUrl = "https://my-account.visualstudio.com/DefaultCollection/MyProject/_git/MyRepoName";
1010
public const string InvalidUrl = "http://example.com";
1111

12-
public BasePullRequestFixture()
12+
protected BasePullRequestFixture()
1313
{
1414
this.InitializeFakes();
1515
}

src/Cake.AzureDevOps.sln.DotSettings

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
3+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
4+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
5+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">DO_NOT_SHOW</s:String>
6+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantNameQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
7+
8+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
9+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
10+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">Field, Property, Event, Method</s:String>
11+
312
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>

src/Cake.AzureDevOps/Pipelines/AzureDevOpsBuildQueryOrderExtensions.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,16 @@ internal static class AzureDevOpsBuildQueryOrderExtensions
1414
/// <returns>Converted query order.</returns>
1515
public static BuildQueryOrder ToBuildQueryOrder(this AzureDevOpsBuildQueryOrder queryOrder)
1616
{
17-
switch (queryOrder)
17+
return queryOrder switch
1818
{
19-
case AzureDevOpsBuildQueryOrder.FinishTimeAscending:
20-
return BuildQueryOrder.FinishTimeAscending;
21-
case AzureDevOpsBuildQueryOrder.FinishTimeDescending:
22-
return BuildQueryOrder.FinishTimeDescending;
23-
case AzureDevOpsBuildQueryOrder.QueueTimeDescending:
24-
return BuildQueryOrder.QueueTimeDescending;
25-
case AzureDevOpsBuildQueryOrder.QueueTimeAscending:
26-
return BuildQueryOrder.QueueTimeAscending;
27-
case AzureDevOpsBuildQueryOrder.StartTimeDescending:
28-
return BuildQueryOrder.StartTimeDescending;
29-
case AzureDevOpsBuildQueryOrder.StartTimeAscending:
30-
return BuildQueryOrder.StartTimeAscending;
31-
default:
32-
throw new System.Exception("Unknown value");
33-
}
19+
AzureDevOpsBuildQueryOrder.FinishTimeAscending => BuildQueryOrder.FinishTimeAscending,
20+
AzureDevOpsBuildQueryOrder.FinishTimeDescending => BuildQueryOrder.FinishTimeDescending,
21+
AzureDevOpsBuildQueryOrder.QueueTimeDescending => BuildQueryOrder.QueueTimeDescending,
22+
AzureDevOpsBuildQueryOrder.QueueTimeAscending => BuildQueryOrder.QueueTimeAscending,
23+
AzureDevOpsBuildQueryOrder.StartTimeDescending => BuildQueryOrder.StartTimeDescending,
24+
AzureDevOpsBuildQueryOrder.StartTimeAscending => BuildQueryOrder.StartTimeAscending,
25+
_ => throw new System.Exception("Unknown value"),
26+
};
3427
}
3528
}
3629
}

src/Cake.AzureDevOps/Pipelines/AzureDevOpsBuildResultExtensions.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,15 @@ internal static class AzureDevOpsBuildResultExtensions
1414
/// <returns>Converted build result.</returns>
1515
public static BuildResult ToBuildResult(this AzureDevOpsBuildResult result)
1616
{
17-
switch (result)
17+
return result switch
1818
{
19-
case AzureDevOpsBuildResult.None:
20-
return BuildResult.None;
21-
case AzureDevOpsBuildResult.Succeeded:
22-
return BuildResult.Succeeded;
23-
case AzureDevOpsBuildResult.PartiallySucceeded:
24-
return BuildResult.PartiallySucceeded;
25-
case AzureDevOpsBuildResult.Failed:
26-
return BuildResult.Failed;
27-
case AzureDevOpsBuildResult.Canceled:
28-
return BuildResult.Canceled;
29-
default:
30-
throw new System.Exception("Unknown value");
31-
}
19+
AzureDevOpsBuildResult.None => BuildResult.None,
20+
AzureDevOpsBuildResult.Succeeded => BuildResult.Succeeded,
21+
AzureDevOpsBuildResult.PartiallySucceeded => BuildResult.PartiallySucceeded,
22+
AzureDevOpsBuildResult.Failed => BuildResult.Failed,
23+
AzureDevOpsBuildResult.Canceled => BuildResult.Canceled,
24+
_ => throw new System.Exception("Unknown value"),
25+
};
3226
}
3327
}
3428
}

src/Cake.AzureDevOps/Pipelines/AzureDevOpsBuildStatusExtensions.cs

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,17 @@ internal static class AzureDevOpsBuildStatusExtensions
1414
/// <returns>Converted state.</returns>
1515
public static BuildStatus ToBuildStatus(this AzureDevOpsBuildStatus status)
1616
{
17-
switch (status)
17+
return status switch
1818
{
19-
case AzureDevOpsBuildStatus.None:
20-
return BuildStatus.None;
21-
case AzureDevOpsBuildStatus.InProgress:
22-
return BuildStatus.InProgress;
23-
case AzureDevOpsBuildStatus.Completed:
24-
return BuildStatus.Completed;
25-
case AzureDevOpsBuildStatus.Cancelling:
26-
return BuildStatus.Cancelling;
27-
case AzureDevOpsBuildStatus.Postponed:
28-
return BuildStatus.Postponed;
29-
case AzureDevOpsBuildStatus.NotStarted:
30-
return BuildStatus.NotStarted;
31-
case AzureDevOpsBuildStatus.All:
32-
return BuildStatus.All;
33-
default:
34-
throw new System.Exception("Unknown value");
35-
}
19+
AzureDevOpsBuildStatus.None => BuildStatus.None,
20+
AzureDevOpsBuildStatus.InProgress => BuildStatus.InProgress,
21+
AzureDevOpsBuildStatus.Completed => BuildStatus.Completed,
22+
AzureDevOpsBuildStatus.Cancelling => BuildStatus.Cancelling,
23+
AzureDevOpsBuildStatus.Postponed => BuildStatus.Postponed,
24+
AzureDevOpsBuildStatus.NotStarted => BuildStatus.NotStarted,
25+
AzureDevOpsBuildStatus.All => BuildStatus.All,
26+
_ => throw new System.Exception("Unknown value"),
27+
};
3628
}
3729
}
3830
}

src/Cake.AzureDevOps/Pipelines/BuildResultExtensions.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,15 @@ internal static class BuildResultExtensions
1414
/// <returns>Converted build result.</returns>
1515
public static AzureDevOpsBuildResult ToAzureDevOpsBuildResult(this BuildResult result)
1616
{
17-
switch (result)
17+
return result switch
1818
{
19-
case BuildResult.None:
20-
return AzureDevOpsBuildResult.None;
21-
case BuildResult.Succeeded:
22-
return AzureDevOpsBuildResult.Succeeded;
23-
case BuildResult.PartiallySucceeded:
24-
return AzureDevOpsBuildResult.PartiallySucceeded;
25-
case BuildResult.Failed:
26-
return AzureDevOpsBuildResult.Failed;
27-
case BuildResult.Canceled:
28-
return AzureDevOpsBuildResult.Canceled;
29-
default:
30-
throw new System.Exception("Unknown value");
31-
}
19+
BuildResult.None => AzureDevOpsBuildResult.None,
20+
BuildResult.Succeeded => AzureDevOpsBuildResult.Succeeded,
21+
BuildResult.PartiallySucceeded => AzureDevOpsBuildResult.PartiallySucceeded,
22+
BuildResult.Failed => AzureDevOpsBuildResult.Failed,
23+
BuildResult.Canceled => AzureDevOpsBuildResult.Canceled,
24+
_ => throw new System.Exception("Unknown value"),
25+
};
3226
}
3327
}
3428
}

0 commit comments

Comments
 (0)