Skip to content

Commit 774648e

Browse files
faddivfaddiv
authored
Merge pull request #27 from CNBoland/Project_maintenance
Project maintenance
2 parents 25a482b + 4260b7e commit 774648e

File tree

51 files changed

+378
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+378
-157
lines changed

‎.editorconfig

+217
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
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 = false
23+
file_header_template = unset
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = false
27+
dotnet_style_qualification_for_field = false
28+
dotnet_style_qualification_for_method = false
29+
dotnet_style_qualification_for_property = false
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_inferred_anonymous_type_member_names = true
57+
dotnet_style_prefer_inferred_tuple_names = true
58+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
59+
dotnet_style_prefer_simplified_boolean_expressions = true
60+
dotnet_style_prefer_simplified_interpolation = true
61+
62+
# Field preferences
63+
dotnet_style_readonly_field = true
64+
65+
# Parameter preferences
66+
dotnet_code_quality_unused_parameters = all
67+
68+
# Suppression preferences
69+
dotnet_remove_unnecessary_suppression_exclusions = none
70+
71+
# New line preferences
72+
dotnet_style_allow_multiple_blank_lines_experimental = true
73+
dotnet_style_allow_statement_immediately_after_block_experimental = true
74+
75+
#### C# Coding Conventions ####
76+
77+
# var preferences
78+
csharp_style_var_elsewhere = false
79+
csharp_style_var_for_built_in_types = false
80+
csharp_style_var_when_type_is_apparent = false
81+
82+
# Expression-bodied members
83+
csharp_style_expression_bodied_accessors = true
84+
csharp_style_expression_bodied_constructors = false
85+
csharp_style_expression_bodied_indexers = true
86+
csharp_style_expression_bodied_lambdas = true
87+
csharp_style_expression_bodied_local_functions = false
88+
csharp_style_expression_bodied_methods = false
89+
csharp_style_expression_bodied_operators = false
90+
csharp_style_expression_bodied_properties = true
91+
92+
# Pattern matching preferences
93+
csharp_style_pattern_matching_over_as_with_null_check = true
94+
csharp_style_pattern_matching_over_is_with_cast_check = true
95+
csharp_style_prefer_not_pattern = true
96+
csharp_style_prefer_pattern_matching = true
97+
csharp_style_prefer_switch_expression = true
98+
99+
# Null-checking preferences
100+
csharp_style_conditional_delegate_call = true
101+
102+
# Modifier preferences
103+
csharp_prefer_static_local_function = true
104+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
105+
106+
# Code-block preferences
107+
csharp_prefer_braces = true
108+
csharp_prefer_simple_using_statement = true
109+
110+
# Expression-level preferences
111+
csharp_prefer_simple_default_expression = true
112+
csharp_style_deconstructed_variable_declaration = true
113+
csharp_style_implicit_object_creation_when_type_is_apparent = true
114+
csharp_style_inlined_variable_declaration = true
115+
csharp_style_pattern_local_over_anonymous_function = true
116+
csharp_style_prefer_index_operator = true
117+
csharp_style_prefer_range_operator = true
118+
csharp_style_throw_expression = true
119+
csharp_style_unused_value_assignment_preference = discard_variable
120+
csharp_style_unused_value_expression_statement_preference = discard_variable
121+
122+
# 'using' directive preferences
123+
csharp_using_directive_placement = outside_namespace
124+
125+
# New line preferences
126+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
127+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
128+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
129+
130+
#### C# Formatting Rules ####
131+
132+
# New line preferences
133+
csharp_new_line_before_catch = true
134+
csharp_new_line_before_else = true
135+
csharp_new_line_before_finally = true
136+
csharp_new_line_before_members_in_anonymous_types = true
137+
csharp_new_line_before_members_in_object_initializers = true
138+
csharp_new_line_before_open_brace = all
139+
csharp_new_line_between_query_expression_clauses = true
140+
141+
# Indentation preferences
142+
csharp_indent_block_contents = true
143+
csharp_indent_braces = false
144+
csharp_indent_case_contents = true
145+
csharp_indent_case_contents_when_block = true
146+
csharp_indent_labels = no_change
147+
csharp_indent_switch_labels = true
148+
149+
# Space preferences
150+
csharp_space_after_cast = false
151+
csharp_space_after_colon_in_inheritance_clause = true
152+
csharp_space_after_comma = true
153+
csharp_space_after_dot = false
154+
csharp_space_after_keywords_in_control_flow_statements = true
155+
csharp_space_after_semicolon_in_for_statement = true
156+
csharp_space_around_binary_operators = before_and_after
157+
csharp_space_around_declaration_statements = false
158+
csharp_space_before_colon_in_inheritance_clause = true
159+
csharp_space_before_comma = false
160+
csharp_space_before_dot = false
161+
csharp_space_before_open_square_brackets = false
162+
csharp_space_before_semicolon_in_for_statement = false
163+
csharp_space_between_empty_square_brackets = false
164+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
165+
csharp_space_between_method_call_name_and_opening_parenthesis = false
166+
csharp_space_between_method_call_parameter_list_parentheses = false
167+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
168+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
169+
csharp_space_between_method_declaration_parameter_list_parentheses = false
170+
csharp_space_between_parentheses = false
171+
csharp_space_between_square_brackets = false
172+
173+
# Wrapping preferences
174+
csharp_preserve_single_line_blocks = true
175+
csharp_preserve_single_line_statements = true
176+
177+
#### Naming styles ####
178+
179+
# Naming rules
180+
181+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
182+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
183+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
184+
185+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
186+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
187+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
188+
189+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
190+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
191+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
192+
193+
# Symbol specifications
194+
195+
dotnet_naming_symbols.interface.applicable_kinds = interface
196+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
197+
dotnet_naming_symbols.interface.required_modifiers =
198+
199+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
200+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
201+
dotnet_naming_symbols.types.required_modifiers =
202+
203+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
204+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
205+
dotnet_naming_symbols.non_field_members.required_modifiers =
206+
207+
# Naming styles
208+
209+
dotnet_naming_style.pascal_case.required_prefix =
210+
dotnet_naming_style.pascal_case.required_suffix =
211+
dotnet_naming_style.pascal_case.word_separator =
212+
dotnet_naming_style.pascal_case.capitalization = pascal_case
213+
214+
dotnet_naming_style.begins_with_i.required_prefix = I
215+
dotnet_naming_style.begins_with_i.required_suffix =
216+
dotnet_naming_style.begins_with_i.word_separator =
217+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

