Skip to content

Commit 2cb2574

Browse files
committed
Cleanup and bump version to 5.2.0
1 parent b216881 commit 2cb2574

9 files changed

Lines changed: 350 additions & 96 deletions

File tree

.editorconfig

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
2+
[*]
3+
4+
# Microsoft .NET properties
5+
csharp_new_line_before_members_in_object_initializers = false
6+
csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
7+
csharp_preserve_single_line_blocks = true
8+
csharp_style_var_elsewhere = true:suggestion
9+
csharp_style_var_for_built_in_types = true:suggestion
10+
csharp_style_var_when_type_is_apparent = true:suggestion
11+
dotnet_naming_rule.constants_rule.import_to_resharper = True
12+
dotnet_naming_rule.constants_rule.resharper_description = Constant fields (not private)
13+
dotnet_naming_rule.constants_rule.resharper_guid = 669e5282-fb4b-4e90-91e7-07d269d04b60
14+
dotnet_naming_rule.constants_rule.severity = suggestion
15+
dotnet_naming_rule.constants_rule.style = all_upper_style
16+
dotnet_naming_rule.constants_rule.symbols = constants_symbols
17+
dotnet_naming_rule.private_constants_rule.import_to_resharper = True
18+
dotnet_naming_rule.private_constants_rule.resharper_description = Constant fields (private)
19+
dotnet_naming_rule.private_constants_rule.resharper_guid = 236f7aa5-7b06-43ca-bf2a-9b31bfcff09a
20+
dotnet_naming_rule.private_constants_rule.severity = suggestion
21+
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
22+
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
23+
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = True
24+
dotnet_naming_rule.private_instance_fields_rule.resharper_description = Instance fields (private)
25+
dotnet_naming_rule.private_instance_fields_rule.resharper_guid = 4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
26+
dotnet_naming_rule.private_instance_fields_rule.severity = suggestion
27+
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
28+
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
29+
dotnet_naming_rule.private_static_fields_rule.import_to_resharper = True
30+
dotnet_naming_rule.private_static_fields_rule.resharper_description = Static fields (private)
31+
dotnet_naming_rule.private_static_fields_rule.resharper_exclusive_prefixes_suffixes = true
32+
dotnet_naming_rule.private_static_fields_rule.resharper_guid = f9fce829-e6f4-4cb2-80f1-5497c44f51df
33+
dotnet_naming_rule.private_static_fields_rule.severity = suggestion
34+
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
35+
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
36+
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = True
37+
dotnet_naming_rule.private_static_readonly_rule.resharper_description = Static readonly fields (private)
38+
dotnet_naming_rule.private_static_readonly_rule.resharper_guid = 15b5b1f1-457c-4ca6-b278-5615aedc07d3
39+
dotnet_naming_rule.private_static_readonly_rule.severity = suggestion
40+
dotnet_naming_rule.private_static_readonly_rule.style = lower_camel_case_style
41+
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
42+
dotnet_naming_style.all_upper_style.capitalization = all_upper
43+
dotnet_naming_style.all_upper_style.word_separator = _
44+
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
45+
dotnet_naming_style.lower_camel_case_style.required_prefix = _
46+
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
47+
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
48+
dotnet_naming_symbols.constants_symbols.applicable_kinds = field
49+
dotnet_naming_symbols.constants_symbols.required_modifiers = const
50+
dotnet_naming_symbols.constants_symbols.resharper_applicable_kinds = constant_field
51+
dotnet_naming_symbols.constants_symbols.resharper_required_modifiers = any
52+
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
53+
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
54+
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
55+
dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds = constant_field
56+
dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers = any
57+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
58+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
59+
dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds = field,readonly_field
60+
dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers = instance
61+
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
62+
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
63+
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
64+
dotnet_naming_symbols.private_static_fields_symbols.resharper_applicable_kinds = field
65+
dotnet_naming_symbols.private_static_fields_symbols.resharper_required_modifiers = static
66+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
67+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
68+
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = readonly,static
69+
dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds = readonly_field
70+
dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers = static
71+
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:suggestion
72+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
73+
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:suggestion
74+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
75+
dotnet_style_predefined_type_for_member_access = true:suggestion
76+
dotnet_style_qualification_for_event = false:suggestion
77+
dotnet_style_qualification_for_field = false:suggestion
78+
dotnet_style_qualification_for_method = false:suggestion
79+
dotnet_style_qualification_for_property = false:suggestion
80+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
81+
82+
# ReSharper properties
83+
resharper_blank_lines_around_single_line_type = 1
84+
resharper_braces_for_for = not_required
85+
resharper_braces_for_foreach = not_required
86+
resharper_braces_for_ifelse = not_required_for_both
87+
resharper_braces_for_while = not_required
88+
resharper_braces_redundant = true
89+
resharper_keep_existing_declaration_block_arrangement = false
90+
resharper_keep_existing_embedded_block_arrangement = false
91+
resharper_keep_existing_enum_arrangement = false
92+
resharper_show_autodetect_configure_formatting_tip = false
93+
resharper_use_heuristics_for_body_style = true
94+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
95+
tab_width = 4
96+
indent_size = 4
97+
csharp_indent_labels = one_less_than_current
98+
csharp_space_around_binary_operators = before_and_after
99+
dotnet_style_coalesce_expression = true:suggestion
100+
dotnet_style_null_propagation = true:suggestion
101+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
102+
dotnet_style_prefer_auto_properties = true:silent
103+
dotnet_style_object_initializer = true:suggestion
104+
dotnet_style_collection_initializer = true:suggestion
105+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
106+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
107+
dotnet_style_prefer_conditional_expression_over_return = true:silent
108+
dotnet_style_explicit_tuple_names = true:suggestion
109+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
110+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
111+
dotnet_style_prefer_compound_assignment = true:suggestion
112+
dotnet_style_prefer_simplified_interpolation = true:suggestion
113+
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
114+
dotnet_style_namespace_match_folder = true:suggestion
115+
csharp_using_directive_placement = outside_namespace:silent
116+
csharp_prefer_simple_using_statement = true:suggestion
117+
csharp_prefer_braces = true:silent
118+
csharp_style_prefer_method_group_conversion = true:silent
119+
csharp_style_prefer_top_level_statements = true:silent
120+
csharp_style_prefer_primary_constructors = true:suggestion
121+
csharp_prefer_system_threading_lock = true:suggestion
122+
csharp_style_expression_bodied_methods = false:silent
123+
csharp_style_expression_bodied_constructors = false:silent
124+
csharp_style_expression_bodied_operators = false:silent
125+
csharp_style_expression_bodied_properties = true:silent
126+
csharp_style_expression_bodied_indexers = true:silent
127+
csharp_style_expression_bodied_accessors = true:silent
128+
csharp_style_expression_bodied_lambdas = true:silent
129+
csharp_style_expression_bodied_local_functions = false:silent
130+
csharp_style_throw_expression = true:suggestion
131+
csharp_style_prefer_null_check_over_type_check = true:suggestion
132+
csharp_prefer_simple_default_expression = true:suggestion
133+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
134+
csharp_style_prefer_index_operator = true:suggestion
135+
csharp_style_prefer_range_operator = true:suggestion
136+
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
137+
csharp_style_prefer_tuple_swap = true:suggestion
138+
csharp_style_prefer_unbound_generic_type_in_nameof = true:suggestion
139+
csharp_style_prefer_utf8_string_literals = true:suggestion
140+
csharp_style_inlined_variable_declaration = true:suggestion
141+
csharp_style_deconstructed_variable_declaration = true:suggestion
142+
143+
# ReSharper inspection severities
144+
resharper_arrange_accessor_owner_body_highlighting = suggestion
145+
resharper_arrange_missing_parentheses_highlighting = hint
146+
resharper_arrange_redundant_parentheses_highlighting = hint
147+
resharper_arrange_this_qualifier_highlighting = hint
148+
resharper_arrange_type_member_modifiers_highlighting = hint
149+
resharper_arrange_type_modifiers_highlighting = hint
150+
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
151+
resharper_built_in_type_reference_style_highlighting = hint
152+
resharper_convert_to_primary_constructor_highlighting = hint
153+
resharper_inconsistent_naming_highlighting = suggestion
154+
resharper_redundant_base_qualifier_highlighting = warning
155+
resharper_suggest_var_or_type_built_in_types_highlighting = hint
156+
resharper_suggest_var_or_type_elsewhere_highlighting = hint
157+
resharper_suggest_var_or_type_simple_types_highlighting = hint
158+
159+
[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,jsproj,lsproj,njsproj,nuspec,proj,props,resw,resx,StyleCop,targets,tasks,vbproj,xml,xsd}]
160+
indent_style = tab
161+
indent_size = tab
162+
tab_width = 4
163+
164+
[*.{asax,ascx,aspx,axaml,cs,cshtml,htm,html,master,paml,razor,skin,vb,xaml,xamlx,xoml}]
165+
indent_style = space
166+
indent_size = 4
167+
tab_width = 4

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Project defaults -->
44

55
<PropertyGroup>
6-
<Version>5.1.2</Version>
6+
<Version>5.2.0</Version>
77
</PropertyGroup>
88

99
</Project>

Websocket.Client.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test_integration", "test_in
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B771F515-0677-409B-BEC1-B84BC88E7392}"
1313
ProjectSection(SolutionItems) = preProject
14+
.editorconfig = .editorconfig
1415
Directory.Build.props = Directory.Build.props
1516
.github\workflows\dotnet-core-branches.yml = .github\workflows\dotnet-core-branches.yml
1617
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml

Websocket.Client.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
3+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
4+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
35
<s:Boolean x:Key="/Default/UserDictionary/Words/=BBBB/@EntryIndexedValue">True</s:Boolean>
46
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bitmex/@EntryIndexedValue">True</s:Boolean>
57
<s:Boolean x:Key="/Default/UserDictionary/Words/=Fakely/@EntryIndexedValue">True</s:Boolean>

0 commit comments

Comments
 (0)