From 10dae89aaa8865a9598a8ba5c975d790ece75f1d Mon Sep 17 00:00:00 2001 From: Tom Pipinic Date: Thu, 8 Dec 2022 14:44:46 +0100 Subject: [PATCH] Refactoring namespaces --- .editorconfig | 226 ++++++++++++++++++ .../Connected.ServiceModel.Client.Data.csproj | 8 +- ...nnected.ServiceModel.Client.Storage.csproj | 6 +- .../Connected.ServiceModel.Client.csproj | 4 +- Framerwork.ServiceModel.Client.sln | 50 ++-- 5 files changed, 260 insertions(+), 34 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..fc2933b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,226 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = tab +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = true +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = false +dotnet_style_allow_statement_immediately_after_block_experimental = false + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = true +csharp_style_var_for_built_in_types = true +csharp_style_var_when_type_is_apparent = true + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true + +# Code-block preferences +csharp_prefer_braces = when_multiline +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = file_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false +csharp_style_allow_embedded_statements_on_same_line_experimental = false + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = false + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj b/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj index 2e033fa..6dd4f09 100644 --- a/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj +++ b/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj b/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj index efbb5ce..aa433cd 100644 --- a/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj +++ b/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj b/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj index a1df388..2697573 100644 --- a/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj +++ b/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Framerwork.ServiceModel.Client.sln b/Framerwork.ServiceModel.Client.sln index 4321ae1..97efc40 100644 --- a/Framerwork.ServiceModel.Client.sln +++ b/Framerwork.ServiceModel.Client.sln @@ -9,15 +9,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Clie EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Storage", "Connected.ServiceModel.Client.Storage\Connected.ServiceModel.Client.Storage.csproj", "{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\Framework\Connected.Entities\Connected.Entities.csproj", "{19B41DDB-EBD0-4B5F-86E2-2080DC660EE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{D9F21D24-E114-4901-8245-720A1094EA24}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\Framework\Connected.Services\Connected.Services.csproj", "{9ADD797F-CBE8-402E-BF15-2EEF5C4D035D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\Connected.Data\Connected.Data.csproj", "{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\Framework.ServiceModel\Connected.ServiceModel\Connected.ServiceModel.csproj", "{FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{627E1899-4765-4E45-9732-E322B8F459B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{D9F21D24-E114-4901-8245-720A1094EA24}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{422C716D-904B-42B4-AAE2-B07C44F39807}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\Framework\Connected.Data\Connected.Data.csproj", "{F4764705-1857-4BF0-B4D8-1EE08A6958CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\Connected.ServiceModel\Connected.ServiceModel.csproj", "{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,35 +33,35 @@ Global {1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Release|Any CPU.Build.0 = Release|Any CPU - {19B41DDB-EBD0-4B5F-86E2-2080DC660EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19B41DDB-EBD0-4B5F-86E2-2080DC660EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19B41DDB-EBD0-4B5F-86E2-2080DC660EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19B41DDB-EBD0-4B5F-86E2-2080DC660EE0}.Release|Any CPU.Build.0 = Release|Any CPU - {9ADD797F-CBE8-402E-BF15-2EEF5C4D035D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ADD797F-CBE8-402E-BF15-2EEF5C4D035D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ADD797F-CBE8-402E-BF15-2EEF5C4D035D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ADD797F-CBE8-402E-BF15-2EEF5C4D035D}.Release|Any CPU.Build.0 = Release|Any CPU - {FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A}.Release|Any CPU.Build.0 = Release|Any CPU {D9F21D24-E114-4901-8245-720A1094EA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9F21D24-E114-4901-8245-720A1094EA24}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9F21D24-E114-4901-8245-720A1094EA24}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9F21D24-E114-4901-8245-720A1094EA24}.Release|Any CPU.Build.0 = Release|Any CPU - {F4764705-1857-4BF0-B4D8-1EE08A6958CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4764705-1857-4BF0-B4D8-1EE08A6958CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4764705-1857-4BF0-B4D8-1EE08A6958CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4764705-1857-4BF0-B4D8-1EE08A6958CA}.Release|Any CPU.Build.0 = Release|Any CPU + {DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Release|Any CPU.Build.0 = Release|Any CPU + {627E1899-4765-4E45-9732-E322B8F459B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {627E1899-4765-4E45-9732-E322B8F459B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {627E1899-4765-4E45-9732-E322B8F459B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {627E1899-4765-4E45-9732-E322B8F459B9}.Release|Any CPU.Build.0 = Release|Any CPU + {422C716D-904B-42B4-AAE2-B07C44F39807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {422C716D-904B-42B4-AAE2-B07C44F39807}.Debug|Any CPU.Build.0 = Debug|Any CPU + {422C716D-904B-42B4-AAE2-B07C44F39807}.Release|Any CPU.ActiveCfg = Release|Any CPU + {422C716D-904B-42B4-AAE2-B07C44F39807}.Release|Any CPU.Build.0 = Release|Any CPU + {E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {19B41DDB-EBD0-4B5F-86E2-2080DC660EE0} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} - {9ADD797F-CBE8-402E-BF15-2EEF5C4D035D} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} - {FBB12EF1-94A8-4EBF-BA5D-2287F3A1032A} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} - {F4764705-1857-4BF0-B4D8-1EE08A6958CA} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} + {DB5BEF87-2FA0-4474-9911-50681EF6D2BD} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} + {627E1899-4765-4E45-9732-E322B8F459B9} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} + {422C716D-904B-42B4-AAE2-B07C44F39807} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} + {E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {62DF7178-0DD2-461C-999E-51A5E1BB8CAD}