From 5f566152d6140cf64e79b9fe10435ae378f88cce Mon Sep 17 00:00:00 2001 From: erri120 Date: Wed, 21 Feb 2024 09:22:19 +0000 Subject: [PATCH] Update submodules --- .editorconfig | 87 ++++++++++++++------------------------------------- .globalconfig | 20 ++++++++++++ docs/Nexus | 2 +- extern/meta | 2 +- 4 files changed, 45 insertions(+), 66 deletions(-) create mode 100644 .globalconfig diff --git a/.editorconfig b/.editorconfig index f0d7709..272fc95 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,76 +2,35 @@ root = true [*] charset = utf-8 +end_of_line = lf insert_final_newline = true -trim_trailing_whitespace = true -max_line_length = 120 - -# Microsoft .NET properties -csharp_new_line_before_members_in_object_initializers = false -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 = true:warning -csharp_style_var_for_built_in_types = true:warning -csharp_style_var_when_type_is_apparent = true:warning -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_style.lower_camel_case_style.capitalization = camel_case -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_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:warning -dotnet_style_qualification_for_field = false:warning -dotnet_style_qualification_for_method = false:warning -dotnet_style_qualification_for_property = false:warning -dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion - -# ReSharper properties -resharper_apply_auto_detected_rules = false -resharper_autodetect_indent_settings = true -resharper_csharp_empty_block_style = together_same_line -resharper_csharp_stick_comment = false -resharper_outdent_statement_labels = true -resharper_show_autodetect_configure_formatting_tip = false -resharper_use_indent_from_vs = false -resharper_wrap_lines = true - -# ReSharper inspection severities -resharper_arrange_redundant_parentheses_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 - -[*.cs] -indent_size = 4 indent_style = space -tab_width = 4 - -# CS4014: Task not awaited -dotnet_diagnostic.cs4014.severity = error - -# CS8509: Missing switch case for named enum value -dotnet_diagnostic.CS8509.severity = error - -# CS824: Missing switch case for unnamed enum value -dotnet_diagnostic.CS8524.severity = none +indent_size = 4 -# Enums should not have duplicate values -dotnet_diagnostic.CA1069.severity = error +[{*.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 [{*.yaml,*.yml}] indent_style = space indent_size = 2 -[*.csproj] +[{*.bash,*.sh,*.zsh}] +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 = 4 +tab_width = 4 + +# Verify settings +[*.{received,verified}.{txt,xml,json}] +charset = "utf-8-bom" +end_of_line = lf +indent_size = +indent_style = +insert_final_newline = false +tab_width = +trim_trailing_whitespace = false + diff --git a/.globalconfig b/.globalconfig new file mode 100644 index 0000000..acb99d7 --- /dev/null +++ b/.globalconfig @@ -0,0 +1,20 @@ +is_global = true + +# CS4014: Task not awaited +dotnet_diagnostic.cs4014.severity = error + +# CS8509: Missing switch case for named enum value +dotnet_diagnostic.CS8509.severity = error + +# CS824: Missing switch case for unnamed enum value +dotnet_diagnostic.CS8524.severity = none + +# Enums should not have duplicate values +dotnet_diagnostic.CA1069.severity = error + +# Non-constant fields should not be visible +dotnet_diagnostic.CA2211.severity = error + +# Don't call Enumerable.Cast or Enumerable.OfType with incompatible types +dotnet_diagnostic.CA2021.severity = error + diff --git a/docs/Nexus b/docs/Nexus index aae107b..fe4e8b1 160000 --- a/docs/Nexus +++ b/docs/Nexus @@ -1 +1 @@ -Subproject commit aae107b329f272bd40bbecddc37a404dd9491ccb +Subproject commit fe4e8b1b26d2c2917b404b0b091bfa31f135e337 diff --git a/extern/meta b/extern/meta index 3354015..23e30f4 160000 --- a/extern/meta +++ b/extern/meta @@ -1 +1 @@ -Subproject commit 3354015de7a7f2cffceebde24bdf3d903442d0fc +Subproject commit 23e30f4ca6b8ec2a2ec29d25ddcfab16bcd44d96