Skip to content

Commit b8abdaa

Browse files
junerjuner
committed
add dotnet-format tool. and .editorconfig
1 parent 3433a7d commit b8abdaa

File tree

6 files changed

+168
-11
lines changed

6 files changed

+168
-11
lines changed

Diff for: ‎.config/dotnet-tools.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-format": {
6+
"version": "5.1.225507",
7+
"commands": [
8+
"dotnet-format"
9+
]
10+
}
11+
}
12+
}

Diff for: ‎.editorconfig

+137
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# .editorconfig について詳しくは、次をご覧ください https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
root = true
6+
# All files
7+
[*]
8+
indent_style = space
9+
indent_size = 4
10+
charset = utf-8
11+
trim_trailing_whitespace = false
12+
insert_final_newline = false
13+
# Code files
14+
[*.{xml,csproj,vsproj,Build.targets,Build.props}]
15+
max_line_length = off
16+
end_of_line = lf
17+
indent_style = space
18+
charset = utf-8
19+
trim_trailing_whitespace = true
20+
insert_final_newline = true
21+
indent_size = 2
22+
[*.{cs,csx,vb,vbx}]
23+
indent_size = 4
24+
insert_final_newline = true
25+
charset = utf-8-bom
26+
end_of_line = crlf
27+
[*.{yml,yaml}]
28+
indent_size = 2
29+
insert_final_newline = true
30+
charset = utf-8
31+
[*.json]
32+
indent_size = 2
33+
###############################
34+
# .NET Coding Conventions #
35+
###############################
36+
[*.{cs,vb}]
37+
# Organize usings
38+
dotnet_sort_system_directives_first = true
39+
# this. preferences
40+
dotnet_style_qualification_for_field = false : silent
41+
dotnet_style_qualification_for_property = false : silent
42+
dotnet_style_qualification_for_method = false : silent
43+
dotnet_style_qualification_for_event = false : silent
44+
# Language keywords vs BCL types preferences
45+
dotnet_style_predefined_type_for_locals_parameters_members = true : silent
46+
dotnet_style_predefined_type_for_member_access = true : silent
47+
# Parentheses preferences
48+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity : silent
49+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity : silent
50+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity : silent
51+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary : silent
52+
# Modifier preferences
53+
dotnet_style_require_accessibility_modifiers = for_non_interface_members : silent
54+
dotnet_style_readonly_field = true : suggestion
55+
# Expression-level preferences
56+
dotnet_style_object_initializer = true : suggestion
57+
dotnet_style_collection_initializer = true : suggestion
58+
dotnet_style_explicit_tuple_names = true : suggestion
59+
dotnet_style_null_propagation = true : suggestion
60+
dotnet_style_coalesce_expression = true : suggestion
61+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true : silent
62+
dotnet_style_prefer_inferred_tuple_names = true : suggestion
63+
dotnet_style_prefer_inferred_anonymous_type_member_names = true : suggestion
64+
dotnet_style_prefer_auto_properties = true : silent
65+
dotnet_style_prefer_conditional_expression_over_assignment = true : silent
66+
dotnet_style_prefer_conditional_expression_over_return = true : silent
67+
###############################
68+
# Naming Conventions #
69+
###############################
70+
# Style Definitions
71+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
72+
# Use PascalCase for constant fields
73+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
74+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
75+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
76+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
77+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
78+
dotnet_naming_symbols.constant_fields.required_modifiers = const
79+
###############################
80+
# C# Coding Conventions #
81+
###############################
82+
[*.cs]
83+
# var preferences
84+
csharp_style_var_for_built_in_types = true : silent
85+
csharp_style_var_when_type_is_apparent = true : silent
86+
csharp_style_var_elsewhere = true : silent
87+
# Expression-bodied members
88+
csharp_style_expression_bodied_methods = false : silent
89+
csharp_style_expression_bodied_constructors = false : silent
90+
csharp_style_expression_bodied_operators = false : silent
91+
csharp_style_expression_bodied_properties = true : silent
92+
csharp_style_expression_bodied_indexers = true : silent
93+
csharp_style_expression_bodied_accessors = true : silent
94+
# Pattern matching preferences
95+
csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion
96+
csharp_style_pattern_matching_over_as_with_null_check = true : suggestion
97+
# Null-checking preferences
98+
csharp_style_throw_expression = true : suggestion
99+
csharp_style_conditional_delegate_call = true : suggestion
100+
# Modifier preferences
101+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async : suggestion
102+
# Expression-level preferences
103+
csharp_prefer_braces = true : silent
104+
csharp_style_deconstructed_variable_declaration = true : suggestion
105+
csharp_prefer_simple_default_expression = true : suggestion
106+
csharp_style_pattern_local_over_anonymous_function = true : suggestion
107+
csharp_style_inlined_variable_declaration = true : suggestion
108+
###############################
109+
# C# Formatting Rules #
110+
###############################
111+
# New line preferences
112+
csharp_new_line_before_open_brace = all
113+
csharp_new_line_before_else = true
114+
csharp_new_line_before_catch = true
115+
csharp_new_line_before_finally = true
116+
csharp_new_line_before_members_in_object_initializers = true
117+
csharp_new_line_before_members_in_anonymous_types = true
118+
csharp_new_line_between_query_expression_clauses = true
119+
# Indentation preferences
120+
csharp_indent_case_contents = true
121+
csharp_indent_switch_labels = true
122+
csharp_indent_labels = flush_left
123+
# Space preferences
124+
csharp_space_after_cast = false
125+
csharp_space_after_keywords_in_control_flow_statements = true
126+
csharp_space_between_method_call_parameter_list_parentheses = false
127+
csharp_space_between_method_declaration_parameter_list_parentheses = false
128+
csharp_space_between_parentheses = false
129+
csharp_space_before_colon_in_inheritance_clause = true
130+
csharp_space_after_colon_in_inheritance_clause = true
131+
csharp_space_around_binary_operators = before_and_after
132+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
133+
csharp_space_between_method_call_name_and_opening_parenthesis = false
134+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
135+
# Wrapping preferences
136+
csharp_preserve_single_line_statements = true
137+
csharp_preserve_single_line_blocks = true

Diff for: ‎Directory.Build.props

+8
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,12 @@
1010
<FileVersion>1.0.0.2</FileVersion>
1111
<Version>1.0.0.2</Version>
1212
</PropertyGroup>
13+
<Target Name="PreBuildFormat" BeforeTargets="PreBuildEvent" Condition="'$(Configuration)|$(ProjectExt)'=='Debug|.csproj'">
14+
<Exec Command="dotnet tool restore" />
15+
<Exec Command='dotnet tool run dotnet-format --folder "$(ProjectDir)' />
16+
</Target>
17+
<Target Name="PreBuildFormatCheck" BeforeTargets="PreBuildEvent" Condition="'$(Configuration)|$(ProjectExt)'=='Release|.csproj'">
18+
<Exec Command="dotnet tool restore" />
19+
<Exec Command='dotnet tool run dotnet-format --folder --check "$(ProjectDir)' IgnoreExitCode="false" />
20+
</Target>
1321
</Project>

Diff for: ‎DryIoc.Microsoft.DependencyInjection.Extension/ServiceCollectionExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Microsoft.Extensions.DependencyInjection;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
3+
using Microsoft.Extensions.DependencyInjection;
44

55
namespace DryIoc.Microsoft.DependencyInjection.Extension
66
{

Diff for: ‎DryIoc.Microsoft.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Microsoft.Extensions.DependencyInjection;
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using Microsoft.Extensions.DependencyInjection;
24
using Microsoft.Extensions.Options;
35
using Microsoft.VisualStudio.TestTools.UnitTesting;
4-
using System.Collections.Generic;
5-
using System.Linq;
66

77
namespace DryIoc.Microsoft.DependencyInjection.Extension.Tests
88
{
@@ -276,4 +276,4 @@ public void RegisterServices_ServiceProvider()
276276

277277
}
278278
}
279-
}
279+
}

Diff for: ‎Prism.DryIoc.Tests/ServiceCollectionExtensionsTests.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using DryIoc;
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using DryIoc;
24
using Microsoft.Extensions.DependencyInjection;
5+
using Microsoft.Extensions.Options;
36
using Microsoft.VisualStudio.TestTools.UnitTesting;
47
using Prism.DryIoc;
58
using Prism.Ioc;
6-
using System.Collections.Generic;
7-
using System.Linq;
8-
using Microsoft.Extensions.Options;
99

1010
namespace DryIoc.Microsoft.DependencyInjection.Extension.Prism.Dryioc.Tests
1111
{
@@ -266,4 +266,4 @@ class Config
266266
public string Value3 { get; set; } = string.Empty;
267267
}
268268
}
269-
}
269+
}

0 commit comments

Comments
 (0)