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/Contacts.Types.Model/Addresses/IAddress.cs b/Connected.Contacts.Types.Model/Addresses/IAddress.cs similarity index 78% rename from Contacts.Types.Model/Addresses/IAddress.cs rename to Connected.Contacts.Types.Model/Addresses/IAddress.cs index 7291b1a..a3f7ee7 100644 --- a/Contacts.Types.Model/Addresses/IAddress.cs +++ b/Connected.Contacts.Types.Model/Addresses/IAddress.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Contacts.Types.Addresses; +namespace Connected.Contacts.Types.Addresses; public interface IAddress : IPrimaryKey { diff --git a/Contacts.Types.Model/Contacts.Types.Model.csproj b/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj similarity index 55% rename from Contacts.Types.Model/Contacts.Types.Model.csproj rename to Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj index fb792f1..f23c49c 100644 --- a/Contacts.Types.Model/Contacts.Types.Model.csproj +++ b/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj @@ -4,11 +4,11 @@ net7.0 enable enable - Contacts.Types + Connected.Contacts.Types - + diff --git a/Contacts.Types.Model/ContactsUrls.cs b/Connected.Contacts.Types.Model/ContactsUrls.cs similarity index 73% rename from Contacts.Types.Model/ContactsUrls.cs rename to Connected.Contacts.Types.Model/ContactsUrls.cs index ce8e62d..1f52d5d 100644 --- a/Contacts.Types.Model/ContactsUrls.cs +++ b/Connected.Contacts.Types.Model/ContactsUrls.cs @@ -1,4 +1,4 @@ -namespace Contacts.Types; +namespace Connected.Contacts.Types; public static class ContactsUrls { public const string BusinessPartners = "/contacts/businessPartners"; diff --git a/Contacts.Types.Model/IBusinessPartner.cs b/Connected.Contacts.Types.Model/IBusinessPartner.cs similarity index 95% rename from Contacts.Types.Model/IBusinessPartner.cs rename to Connected.Contacts.Types.Model/IBusinessPartner.cs index a15920e..c801460 100644 --- a/Contacts.Types.Model/IBusinessPartner.cs +++ b/Connected.Contacts.Types.Model/IBusinessPartner.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Contacts.Types; +namespace Connected.Contacts.Types; [Flags] public enum CustomerRoles diff --git a/Contacts.Types.Model/IBusinessPartnerService.cs b/Connected.Contacts.Types.Model/IBusinessPartnerService.cs similarity index 88% rename from Contacts.Types.Model/IBusinessPartnerService.cs rename to Connected.Contacts.Types.Model/IBusinessPartnerService.cs index 474d803..2ed1b81 100644 --- a/Contacts.Types.Model/IBusinessPartnerService.cs +++ b/Connected.Contacts.Types.Model/IBusinessPartnerService.cs @@ -2,7 +2,7 @@ using Connected.Notifications; using Connected.ServiceModel; -namespace Contacts.Types; +namespace Connected.Contacts.Types; [Service] [ServiceUrl(ContactsUrls.BusinessPartners)] diff --git a/Contacts.Types.Model/IContact.cs b/Connected.Contacts.Types.Model/IContact.cs similarity index 86% rename from Contacts.Types.Model/IContact.cs rename to Connected.Contacts.Types.Model/IContact.cs index 144e4f5..3ec342c 100644 --- a/Contacts.Types.Model/IContact.cs +++ b/Connected.Contacts.Types.Model/IContact.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Contacts.Types; +namespace Connected.Contacts.Types; public interface IContact : IPrimaryKey { diff --git a/Contacts.Types.Model/Organizations/IOrganization.cs b/Connected.Contacts.Types.Model/Organizations/IOrganization.cs similarity index 78% rename from Contacts.Types.Model/Organizations/IOrganization.cs rename to Connected.Contacts.Types.Model/Organizations/IOrganization.cs index b747400..5c3f4e5 100644 --- a/Contacts.Types.Model/Organizations/IOrganization.cs +++ b/Connected.Contacts.Types.Model/Organizations/IOrganization.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Contacts.Types.Organizations; +namespace Connected.Contacts.Types.Organizations; public interface IOrganization : IPrimaryKey { diff --git a/Contacts.Types.Model/Organizations/IOrganizationContact.cs b/Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs similarity index 74% rename from Contacts.Types.Model/Organizations/IOrganizationContact.cs rename to Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs index dc74ab0..a741576 100644 --- a/Contacts.Types.Model/Organizations/IOrganizationContact.cs +++ b/Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs @@ -1,6 +1,6 @@ using Connected.Data; -namespace Contacts.Types.Organizations; +namespace Connected.Contacts.Types.Organizations; public interface IOrganizationContact : IPrimaryKey { diff --git a/Contacts.Types/Bootstrapper.cs b/Connected.Contacts.Types/Bootstrapper.cs similarity index 57% rename from Contacts.Types/Bootstrapper.cs rename to Connected.Contacts.Types/Bootstrapper.cs index 2fee05c..b39ff04 100644 --- a/Contacts.Types/Bootstrapper.cs +++ b/Connected.Contacts.Types/Bootstrapper.cs @@ -1,9 +1,8 @@ -using Connected; -using Connected.Annotations; +using Connected.Annotations; [assembly: MicroService(MicroServiceType.Service)] -namespace Contacts.Types; +namespace Connected.Contacts.Types; internal sealed class Bootstrapper : Startup { } diff --git a/Contacts.Types/BusinessPartnerService.cs b/Connected.Contacts.Types/BusinessPartnerService.cs similarity index 90% rename from Contacts.Types/BusinessPartnerService.cs rename to Connected.Contacts.Types/BusinessPartnerService.cs index 68a8328..ddb0784 100644 --- a/Contacts.Types/BusinessPartnerService.cs +++ b/Connected.Contacts.Types/BusinessPartnerService.cs @@ -1,7 +1,7 @@ using Connected.ServiceModel; using Connected.Services; -namespace Contacts.Types; +namespace Connected.Contacts.Types; internal sealed class BusinessPartnerService : EntityService, IBusinessPartnerService { public BusinessPartnerService(IContext context) : base(context) diff --git a/Connected.Contacts.Types/Connected.Contacts.Types.csproj b/Connected.Contacts.Types/Connected.Contacts.Types.csproj new file mode 100644 index 0000000..4e74970 --- /dev/null +++ b/Connected.Contacts.Types/Connected.Contacts.Types.csproj @@ -0,0 +1,15 @@ + + + + net7.0 + enable + enable + + + + + + + + + diff --git a/Customers.sln b/Connected.Customers.sln similarity index 60% rename from Customers.sln rename to Connected.Customers.sln index 6cbe934..52434ea 100644 --- a/Customers.sln +++ b/Connected.Customers.sln @@ -5,15 +5,15 @@ VisualStudioVersion = 17.4.33020.496 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{AE326167-90A7-4D49-BB24-BA7DEE6A2F26}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types.Model", "..\Common.Types\Common.Types.Model\Common.Types.Model.csproj", "{3839CE71-C1DD-467E-B1E4-8D00C3460CC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "..\Connected.Common.Types\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{3839CE71-C1DD-467E-B1E4-8D00C3460CC5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contacts.Types.Model", "Contacts.Types.Model\Contacts.Types.Model.csproj", "{AA722E99-87C8-4D8F-ACB5-2F2D07669BC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types.Model", "Connected.Contacts.Types.Model\Connected.Contacts.Types.Model.csproj", "{AA722E99-87C8-4D8F-ACB5-2F2D07669BC6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contacts.Types", "Contacts.Types\Contacts.Types.csproj", "{D465F1C6-42CE-445A-9CCE-5DD6D8A30055}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types", "Connected.Contacts.Types\Connected.Contacts.Types.csproj", "{D465F1C6-42CE-445A-9CCE-5DD6D8A30055}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\Framework\Connected.Entities\Connected.Entities.csproj", "{31825097-E9A6-4643-9118-BE007ABEA405}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{B805B1E7-EDD1-423E-8F80-94DC415FBA70}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\Framework\Connected.Services\Connected.Services.csproj", "{F254B9EC-9F32-4304-8855-17DCA60C5EC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{CC29CC2B-D171-4914-8ED6-325BB4E546D2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,22 +33,22 @@ Global {D465F1C6-42CE-445A-9CCE-5DD6D8A30055}.Debug|Any CPU.Build.0 = Debug|Any CPU {D465F1C6-42CE-445A-9CCE-5DD6D8A30055}.Release|Any CPU.ActiveCfg = Release|Any CPU {D465F1C6-42CE-445A-9CCE-5DD6D8A30055}.Release|Any CPU.Build.0 = Release|Any CPU - {31825097-E9A6-4643-9118-BE007ABEA405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31825097-E9A6-4643-9118-BE007ABEA405}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31825097-E9A6-4643-9118-BE007ABEA405}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31825097-E9A6-4643-9118-BE007ABEA405}.Release|Any CPU.Build.0 = Release|Any CPU - {F254B9EC-9F32-4304-8855-17DCA60C5EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F254B9EC-9F32-4304-8855-17DCA60C5EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F254B9EC-9F32-4304-8855-17DCA60C5EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F254B9EC-9F32-4304-8855-17DCA60C5EC5}.Release|Any CPU.Build.0 = Release|Any CPU + {B805B1E7-EDD1-423E-8F80-94DC415FBA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B805B1E7-EDD1-423E-8F80-94DC415FBA70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B805B1E7-EDD1-423E-8F80-94DC415FBA70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B805B1E7-EDD1-423E-8F80-94DC415FBA70}.Release|Any CPU.Build.0 = Release|Any CPU + {CC29CC2B-D171-4914-8ED6-325BB4E546D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC29CC2B-D171-4914-8ED6-325BB4E546D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC29CC2B-D171-4914-8ED6-325BB4E546D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC29CC2B-D171-4914-8ED6-325BB4E546D2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {3839CE71-C1DD-467E-B1E4-8D00C3460CC5} = {AE326167-90A7-4D49-BB24-BA7DEE6A2F26} - {31825097-E9A6-4643-9118-BE007ABEA405} = {AE326167-90A7-4D49-BB24-BA7DEE6A2F26} - {F254B9EC-9F32-4304-8855-17DCA60C5EC5} = {AE326167-90A7-4D49-BB24-BA7DEE6A2F26} + {B805B1E7-EDD1-423E-8F80-94DC415FBA70} = {AE326167-90A7-4D49-BB24-BA7DEE6A2F26} + {CC29CC2B-D171-4914-8ED6-325BB4E546D2} = {AE326167-90A7-4D49-BB24-BA7DEE6A2F26} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {89478694-8DAA-4C4E-8047-8B516C5E26AE} diff --git a/Contacts.Types/Contacts.Types.csproj b/Contacts.Types/Contacts.Types.csproj deleted file mode 100644 index beec823..0000000 --- a/Contacts.Types/Contacts.Types.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - - -