Skip to content

Commit

Permalink
Merge branch 'epinova_master' into bugfix/throw-on-network-error
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/EpiserverAdapter/Communication/HttpClientInvoker.cs
  • Loading branch information
kjetilmk committed Nov 11, 2019
2 parents 15df56c + 85ba67b commit e57aa29
Show file tree
Hide file tree
Showing 113 changed files with 2,851 additions and 2,933 deletions.
278 changes: 278 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,278 @@
###############################
# Core EditorConfig Options #
###############################

root=true

# All files
[*]
indent_style=space
trim_trailing_whitespace=true

# Code files
[*.{asax,ascx,aspx,cs,csx,cshtml,css,htm,html,js,json,jsx,master,razor,resjson,skin,ts,tsx,vb,vbx}]
indent_size=4
insert_final_newline=true
charset=utf-8-bom

# Xml files
[*.{appxmanifest,build,config,csproj,dbml,discomap,dtd,jsproj,lsproj,njsproj,nuspec,proj,props,resw,resx,StyleCop,targets,tasks,vbproj,xaml,xamlx,xml,xoml,xsd}]
indent_size=2
tab_width=2

###############################
# .NET Coding Conventions #
###############################

[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first=true
dotnet_separate_import_directive_groups=false

# this. preferences
dotnet_style_qualification_for_field=false:hint
dotnet_style_qualification_for_property=false:hint
dotnet_style_qualification_for_method=false:hint
dotnet_style_qualification_for_event=false:hint

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members=true:hint
dotnet_style_predefined_type_for_member_access=false:hint

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators=always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators=always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators=always_for_clarity:silent
dotnet_style_parentheses_in_other_operators=never_if_unnecessary:silent

# Modifier preferences
dotnet_style_require_accessibility_modifiers=for_non_interface_members:hint
dotnet_style_readonly_field=true:suggestion

# Expression-level preferences
dotnet_style_object_initializer=true:suggestion
dotnet_style_collection_initializer=true:suggestion
dotnet_style_explicit_tuple_names=true:suggestion
dotnet_style_null_propagation=true:suggestion
dotnet_style_coalesce_expression=true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method=true:silent
dotnet_style_prefer_inferred_tuple_names=true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names=true:suggestion
dotnet_style_prefer_auto_properties=true:silent
dotnet_style_prefer_conditional_expression_over_assignment=true:silent
dotnet_style_prefer_conditional_expression_over_return=true:silent
dotnet_style_prefer_compound_assignment=true:suggestion

###############################
# Naming Conventions #
###############################

# 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

dotnet_naming_rule.private_or_internal_field_should_be_begins_with__.severity=suggestion
dotnet_naming_rule.private_or_internal_field_should_be_begins_with__.symbols=private_or_internal_field
dotnet_naming_rule.private_or_internal_field_should_be_begins_with__.style=begins_with__

dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with__.severity=suggestion
dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with__.symbols=private_or_internal_static_field
dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with__.style=begins_with__

dotnet_naming_rule.constant_fields_should_be_pascal_case.severity=suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols=constant_fields
dotnet_naming_rule.constant_fields_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
dotnet_naming_symbols.interface.required_modifiers=

dotnet_naming_symbols.private_or_internal_field.applicable_kinds=field
dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities=internal, private
dotnet_naming_symbols.private_or_internal_field.required_modifiers=

dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds=field
dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities=internal, private
dotnet_naming_symbols.private_or_internal_static_field.required_modifiers=static

dotnet_naming_symbols.types.applicable_kinds=class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities=public, internal, private, protected, protected_internal
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
dotnet_naming_symbols.non_field_members.required_modifiers=

dotnet_naming_symbols.constant_fields.applicable_kinds=field
dotnet_naming_symbols.constant_fields.applicable_accessibilities=*
dotnet_naming_symbols.constant_fields.required_modifiers=const

# 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

dotnet_naming_style.begins_with__.required_prefix=_
dotnet_naming_style.begins_with__.required_suffix=
dotnet_naming_style.begins_with__.word_separator=
dotnet_naming_style.begins_with__.capitalization=camel_case


###############################
# C# Code Style Rules #
###############################

[*.cs]
# var preferences
csharp_style_var_for_built_in_types=false:hint
csharp_style_var_when_type_is_apparent=true:hint
csharp_style_var_elsewhere=false:hint

# Expression-bodied members
csharp_style_expression_bodied_methods=false:silent
csharp_style_expression_bodied_constructors=false:silent
csharp_style_expression_bodied_operators=false:silent
csharp_style_expression_bodied_properties=true:silent
csharp_style_expression_bodied_indexers=true:silent
csharp_style_expression_bodied_accessors=true:silent
csharp_style_expression_bodied_lambdas=true:silent
csharp_style_expression_bodied_local_functions=false:silent

# Pattern-matching preferences
csharp_style_pattern_matching_over_is_with_cast_check=true:suggestion
csharp_style_pattern_matching_over_as_with_null_check=true:suggestion
csharp_style_prefer_switch_expression=true:suggestion

# Null-checking preferences
csharp_style_throw_expression=true:suggestion
csharp_style_conditional_delegate_call=true:suggestion

# Modifier preferences
csharp_prefer_static_local_function=true:suggestion
csharp_preferred_modifier_order=public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion

# Expression-level preferences
csharp_prefer_braces=true:silent
csharp_style_deconstructed_variable_declaration=true:suggestion
csharp_prefer_simple_default_expression=true:suggestion
csharp_prefer_simple_using_statement=true:suggestion
csharp_style_pattern_local_over_anonymous_function=true:suggestion
csharp_style_inlined_variable_declaration=true:suggestion
csharp_style_prefer_index_operator=true:suggestion
csharp_style_prefer_range_operator=true:suggestion
csharp_style_unused_value_assignment_preference=discard_variable:suggestion
csharp_style_unused_value_expression_statement_preference=discard_variable:silent

# 'using' directive preferences
csharp_using_directive_placement=outside_namespace:silent

###############################
# C# Code Quality Rules #
###############################

# Parameter preferences
dotnet_code_quality_unused_parameters=all:suggestion

###############################
# C# Formatting Rules #
###############################

# New line preferences
csharp_new_line_before_open_brace=all
csharp_new_line_before_else=true
csharp_new_line_before_catch=true
csharp_new_line_before_finally=true
csharp_new_line_before_members_in_object_initializers=false
csharp_new_line_before_members_in_anonymous_types=true
csharp_new_line_between_query_expression_clauses=true

# Indentation preferences
csharp_indent_block_contents=true
csharp_indent_braces=false
csharp_indent_case_contents_when_block=true
csharp_indent_case_contents=true
csharp_indent_switch_labels=true
csharp_indent_labels=flush_left

# Space preferences
csharp_space_after_cast=false
csharp_space_after_keywords_in_control_flow_statements=true
csharp_space_between_method_call_parameter_list_parentheses=false
csharp_space_between_method_declaration_parameter_list_parentheses=false
csharp_space_between_parentheses=false
csharp_space_before_colon_in_inheritance_clause=true
csharp_space_after_colon_in_inheritance_clause=true
csharp_space_around_binary_operators=before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses=false
csharp_space_between_method_call_name_and_opening_parenthesis=false
csharp_space_between_method_call_empty_parameter_list_parentheses=false
csharp_space_after_comma=true
csharp_space_after_dot=false
csharp_space_after_semicolon_in_for_statement=true
csharp_space_around_declaration_statements=false
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_declaration_name_and_open_parenthesis=false
csharp_space_between_square_brackets=false

# Wrapping preferences
csharp_preserve_single_line_statements=true
csharp_preserve_single_line_blocks=true

###############################
# Resharper specifics #
###############################

# ReSharper properties
resharper_csharp_insert_final_newline=true
resharper_csharp_max_line_length=200
resharper_csharp_use_indent_from_vs=true
resharper_css_use_indent_from_vs=true
resharper_html_use_indent_from_vs=true
resharper_js_max_line_length=200
resharper_js_use_indent_from_vs=true
resharper_keep_existing_declaration_block_arrangement=true
resharper_keep_existing_embedded_block_arrangement=false
resharper_keep_existing_enum_arrangement=false
resharper_max_attribute_length_for_same_line=200
resharper_place_accessorholder_attribute_on_same_line=false
resharper_place_field_attribute_on_same_line=false
resharper_space_within_single_line_array_initializer_braces=true
resharper_xmldoc_max_line_length=200
resharper_xmldoc_use_indent_from_vs=true
resharper_xml_blank_line_after_pi=false
resharper_xml_max_line_length=200
resharper_xml_use_indent_from_vs=true

# ReSharper inspection severities
resharper_comment_typo_highlighting=hint
resharper_identifier_typo_highlighting=hint
resharper_markup_attribute_typo_highlighting=hint
resharper_markup_text_typo_highlighting=hint
resharper_mvc_partial_view_not_resolved_highlighting=warning
resharper_mvc_template_not_resolved_highlighting=hint
resharper_mvc_view_not_resolved_highlighting=warning
resharper_redundant_base_qualifier_highlighting=warning
resharper_string_literal_typo_highlighting=hint
12 changes: 10 additions & 2 deletions Epinova.InRiverConnector.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.15
# Visual Studio Version 16
VisualStudioVersion = 16.0.29418.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EpiserverAdapter", "src\EpiserverAdapter\EpiserverAdapter.csproj", "{F6FC6A0D-D026-4FC3-873C-19AF480821D5}"
EndProject
Expand All @@ -15,6 +15,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EpiserverAdapterTests", "te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EpiserverRestApi", "EpiserverRestApi\EpiserverRestApi.csproj", "{36C58EE9-57CD-4EC6-A600-F689A8F4B22B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{7A7A4228-2651-4ADA-8099-0A83CC0B8453}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
License.txt = License.txt
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
Loading

0 comments on commit e57aa29

Please sign in to comment.