forked from cdaragorn/Ui-Info-Suite
-
Notifications
You must be signed in to change notification settings - Fork 290
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #369 from drewhoener/djh/1.6-patch-upgrade
1.6 patch upgrade
- Loading branch information
Showing
48 changed files
with
7,043 additions
and
5,951 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| [*] | ||
| charset = utf-8-bom | ||
| end_of_line = crlf | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| # Microsoft .NET properties | ||
| csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion | ||
| csharp_style_prefer_utf8_string_literals = true:suggestion | ||
| csharp_style_var_elsewhere = false:none | ||
| csharp_style_var_for_built_in_types = false:suggestion | ||
| dotnet_naming_rule.property_rule.import_to_resharper = as_predefined | ||
| dotnet_naming_rule.property_rule.resharper_style = AaBb, Show + AaBb | ||
| dotnet_naming_rule.property_rule.severity = warning | ||
| dotnet_naming_rule.property_rule.style = upper_camel_case_style | ||
| dotnet_naming_rule.property_rule.symbols = property_symbols | ||
| dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True | ||
| dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field | ||
| dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef | ||
| dotnet_naming_rule.unity_serialized_field_rule.severity = warning | ||
| dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style | ||
| dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.import_to_resharper = True | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.resharper_description = Unity serialized field | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.severity = warning | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.style = lower_camel_case_style | ||
| dotnet_naming_rule.unity_serialized_field_rule_1.symbols = unity_serialized_field_symbols_1 | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.import_to_resharper = True | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.resharper_description = Unity serialized field | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.severity = warning | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.style = lower_camel_case_style | ||
| dotnet_naming_rule.unity_serialized_field_rule_2.symbols = unity_serialized_field_symbols_2 | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.import_to_resharper = True | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.resharper_description = Unity serialized field | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.severity = warning | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.style = lower_camel_case_style | ||
| dotnet_naming_rule.unity_serialized_field_rule_3.symbols = unity_serialized_field_symbols_3 | ||
| dotnet_naming_style.lower_camel_case_style.capitalization = camel_case | ||
| dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case | ||
| dotnet_naming_symbols.property_symbols.applicable_accessibilities = * | ||
| dotnet_naming_symbols.property_symbols.applicable_kinds = property | ||
| dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = * | ||
| dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds = | ||
| dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field | ||
| dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_accessibilities = * | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_kinds = | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_applicable_kinds = unity_serialised_field | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_required_modifiers = instance | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_2.applicable_accessibilities = * | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_2.applicable_kinds = | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_2.resharper_applicable_kinds = unity_serialised_field | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_2.resharper_required_modifiers = instance | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_3.applicable_accessibilities = * | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_3.applicable_kinds = | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_3.resharper_applicable_kinds = unity_serialised_field | ||
| dotnet_naming_symbols.unity_serialized_field_symbols_3.resharper_required_modifiers = instance | ||
| dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none | ||
| dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none | ||
| dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none | ||
| dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion | ||
| dotnet_style_predefined_type_for_member_access = true:suggestion | ||
| dotnet_style_qualification_for_event = false:suggestion | ||
| dotnet_style_qualification_for_field = false:suggestion | ||
| dotnet_style_qualification_for_method = false:suggestion | ||
| dotnet_style_qualification_for_property = false:suggestion | ||
| dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion | ||
|
|
||
| # ReSharper properties | ||
| resharper_align_linq_query = true | ||
| resharper_align_multiline_argument = true | ||
| resharper_align_multiline_calls_chain = true | ||
| resharper_align_multiline_extends_list = true | ||
| resharper_align_multiline_parameter = true | ||
| resharper_align_multiple_declaration = true | ||
| resharper_align_multline_type_parameter_constrains = true | ||
| resharper_align_multline_type_parameter_list = true | ||
| resharper_align_tuple_components = true | ||
| resharper_autodetect_indent_settings = true | ||
| resharper_braces_for_for = required | ||
| resharper_braces_for_foreach = required | ||
| resharper_braces_for_ifelse = required | ||
| resharper_braces_for_while = required | ||
| resharper_csharp_blank_lines_inside_region = 0 | ||
| resharper_csharp_empty_block_style = together_same_line | ||
| resharper_csharp_int_align_comments = true | ||
| resharper_csharp_wrap_after_declaration_lpar = true | ||
| resharper_csharp_wrap_after_invocation_lpar = true | ||
| resharper_csharp_wrap_arguments_style = chop_if_long | ||
| resharper_csharp_wrap_before_declaration_rpar = true | ||
| resharper_csharp_wrap_before_invocation_rpar = true | ||
| resharper_csharp_wrap_parameters_style = chop_if_long | ||
| resharper_enforce_line_ending_style = true | ||
| resharper_formatter_off_tag = @formatter:off | ||
| resharper_formatter_on_tag = @formatter:on | ||
| resharper_formatter_tags_enabled = true | ||
| resharper_for_built_in_types = use_var_when_evident | ||
| resharper_indent_preprocessor_region = outdent | ||
| resharper_keep_existing_embedded_arrangement = false | ||
| resharper_keep_existing_expr_member_arrangement = false | ||
| resharper_keep_existing_initializer_arrangement = false | ||
| resharper_keep_existing_linebreaks = false | ||
| resharper_outdent_statement_labels = true | ||
| resharper_place_simple_embedded_statement_on_same_line = false | ||
| resharper_use_indent_from_vs = false | ||
| resharper_wrap_array_initializer_style = chop_if_long | ||
| resharper_wrap_before_first_method_call = false | ||
| resharper_wrap_before_primary_constructor_declaration_rpar = true | ||
| resharper_wrap_chained_binary_expressions = chop_if_long | ||
| resharper_wrap_chained_binary_patterns = chop_if_long | ||
| resharper_wrap_chained_method_calls = chop_if_long | ||
| resharper_wrap_list_pattern = chop_if_long | ||
|
|
||
| # ReSharper inspection severities | ||
| resharper_arrange_redundant_parentheses_highlighting = hint | ||
| resharper_arrange_this_qualifier_highlighting = hint | ||
| resharper_arrange_type_member_modifiers_highlighting = hint | ||
| resharper_arrange_type_modifiers_highlighting = hint | ||
| resharper_built_in_type_reference_style_for_member_access_highlighting = hint | ||
| resharper_built_in_type_reference_style_highlighting = hint | ||
| resharper_redundant_base_qualifier_highlighting = warning | ||
| resharper_suggest_var_or_type_built_in_types_highlighting = hint | ||
| resharper_suggest_var_or_type_elsewhere_highlighting = hint | ||
| resharper_suggest_var_or_type_simple_types_highlighting = hint | ||
| resharper_web_config_module_not_resolved_highlighting = warning | ||
| resharper_web_config_type_not_resolved_highlighting = warning | ||
| resharper_web_config_wrong_module_highlighting = warning | ||
|
|
||
| [{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}] | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| [*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}] | ||
| indent_style = space | ||
| indent_size = 2 | ||
| tab_width = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <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"> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_TUPLE_COMPONENTS/@EntryValue">True</s:Boolean> | ||
| <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_INSIDE_REGION/@EntryValue">0</s:Int64> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">TOGETHER_SAME_LINE</s:String> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_PREPROCESSOR_REGION/@EntryValue">OUTDENT</s:String> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INT_ALIGN_COMMENTS/@EntryValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_RPAR/@EntryValue">True</s:Boolean> | ||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIST_PATTERN/@EntryValue">CHOP_IF_LONG</s:String> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean> | ||
| <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.