Merge branch 'dev'

.editorconfig

@@ -77,8 +77,8 @@ dotnet_style_allow_statement_immediately_after_block_experimental = false
 #### C# 編碼慣例 ####
 
 # var 喜好設定
-csharp_style_var_elsewhere = true:suggestion
-csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = true:suggestion
 
 # 運算式主體成員
@@ -461,6 +461,16 @@ dotnet_naming_rule.local_constants_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.local_constants_rule.severity = warning
 dotnet_naming_rule.local_constants_rule.style = camel_case
 dotnet_naming_rule.local_constants_rule.symbols = local_constants_symbols
+dotnet_naming_rule.local_constants_rule_1.import_to_resharper = True
+dotnet_naming_rule.local_constants_rule_1.resharper_description = LocalConstants
+dotnet_naming_rule.local_constants_rule_1.resharper_guid = d8c53f99-83a7-49c4-9131-7ea2d038435c
+dotnet_naming_rule.local_constants_rule_1.severity = warning
+dotnet_naming_rule.local_constants_rule_1.style = camel_case
+dotnet_naming_rule.local_constants_rule_1.symbols = local_constants_symbols_1
+dotnet_naming_rule.local_functions_rule.import_to_resharper = as_predefined
+dotnet_naming_rule.local_functions_rule.severity = warning
+dotnet_naming_rule.local_functions_rule.style = camel_case
+dotnet_naming_rule.local_functions_rule.symbols = local_functions_symbols
 dotnet_naming_rule.method_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.method_rule.severity = warning
 dotnet_naming_rule.method_rule.style = pascal_case
@@ -473,10 +483,20 @@ dotnet_naming_rule.private_constants_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.private_constants_rule.severity = warning
 dotnet_naming_rule.private_constants_rule.style = pascal_case
 dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
+dotnet_naming_rule.private_static_fields_override_rule.import_to_resharper = False
+dotnet_naming_rule.private_static_fields_override_rule.severity = warning
+dotnet_naming_rule.private_static_fields_override_rule.style = pascal_case
+dotnet_naming_rule.private_static_fields_override_rule.symbols = private_static_fields_override_symbols
 dotnet_naming_rule.private_static_fields_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.private_static_fields_rule.severity = warning
 dotnet_naming_rule.private_static_fields_rule.style = camel_case_begin_with__
 dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
+dotnet_naming_rule.private_static_fields_rule_1.import_to_resharper = True
+dotnet_naming_rule.private_static_fields_rule_1.resharper_description = PrivateStaticFields
+dotnet_naming_rule.private_static_fields_rule_1.resharper_guid = 9a050c61-4789-4fb3-92a3-b9f3337a7e93
+dotnet_naming_rule.private_static_fields_rule_1.severity = warning
+dotnet_naming_rule.private_static_fields_rule_1.style = camel_case_begin_with__
+dotnet_naming_rule.private_static_fields_rule_1.symbols = private_static_fields_symbols_1
 dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.private_static_readonly_rule.severity = warning
 dotnet_naming_rule.private_static_readonly_rule.style = camel_case_begin_with__
@@ -515,16 +535,31 @@ dotnet_naming_symbols.locals_symbols.applicable_kinds = local
 dotnet_naming_symbols.local_constants_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.local_constants_symbols.applicable_kinds = local
 dotnet_naming_symbols.local_constants_symbols.required_modifiers = const
+dotnet_naming_symbols.local_constants_symbols_1.applicable_accessibilities = *
+dotnet_naming_symbols.local_constants_symbols_1.applicable_kinds = local
+dotnet_naming_symbols.local_constants_symbols_1.required_modifiers = const
+dotnet_naming_symbols.local_constants_symbols_1.resharper_applicable_kinds = local_constant
+dotnet_naming_symbols.local_constants_symbols_1.resharper_required_modifiers = any
+dotnet_naming_symbols.local_functions_symbols.applicable_accessibilities = *
+dotnet_naming_symbols.local_functions_symbols.applicable_kinds = local_function
 dotnet_naming_symbols.method_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.method_symbols.applicable_kinds = method
 dotnet_naming_symbols.parameters_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.parameters_symbols.applicable_kinds = parameter
 dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
+dotnet_naming_symbols.private_static_fields_override_symbols.applicable_accessibilities = local,private
+dotnet_naming_symbols.private_static_fields_override_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_override_symbols.required_modifiers = const,static
 dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
+dotnet_naming_symbols.private_static_fields_symbols_1.applicable_accessibilities = local,private
+dotnet_naming_symbols.private_static_fields_symbols_1.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_symbols_1.required_modifiers = static
+dotnet_naming_symbols.private_static_fields_symbols_1.resharper_applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_symbols_1.resharper_required_modifiers = static
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
@@ -539,7 +574,6 @@ dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities =
 dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
 dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
 file_header_template = 
 
 # ReSharper properties
