Skip to content

Commit 553f288

Browse files
tilligtillig
authored
Merge pull request #91 from autofac/feature/net6
NET6 and IServiceProviderIsService support.
2 parents 316da00 + bb66b26 commit 553f288

30 files changed

Lines changed: 535 additions & 129 deletions

‎.editorconfig‎

Lines changed: 198 additions & 28 deletions
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

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
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

‎.vscode/extensions.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"recommendations": [
3+
"bierner.markdown-emoji",
4+
"davidanson.vscode-markdownlint",
5+
"editorconfig.editorconfig",
6+
"formulahendry.dotnet-test-explorer",
7+
"gruntfuggly.todo-tree",
8+
"ms-dotnettools.csharp",
9+
"ryanluker.vscode-coverage-gutters",
10+
"stkb.rewrap",
11+
"travisillig.vscode-json-stable-stringify"
12+
]
13+
}

‎.vscode/launch.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"configurations": [
3+
{
4+
"args": [
5+
],
6+
"console": "internalConsole",
7+
"cwd": "${workspaceFolder}/test/Autofac.Extensions.DependencyInjection.Test",
8+
"name": "Launch Tests",
9+
"preLaunchTask": "build",
10+
"program": "${workspaceFolder}/test/Autofac.Extensions.DependencyInjection.Test/bin/Debug/net6.0/Autofac.Extensions.DependencyInjection.Test.dll",
11+
"request": "launch",
12+
"stopAtEntry": false,
13+
"type": "coreclr"
14+
},
15+
{
16+
"name": ".NET Core Attach",
17+
"processId": "${command:pickProcess}",
18+
"request": "attach",
19+
"type": "coreclr"
20+
}
21+
],
22+
"version": "0.2.0"
23+
}

‎.vscode/settings.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"cSpell.words": [
3+
"autofac",
4+
"xunit"
5+
],
6+
"coverage-gutters.coverageBaseDir": "artifacts/coverage",
7+
"coverage-gutters.coverageFileNames": [
8+
"coverage.net6.0.info"
9+
],
10+
"dotnet-test-explorer.runInParallel": true,
11+
"dotnet-test-explorer.testProjectPath": "test/**/*.Test.csproj",
12+
"files.watcherExclude": {
13+
"**/target": true
14+
}
15+
}

‎.vscode/tasks.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"tasks": [
3+
{
4+
"args": [
5+
"build",
6+
"${workspaceFolder}/Autofac.Extensions.DependencyInjection.sln",
7+
"/property:GenerateFullPaths=true",
8+
"/consoleloggerparameters:NoSummary"
9+
],
10+
"command": "dotnet",
11+
"group": {
12+
"isDefault": true,
13+
"kind": "build"
14+
},
15+
"label": "build",
16+
"problemMatcher": "$msCompile",
17+
"type": "process"
18+
},
19+
{
20+
"args": [
21+
"test",
22+
"${workspaceFolder}/Autofac.Extensions.DependencyInjection.sln",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary",
25+
"--results-directory",
26+
"\"artifacts/coverage\"",
27+
"--logger:trx",
28+
"/p:CoverletOutput=\"${workspaceFolder}/artifacts/coverage/\"",
29+
"/p:CollectCoverage=true",
30+
"/p:CoverletOutputFormat=lcov",
31+
"/p:Exclude=\"[System.*]*\"",
32+
"-m:1"
33+
],
34+
"command": "dotnet",
35+
"group": {
36+
"isDefault": true,
37+
"kind": "test"
38+
},
39+
"label": "test",
40+
"problemMatcher": "$msCompile",
41+
"type": "process"
42+
},
43+
{
44+
"args": [
45+
"watch",
46+
"--project",
47+
"${workspaceFolder}/build/Watch.proj",
48+
"msbuild",
49+
"/t:Test",
50+
"/property:GenerateFullPaths=true"
51+
],
52+
"command": "dotnet",
53+
"label": "watch",
54+
"problemMatcher": "$msCompile",
55+
"type": "process"
56+
}
57+
],
58+
"version": "2.0.0"
59+
}

‎bench/Autofac.Extensions.DependencyInjection.Bench/Autofac.Extensions.DependencyInjection.Bench.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.4" />
10+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.16" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎bench/projects/Bench.AutofacApiServer/Controllers/ValuesController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ namespace BenchProject.AutofacApiServer.Controllers
1111
[ApiController]
1212
public class ValuesController : ControllerBase
1313
{
14-
private readonly A service;
14+
private readonly A _service;
1515

1616
public ValuesController(A service)
1717
{
18-
this.service = service;
18+
_service = service;
1919
}
2020

2121
[HttpGet]

‎build.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
########################
1+
########################
22
# THE BUILD!
33
########################
44

@@ -18,11 +18,11 @@ try {
1818
Write-Message "Cleaning $artifactsPath folder"
1919
Remove-Item $artifactsPath -Force -Recurse
2020
}
21-
21+
2222
# Install dotnet CLI
23-
Write-Message "Installing .NET Core SDK version $sdkVersion"
23+
Write-Message "Installing .NET SDK version $sdkVersion"
2424
Install-DotNetCli -Version $sdkVersion
25-
25+
2626
foreach ($additional in $globalJson.additionalSdks)
2727
{
2828
Install-DotNetCli -Version $additional;

0 commit comments

Comments
 (0)