Skip to content

Commit d96efc6

Browse files
tilligtillig
committed
Merge branch 'develop'
2 parents 4195b73 + e3082ef commit d96efc6

24 files changed

+724
-585
lines changed

Diff for: ‎.editorconfig

+198-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,198 @@
1-
; EditorConfig to support per-solution formatting.
2-
; Use the EditorConfig VS add-in to make this work.
3-
; http://editorconfig.org/
4-
5-
; This is the default for the codeline.
6-
root = true
7-
8-
[*]
9-
end_of_line = CRLF
10-
11-
[*.{config,cs,xml}]
12-
indent_style = space
13-
indent_size = 4
14-
trim_trailing_whitespace = true
15-
16-
[*.{proj,props,sln,targets}]
17-
indent_style = tab
18-
trim_trailing_whitespace = true
19-
20-
[*.{kproj,csproj,json,ps1,psd1,psm1,resx,rst}]
21-
indent_style = space
22-
indent_size = 2
23-
trim_trailing_whitespace = true
24-
25-
[NuGet.Config]
26-
indent_style = space
27-
indent_size = 2
28-
trim_trailing_whitespace = true
1+
; EditorConfig to support per-solution formatting.
2+
; Use the EditorConfig VS add-in to make this work.
3+
; http://editorconfig.org/
4+
5+
; This is the default for the codeline.
6+
root = true
7+
8+
[*]
9+
indent_style = space
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
13+
; .NET Code - almost, but not exactly, the same suggestions as corefx
14+
; https://github.com/dotnet/corefx/blob/master/.editorconfig
15+
[*.cs]
16+
indent_size = 4
17+
charset = utf-8-bom
18+
19+
; New line preferences
20+
csharp_new_line_before_open_brace = all
21+
csharp_new_line_before_else = true
22+
csharp_new_line_before_catch = true
23+
csharp_new_line_before_finally = true
24+
csharp_new_line_before_members_in_object_initializers = true
25+
csharp_new_line_before_members_in_anonymous_types = true
26+
csharp_new_line_between_query_expression_clauses = true
27+
28+
; Indentation preferences
29+
csharp_indent_block_contents = true
30+
csharp_indent_braces = false
31+
csharp_indent_case_contents = true
32+
csharp_indent_case_contents_when_block = true
33+
csharp_indent_switch_labels = true
34+
csharp_indent_labels = one_less_than_current
35+
36+
; Modifier preferences
37+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
38+
39+
; Avoid this. unless absolutely necessary
40+
dotnet_style_qualification_for_field = false:suggestion
41+
dotnet_style_qualification_for_property = false:suggestion
42+
dotnet_style_qualification_for_method = false:suggestion
43+
dotnet_style_qualification_for_event = false:suggestion
44+
45+
; Types: use keywords instead of BCL types, using var is fine.
46+
csharp_style_var_when_type_is_apparent = false:none
47+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
48+
dotnet_style_predefined_type_for_member_access = true:suggestion
49+
50+
; Name all constant fields using PascalCase
51+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
52+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
53+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
54+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
55+
dotnet_naming_symbols.constant_fields.required_modifiers = const
56+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
57+
58+
; Static fields should be _camelCase
59+
dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
60+
dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
61+
dotnet_naming_rule.static_fields_should_be_camel_case.style = camel_case_underscore_style
62+
dotnet_naming_symbols.static_fields.applicable_kinds = field
63+
dotnet_naming_symbols.static_fields.required_modifiers = static
64+
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
65+
66+
; Static readonly fields should be PascalCase
67+
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.severity = suggestion
68+
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.symbols = static_readonly_fields
69+
dotnet_naming_rule.static_readonly_fields_should_be_pascal_case.style = pascal_case_style
70+
dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field
71+
dotnet_naming_symbols.static_readonly_fields.required_modifiers = static, readonly
72+
dotnet_naming_symbols.static_readonly_fields.applicable_accessibilities = private, internal, private_protected
73+
74+
; Internal and private fields should be _camelCase
75+
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
76+
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
77+
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
78+
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
79+
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
80+
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
81+
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
82+
83+
; Code style defaults
84+
csharp_using_directive_placement = outside_namespace:suggestion
85+
dotnet_sort_system_directives_first = true
86+
csharp_prefer_braces = true:refactoring
87+
csharp_preserve_single_line_blocks = true:none
88+
csharp_preserve_single_line_statements = false:none
89+
csharp_prefer_static_local_function = true:suggestion
90+
csharp_prefer_simple_using_statement = false:none
91+
csharp_style_prefer_switch_expression = true:suggestion
92+
93+
; Code quality
94+
dotnet_style_readonly_field = true:suggestion
95+
dotnet_code_quality_unused_parameters = non_public:suggestion
96+
97+
; Expression-level preferences
98+
dotnet_style_object_initializer = true:suggestion
99+
dotnet_style_collection_initializer = true:suggestion
100+
dotnet_style_explicit_tuple_names = true:suggestion
101+
dotnet_style_coalesce_expression = true:suggestion
102+
dotnet_style_null_propagation = true:suggestion
103+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
104+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
105+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
106+
dotnet_style_prefer_auto_properties = true:suggestion
107+
dotnet_style_prefer_conditional_expression_over_assignment = true:refactoring
108+
dotnet_style_prefer_conditional_expression_over_return = true:refactoring
109+
csharp_prefer_simple_default_expression = true:suggestion
110+
111+
# Expression-bodied members
112+
csharp_style_expression_bodied_methods = true:refactoring
113+
csharp_style_expression_bodied_constructors = true:refactoring
114+
csharp_style_expression_bodied_operators = true:refactoring
115+
csharp_style_expression_bodied_properties = true:refactoring
116+
csharp_style_expression_bodied_indexers = true:refactoring
117+
csharp_style_expression_bodied_accessors = true:refactoring
118+
csharp_style_expression_bodied_lambdas = true:refactoring
119+
csharp_style_expression_bodied_local_functions = true:refactoring
120+
121+
# Pattern matching
122+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
123+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
124+
csharp_style_inlined_variable_declaration = true:suggestion
125+
126+
# Null checking preferences
127+
csharp_style_throw_expression = true:suggestion
128+
csharp_style_conditional_delegate_call = true:suggestion
129+
130+
# Other features
131+
csharp_style_prefer_index_operator = false:none
132+
csharp_style_prefer_range_operator = false:none
133+
csharp_style_pattern_local_over_anonymous_function = false:none
134+
135+
# Space preferences
136+
csharp_space_after_cast = false
137+
csharp_space_after_colon_in_inheritance_clause = true
138+
csharp_space_after_comma = true
139+
csharp_space_after_dot = false
140+
csharp_space_after_keywords_in_control_flow_statements = true
141+
csharp_space_after_semicolon_in_for_statement = true
142+
csharp_space_around_binary_operators = before_and_after
143+
csharp_space_around_declaration_statements = do_not_ignore
144+
csharp_space_before_colon_in_inheritance_clause = true
145+
csharp_space_before_comma = false
146+
csharp_space_before_dot = false
147+
csharp_space_before_open_square_brackets = false
148+
csharp_space_before_semicolon_in_for_statement = false
149+
csharp_space_between_empty_square_brackets = false
150+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
151+
csharp_space_between_method_call_name_and_opening_parenthesis = false
152+
csharp_space_between_method_call_parameter_list_parentheses = false
153+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
154+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
155+
csharp_space_between_method_declaration_parameter_list_parentheses = false
156+
csharp_space_between_parentheses = false
157+
csharp_space_between_square_brackets = false
158+
159+
; .NET project files and MSBuild - match defaults for VS
160+
[*.{csproj,nuspec,proj,projitems,props,shproj,targets,vbproj,vcxproj,vcxproj.filters,vsixmanifest,vsct}]
161+
indent_size = 2
162+
163+
; .NET solution files - match defaults for VS
164+
[*.sln]
165+
indent_style = tab
166+
167+
; Config - match XML and default nuget.config template
168+
[*.config]
169+
indent_size = 2
170+
171+
; Resources - match defaults for VS
172+
[*.resx]
173+
indent_size = 2
174+
175+
; Static analysis rulesets - match defaults for VS
176+
[*.ruleset]
177+
indent_size = 2
178+
179+
; HTML, XML - match defaults for VS
180+
[*.{cshtml,html,xml}]
181+
indent_size = 4
182+
183+
; JavaScript and JS mixes - match eslint settings; JSON also matches .NET Core templates
184+
[*.{js,json,ts,vue}]
185+
indent_size = 2
186+
187+
; Markdown - match markdownlint settings
188+
[*.{md,markdown}]
189+
indent_size = 2
190+
191+
; PowerShell - match defaults for New-ModuleManifest and PSScriptAnalyzer Invoke-Formatter
192+
[*.{ps1,psd1,psm1}]
193+
indent_size = 4
194+
charset = utf-8-bom
195+
196+
; ReStructuredText - standard indentation format from examples
197+
[*.rst]
198+
indent_size = 2