@@ -551,31 +585,40 @@ resharper_align_multiline_array_and_object_initializer = false
 resharper_align_multiline_array_initializer = true
 resharper_align_multiline_binary_expressions_chain = true
 resharper_align_multiline_binary_patterns = false
+resharper_align_multiline_calls_chain = true
 resharper_align_multiline_comments = true
 resharper_align_multiline_expression = true
 resharper_align_multiline_extends_list = false
 resharper_align_multiline_for_stmt = false
 resharper_align_multiline_implements_list = true
 resharper_align_multiline_list_pattern = false
 resharper_align_multiline_parameter = true
+resharper_align_multiline_property_pattern = true
 resharper_align_multiline_statement_conditions = true
 resharper_align_multiline_switch_expression = false
 resharper_align_multline_type_parameter_constrains = false
 resharper_align_multline_type_parameter_list = false
+resharper_align_tuple_components = true
 resharper_allow_alias = true
 resharper_allow_comment_after_lbrace = false
 resharper_allow_far_alignment = false
 resharper_always_use_end_of_line_brace_style = false
 resharper_apply_auto_detected_rules = true
 resharper_apply_on_completion = false
 resharper_arguments_anonymous_function = positional
+resharper_arguments_literal = named
+resharper_arguments_named = named
+resharper_arguments_other = named
+resharper_arguments_skip_single = true
+resharper_arguments_string_literal = named
 resharper_attribute_style = do_not_touch
 resharper_autodetect_indent_settings = false
 resharper_blank_lines_after_block_statements = 1
 resharper_blank_lines_after_case = 0
 resharper_blank_lines_after_control_transfer_statements = 0
 resharper_blank_lines_after_file_scoped_namespace_directive = 1
 resharper_blank_lines_after_imports = 1
+resharper_blank_lines_after_multiline_statements = 1
 resharper_blank_lines_after_options = 1
 resharper_blank_lines_after_start_comment = 1
 resharper_blank_lines_after_using_list = 1
@@ -620,13 +663,15 @@ resharper_braces_for_using = required
 resharper_braces_for_while = not_required
 resharper_braces_redundant = true
 resharper_builtin_type_apply_to_native_integer = false
+resharper_can_use_global_alias = false
 resharper_configure_await_analysis_mode = disabled
 resharper_continuous_indent_multiplier = 1
-resharper_csharp_align_multiline_argument = false
+resharper_csharp_align_multiline_argument = true
 resharper_csharp_align_multiline_expression = false
-resharper_csharp_align_multiline_parameter = false
+resharper_csharp_align_multiline_parameter = true
 resharper_csharp_align_multiple_declaration = false
 resharper_csharp_keep_nontrivial_alias = false
+resharper_csharp_max_line_length = 150
 resharper_csharp_naming_rule.constants = AaBb
 resharper_csharp_naming_rule.enum_member = AaBb
 resharper_csharp_naming_rule.local_constants = aaBb
@@ -638,7 +683,10 @@ resharper_csharp_naming_rule.private_static_readonly = _ + aaBb
 resharper_csharp_naming_rule.static_readonly = AaBb
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_space_after_unary_operator = false
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_before_binary_opsign = true
 resharper_csharp_wrap_lines = true
+resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_default_exception_variable_name = e
 resharper_default_private_modifier = explicit
 resharper_default_value_when_type_evident = default_literal
@@ -653,7 +701,7 @@ resharper_disable_line_break_removal = false
 resharper_disable_space_changes = false
 resharper_empty_block_style = multiline
 resharper_enable_wrapping = false
-resharper_enforce_line_ending_style = false
+resharper_enforce_line_ending_style = true
 resharper_event_handler_pattern_long = $object$On$event$
 resharper_event_handler_pattern_short = On$event$
 resharper_extra_spaces = remove_all
@@ -666,6 +714,7 @@ resharper_formatter_on_tag =
 resharper_formatter_tags_accept_regexp = false
 resharper_formatter_tags_enabled = false
 resharper_format_leading_spaces_decl = false
+resharper_for_built_in_types = use_var_when_evident
 resharper_html_attribute_indent = align_by_first_attribute
 resharper_html_linebreak_before_elements = body,div,p,form,h1,h2,h3
 resharper_html_max_blank_lines_between_tags = 2
@@ -699,6 +748,7 @@ resharper_indent_text = OneIndent
 resharper_indent_typearg_angles = inside
 resharper_indent_typeparam_angles = inside
 resharper_indent_type_constraints = true