‎FluentAssertions.AspNetCore.Mvc.sln

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0C48468D-7CDA-45C7-8B21-0669A567711B}"
99
ProjectSection(SolutionItems) = preProject
10+
.editorconfig = .editorconfig
1011
appveyor.yml = appveyor.yml
1112
EndProjectSection
1213
EndProject

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
11-
<PackageReference Include="xunit" Version="2.3.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
11+
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
1316
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1417
</ItemGroup>
1518

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Controllers/ApiController.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
2-
using System.Security.Claims;
3-
using Microsoft.AspNetCore.Authentication;
1+
using Microsoft.AspNetCore.Authentication;
42
using Microsoft.AspNetCore.Mvc;
53
using Microsoft.AspNetCore.Mvc.ModelBinding;
64
using Microsoft.Net.Http.Headers;
5+
using System;
6+
using System.Security.Claims;
77

88
namespace FluentAssertions.AspNetCore.Mvc.Sample.Controllers
99
{

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Controllers/HomeController.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Mvc;
1+
using Microsoft.AspNetCore.Mvc;
62

73
namespace FluentAssertions.AspNetCore.Mvc.Sample.Controllers
84
{

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Program.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using Microsoft.AspNetCore.Hosting;
32
using System.IO;
4-
using System.Linq;
5-
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore.Hosting;
73

84
namespace FluentAssertions.AspNetCore.Mvc.Sample
95
{

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Services/IProductService.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using System.Collections.Generic;
2-
using FluentAssertions.AspNetCore.Mvc.Sample.Models;
1+
using FluentAssertions.AspNetCore.Mvc.Sample.Models;
2+
using System.Collections.Generic;
33

44
namespace FluentAssertions.AspNetCore.Mvc.Sample.Services
55
{

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Services/ProductService.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using System.Collections.Generic;
2-
using FluentAssertions.AspNetCore.Mvc.Sample.Models;
1+
using FluentAssertions.AspNetCore.Mvc.Sample.Models;
2+
using System.Collections.Generic;
33

44
namespace FluentAssertions.AspNetCore.Mvc.Sample.Services
55
{

‎src/FluentAssertions.AspNetCore.Mvc/AssertionHelpers.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using FluentAssertions.Common;
2-
using FluentAssertions.Execution;
1+
using FluentAssertions.Execution;
32
using System;
43
using System.Collections.Generic;
54
using System.Globalization;
@@ -9,7 +8,7 @@ namespace FluentAssertions.AspNetCore.Mvc
98
internal class AssertionHelpers
109
{
1110
internal static void AssertStringObjectDictionary<TKey, TValue>(
12-
IDictionary<TKey, TValue> dictionary,
11+
IDictionary<TKey, TValue> dictionary,
1312
string context,
1413
TKey key,
1514
TValue expectedValue,

‎src/FluentAssertions.AspNetCore.Mvc/AssertionsExtensions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ public static class AssertionsExtensions
1515
/// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
1616
/// current <see cref="ActionResult"/>.
1717
/// </summary>
18-
public static ActionResultAssertions Should (this ActionResult actual)
18+
public static ActionResultAssertions Should(this ActionResult actual)
1919
{
20-
return new ActionResultAssertions (actual);
20+
return new ActionResultAssertions(actual);
2121
}
2222

2323
/// <summary>
2424
/// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
2525
/// current <see cref="IActionResult"/>.
2626
/// </summary>
27-
public static ActionResultAssertions Should (this IActionResult actual)
27+
public static ActionResultAssertions Should(this IActionResult actual)
2828
{
29-
return new ActionResultAssertions (actual);
29+
return new ActionResultAssertions(actual);
3030
}
3131

3232
/// <summary>

‎src/FluentAssertions.AspNetCore.Mvc/BadRequestObjectResultAssertions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Diagnostics;
2-
using FluentAssertions.Execution;
1+
using FluentAssertions.Execution;
32
using FluentAssertions.Primitives;
43
using Microsoft.AspNetCore.Mvc;
4+
using System.Diagnostics;
55

66
namespace FluentAssertions.AspNetCore.Mvc
77
{
@@ -36,7 +36,7 @@ public BadRequestObjectResultAssertions(BadRequestObjectResult subject) : base(s
3636
#endregion
3737

3838
#region Private Properties
39-
private BadRequestObjectResult BadRequestObjectResultSubject => (BadRequestObjectResult) Subject;
39+
private BadRequestObjectResult BadRequestObjectResultSubject => (BadRequestObjectResult)Subject;
4040

4141
#endregion
4242

‎src/FluentAssertions.AspNetCore.Mvc/ChallengeResultAssertions.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System;
1+
using FluentAssertions.Execution;
2+
using FluentAssertions.Primitives;
3+
using Microsoft.AspNetCore.Mvc;
4+
using System;
25
using System.Collections.Generic;
36
using System.Diagnostics;
4-
using System.Globalization;
57
using System.Linq;
6-
using FluentAssertions.Execution;
7-
using FluentAssertions.Primitives;
8-
using Microsoft.AspNetCore.Mvc;
98
using AuthenticationProperties = Microsoft.AspNetCore.Authentication.AuthenticationProperties;
109

1110
namespace FluentAssertions.AspNetCore.Mvc
@@ -72,7 +71,7 @@ public ChallengeResultAssertions(object subject) : base(subject)
7271

7372
#region Private Properties
7473

75-
private ChallengeResult ChallengeResultSubject => (ChallengeResult) Subject;
74+
private ChallengeResult ChallengeResultSubject => (ChallengeResult)Subject;
7675

7776
#endregion
7877

‎src/FluentAssertions.AspNetCore.Mvc/CreatedAtRouteResultAssertions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public CreatedAtRouteResultAssertions WithRouteValue(string key, object expected
5656
{
5757
var subjectTyped = Subject as CreatedAtRouteResult;
5858

59-
AssertionHelpers.AssertStringObjectDictionary(subjectTyped.RouteValues, "CreatedAtRouteResult.RouteValues",
59+
AssertionHelpers.AssertStringObjectDictionary(subjectTyped.RouteValues, "CreatedAtRouteResult.RouteValues",
6060
key, expectedValue, reason, reasonArgs);
6161

6262
return this;

‎src/FluentAssertions.AspNetCore.Mvc/FileContentResultAssertions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class FileContentResultAssertions : FileResultAssertionsBase<FileContentR
1717
/// Creates an instance of this class.
1818
/// </summary>
1919
/// <param name="fileResult">The testet instance.</param>
20-
public FileContentResultAssertions(FileContentResult fileResult)
20+
public FileContentResultAssertions(FileContentResult fileResult)
2121
: base(fileResult)
2222
{
2323
}

0 commit comments

Comments
 (0)