Diff for: ‎.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ x64/
2222
# Visual Studio 2015 cache/options directory
2323
.dotnet/
2424
.vs/
25-
.vscode/
2625
.cr/
2726

2827
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
@@ -167,4 +166,4 @@ $RECYCLE.BIN/
167166
.DS_Store
168167

169168
# JetBrains Rider
170-
.idea/
169+
.idea/

Diff for: ‎.travis.yml

-57
This file was deleted.

Diff for: ‎.vscode/extensions.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"recommendations": [
3+
"formulahendry.dotnet-test-explorer",
4+
"ms-dotnettools.csharp",
5+
"editorconfig.editorconfig",
6+
"davidanson.vscode-markdownlint"
7+
]
8+
}

Diff for: ‎.vscode/settings.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"dotnet-test-explorer.testProjectPath": "test/**/*Test.csproj",
3+
"omnisharp.enableEditorConfigSupport": true,
4+
"omnisharp.enableRoslynAnalyzers": true,
5+
"cSpell.words": [
6+
"ACTNARS",
7+
"Xunit"
8+
]
9+
}

Diff for: ‎.vscode/tasks.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"tasks": [
3+
{
4+
"args": [
5+
"build",
6+
"/property:GenerateFullPaths=true",
7+
"/consoleloggerparameters:NoSummary"
8+
],
9+
"command": "dotnet",
10+
"group": {
11+
"isDefault": true,
12+
"kind": "build"
13+
},
14+
"label": "build",
15+
"presentation": {
16+
"reveal": "silent"
17+
},
18+
"problemMatcher": "$msCompile",
19+
"type": "shell"
20+
}
21+
],
22+
"version": "2.0.0"
23+
}

Diff for: ‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Moq auto mocking integration for [Autofac IoC](https://github.com/autofac/Autofa
66
|--------|---------|
77
| [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/8c7natm3bsmn7ebx?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-moq) | [![Travis Build Status](https://travis-ci.org/autofac/Autofac.Extras.Moq.svg?branch=develop)](https://travis-ci.org/autofac/Autofac.Extras.Moq) |
88

9+
[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/autofac/Autofac.Extras.Moq)
10+
911
Please file issues and pull requests for this package in this repository rather than in the Autofac core repo.
1012

1113
- [Documentation](https://autofac.readthedocs.io/en/latest/integration/moq.html)

0 commit comments

Comments
 (0)