+resharper_instance_members_qualify_declared_in = base_class
 resharper_int_align = false
 resharper_int_align_fix_in_adjacent = true
 resharper_keep_blank_lines_in_code = 2
@@ -725,6 +775,7 @@ resharper_linebreaks_inside_tags_for_multiline_elements = true
 resharper_linebreak_before_all_elements = false
 resharper_linebreak_before_multiline_elements = true
 resharper_linebreak_before_singleline_elements = false
+resharper_local_function_body = expression_body
 resharper_max_array_initializer_elements_on_line = 10000
 resharper_max_attribute_length_for_same_line = 38
 resharper_max_enum_members_on_line = 3
@@ -748,6 +799,7 @@ resharper_outdent_commas = false
 resharper_outdent_dots = false
 resharper_outdent_statement_labels = false
 resharper_outdent_ternary_ops = false
+resharper_parentheses_non_obvious_operations = none, bitwise_and, bitwise_exclusive_or, bitwise_inclusive_or, bitwise
 resharper_parentheses_redundancy_style = remove_if_not_clarifies_precedence
 resharper_parentheses_same_type_operations = false
 resharper_pi_attributes_indent = align_by_first_attribute
@@ -792,6 +844,7 @@ resharper_resx_space_before_self_closing = false
 resharper_resx_wrap_lines = false
 resharper_resx_wrap_tags_and_pi = false
 resharper_resx_wrap_text = false
+resharper_show_autodetect_configure_formatting_tip = false
 resharper_sort_attributes = false
 resharper_sort_class_selectors = false
 resharper_sort_usings = true
@@ -885,8 +938,9 @@ resharper_use_continuous_indent_inside_parens = true
 resharper_use_heuristics_for_body_style = true
 resharper_use_indents_from_main_language_in_file = true
 resharper_use_indent_from_previous_element = true
-resharper_use_indent_from_vs = true
+resharper_use_indent_from_vs = false
 resharper_use_old_engine = false
+resharper_use_roslyn_logic_for_evident_types = true
 resharper_vb_align_multiple_declaration = true
 resharper_vb_max_line_length = 120
 resharper_vb_place_field_attribute_on_same_line = true
@@ -901,9 +955,11 @@ resharper_vb_wrap_lines = true
 resharper_wrap_after_declaration_lpar = false
 resharper_wrap_after_dot_in_method_calls = false
 resharper_wrap_after_invocation_lpar = false
+resharper_wrap_after_primary_constructor_declaration_lpar = false
 resharper_wrap_after_property_in_chained_method_calls = false
 resharper_wrap_around_elements = true
 resharper_wrap_array_initializer_style = wrap_if_long
+resharper_wrap_before_arrow_with_expressions = true
 resharper_wrap_before_binary_pattern_op = true
 resharper_wrap_before_comma = false
 resharper_wrap_before_declaration_lpar = false
@@ -928,7 +984,9 @@ resharper_wrap_for_stmt_header_style = chop_if_long
 resharper_wrap_list_pattern = wrap_if_long
 resharper_wrap_multiple_declaration_style = chop_if_long
 resharper_wrap_multiple_type_parameter_constraints_style = chop_if_long
+resharper_wrap_object_and_collection_initializer_style = chop_always
 resharper_wrap_parameters_style = wrap_if_long
+resharper_wrap_primary_constructor_parameters_style = chop_always
 resharper_wrap_property_pattern = chop_if_long
 resharper_wrap_switch_expression = chop_always
 resharper_wrap_ternary_expr_style = chop_if_long
@@ -979,14 +1037,16 @@ resharper_arrange_default_value_when_type_evident_highlighting = suggestion
 resharper_arrange_default_value_when_type_not_evident_highlighting = hint
 resharper_arrange_local_function_body_highlighting = none
 resharper_arrange_namespace_body_highlighting = hint
+resharper_arrange_null_checking_pattern_highlighting = none
 resharper_arrange_object_creation_when_type_evident_highlighting = suggestion
-resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_object_creation_when_type_not_evident_highlighting = suggestion
+resharper_arrange_redundant_parentheses_highlighting = none
 resharper_arrange_static_member_qualifier_highlighting = hint
-resharper_arrange_this_qualifier_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = suggestion
 resharper_arrange_trailing_comma_in_multiline_lists_highlighting = hint
 resharper_arrange_trailing_comma_in_singleline_lists_highlighting = hint
-resharper_arrange_type_member_modifiers_highlighting = hint
-resharper_arrange_type_modifiers_highlighting = hint
+resharper_arrange_type_member_modifiers_highlighting = none
+resharper_arrange_type_modifiers_highlighting = none
 resharper_arrange_var_keywords_in_deconstructing_declaration_highlighting = suggestion
 resharper_asp_content_placeholder_not_resolved_highlighting = error
 resharper_asp_custom_page_parser_filter_type_highlighting = warning
@@ -1044,8 +1104,8 @@ resharper_base_object_equals_is_object_equals_highlighting = warning
 resharper_base_object_get_hash_code_call_in_get_hash_code_highlighting = warning
 resharper_bitwise_operator_on_enum_without_flags_highlighting = warning
 resharper_blazor_editor_required_highlighting = warning
-resharper_built_in_type_reference_style_for_member_access_highlighting = hint
-resharper_built_in_type_reference_style_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = suggestion
+resharper_built_in_type_reference_style_highlighting = suggestion
 resharper_by_ref_argument_is_volatile_field_highlighting = warning
 resharper_cannot_apply_equality_operator_to_type_highlighting = warning
 resharper_can_simplify_dictionary_lookup_with_try_add_highlighting = suggestion
@@ -1114,6 +1174,7 @@ resharper_convert_to_using_declaration_highlighting = suggestion
 resharper_convert_to_vb_auto_property_highlighting = suggestion
 resharper_convert_to_vb_auto_property_when_possible_highlighting = hint
 resharper_convert_to_vb_auto_property_with_private_setter_highlighting = hint
+resharper_convert_type_check_pattern_to_null_check_highlighting = none
 resharper_convert_type_check_to_null_check_highlighting = warning
 resharper_co_variant_array_conversion_highlighting = warning
 resharper_default_value_attribute_for_optional_parameter_highlighting = warning
@@ -1227,6 +1288,7 @@ resharper_join_null_check_with_usage_highlighting = suggestion
 resharper_lambda_expression_can_be_made_static_highlighting = none
 resharper_lambda_expression_must_be_static_highlighting = suggestion
 resharper_lambda_should_not_capture_context_highlighting = warning
+resharper_localizable_element_highlighting = hint
 resharper_local_function_can_be_made_static_highlighting = none
 resharper_local_function_hides_method_highlighting = warning
 resharper_local_variable_hides_member_highlighting = warning
@@ -1256,6 +1318,7 @@ resharper_merge_cast_with_type_check_highlighting = suggestion
 resharper_merge_conditional_expression_highlighting = suggestion
 resharper_merge_into_logical_pattern_highlighting = none
 resharper_merge_into_negated_pattern_highlighting = none
+resharper_merge_into_pattern_highlighting = none
 resharper_merge_nested_property_patterns_highlighting = suggestion
 resharper_merge_sequential_checks_highlighting = hint
 resharper_method_has_async_overload_highlighting = suggestion
@@ -1431,7 +1494,7 @@ resharper_redundant_attribute_parentheses_highlighting = hint
 resharper_redundant_attribute_suffix_highlighting = warning
 resharper_redundant_attribute_usage_property_highlighting = suggestion
 resharper_redundant_base_constructor_call_highlighting = warning
-resharper_redundant_base_qualifier_highlighting = warning
+resharper_redundant_base_qualifier_highlighting = suggestion
 resharper_redundant_blank_lines_highlighting = none
 resharper_redundant_bool_compare_highlighting = warning
 resharper_redundant_caller_argument_expression_default_value_highlighting = warning
@@ -1467,6 +1530,7 @@ resharper_redundant_if_statement_then_keyword_highlighting = none
 resharper_redundant_immediate_delegate_invocation_highlighting = suggestion
 resharper_redundant_is_before_relational_pattern_highlighting = suggestion
 resharper_redundant_iterator_keyword_highlighting = warning
+resharper_redundant_jump_statement_highlighting = none
 resharper_redundant_lambda_parameter_type_highlighting = warning
 resharper_redundant_lambda_signature_parentheses_highlighting = hint
 resharper_redundant_linebreak_highlighting = none
@@ -1947,7 +2011,7 @@ resharper_xunit_xunit_test_with_console_output_highlighting = warning
 resharper_zero_index_from_end_highlighting = warning
 
 # Standard properties
-end_of_line = native
+end_of_line = crlf
 csharp_prefer_braces = true:silent
 
 [*.{asax,ascx,aspx,axaml,cs,cshtml,htm,html,master,paml,razor,skin,vb,xaml,xamlx,xoml}]
@@ -1992,3 +2056,8 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
 indent_style = space
 indent_size = 2
 tab_width = 2
+
+[*.{appxmanifest,asax,ascx,aspx,axaml,axml,build,config,cs,cshtml,csproj,dbml,discomap,dtd,htm,html,jsproj,lsproj,master,njsproj,nuspec,paml,proj,props,razor,resw,resx,skin,StyleCop,targets,tasks,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
+indent_style = space
+indent_size = 4
+tab_width = 4