From 869de7acda9f44122615d1c08c7540b3c55b2ecb Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 27 Jul 2023 12:15:03 -0700 Subject: [PATCH 1/3] Miscellaneous updates. --- .editorconfig | 101 ++++++++++++++++++++++++++++++- Directory.Build.props | 6 +- dotnet-tools.json | 18 ------ tools/Build/Build.csproj | 2 +- tools/XmlDocGen/XmlDocGen.csproj | 2 +- 5 files changed, 104 insertions(+), 25 deletions(-) delete mode 100644 dotnet-tools.json diff --git a/.editorconfig b/.editorconfig index da826a9..131b58e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,8 +21,9 @@ resharper_string_literal_typo_highlighting = none insert_final_newline = false [*.cs] -indent_size = 4 +indent_size = tab indent_style = tab +tab_width = 4 csharp_indent_block_contents = true csharp_indent_braces = false csharp_indent_case_contents = true @@ -75,22 +76,30 @@ csharp_style_expression_bodied_local_functions = true : suggestion csharp_style_expression_bodied_methods = true : suggestion csharp_style_expression_bodied_operators = true : suggestion csharp_style_expression_bodied_properties = true : suggestion +csharp_style_implicit_object_creation_when_type_is_apparent = true : suggestion csharp_style_inlined_variable_declaration = true : suggestion csharp_style_namespace_declarations = file_scoped : suggestion -csharp_style_pattern_local_over_anonymous_function = true : suggestion csharp_style_pattern_matching_over_as_with_null_check = true : suggestion csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion +csharp_style_prefer_extended_property_pattern = true : suggestion csharp_style_prefer_index_operator = true : suggestion +csharp_style_prefer_local_over_anonymous_function = true : suggestion +csharp_style_prefer_not_pattern = true : suggestion +csharp_style_prefer_null_check_over_type_check = true : suggestion +csharp_style_prefer_pattern_matching = true : suggestion csharp_style_prefer_range_operator = true : suggestion csharp_style_prefer_switch_expression = true : suggestion +csharp_style_prefer_tuple_swap = true : warning csharp_style_throw_expression = true : suggestion -csharp_style_unused_value_assignment_preference = discard_variable : suggestion +csharp_style_unused_value_assignment_preference = discard_variable : warning csharp_style_unused_value_expression_statement_preference = discard_variable : none csharp_style_var_elsewhere = true : suggestion csharp_style_var_for_built_in_types = true : suggestion csharp_style_var_when_type_is_apparent = true : suggestion csharp_using_directive_placement = outside_namespace : warning +dotnet_analyzer_diagnostic.severity = warning dotnet_code_quality_unused_parameters = all : suggestion +dotnet_diagnostic.CA1014.severity = none dotnet_diagnostic.CA1030.severity = none dotnet_diagnostic.CA1031.severity = suggestion dotnet_diagnostic.CA1032.severity = suggestion @@ -101,6 +110,8 @@ dotnet_diagnostic.CA1062.severity = suggestion dotnet_diagnostic.CA1063.severity = none dotnet_diagnostic.CA1303.severity = none dotnet_diagnostic.CA1308.severity = suggestion +dotnet_diagnostic.CA1309.severity = suggestion +dotnet_diagnostic.CA1508.severity = suggestion dotnet_diagnostic.CA1707.severity = none dotnet_diagnostic.CA1716.severity = none dotnet_diagnostic.CA1720.severity = suggestion @@ -110,10 +121,89 @@ dotnet_diagnostic.CA1816.severity = none dotnet_diagnostic.CA1819.severity = suggestion dotnet_diagnostic.CA1822.severity = suggestion dotnet_diagnostic.CA1826.severity = suggestion +dotnet_diagnostic.CA1848.severity = suggestion dotnet_diagnostic.CA2000.severity = none dotnet_diagnostic.CA2227.severity = none dotnet_diagnostic.CA2234.severity = none dotnet_diagnostic.CA2237.severity = none +dotnet_diagnostic.CA2254.severity = none +dotnet_diagnostic.CA5351.severity = none +dotnet_diagnostic.IDE0001.severity = warning +dotnet_diagnostic.IDE0002.severity = warning +dotnet_diagnostic.IDE0003.severity = warning +dotnet_diagnostic.IDE0004.severity = warning +dotnet_diagnostic.IDE0005.severity = warning +dotnet_diagnostic.IDE0007.severity = suggestion +dotnet_diagnostic.IDE0008.severity = suggestion +dotnet_diagnostic.IDE0009.severity = warning +dotnet_diagnostic.IDE0010.severity = suggestion +dotnet_diagnostic.IDE0011.severity = suggestion +dotnet_diagnostic.IDE0016.severity = suggestion +dotnet_diagnostic.IDE0017.severity = suggestion +dotnet_diagnostic.IDE0018.severity = suggestion +dotnet_diagnostic.IDE0019.severity = suggestion +dotnet_diagnostic.IDE0020.severity = suggestion +dotnet_diagnostic.IDE0021.severity = suggestion +dotnet_diagnostic.IDE0022.severity = suggestion +dotnet_diagnostic.IDE0023.severity = suggestion +dotnet_diagnostic.IDE0024.severity = suggestion +dotnet_diagnostic.IDE0025.severity = suggestion +dotnet_diagnostic.IDE0026.severity = suggestion +dotnet_diagnostic.IDE0027.severity = suggestion +dotnet_diagnostic.IDE0028.severity = suggestion +dotnet_diagnostic.IDE0029.severity = warning +dotnet_diagnostic.IDE0030.severity = warning +dotnet_diagnostic.IDE0031.severity = suggestion +dotnet_diagnostic.IDE0032.severity = suggestion +dotnet_diagnostic.IDE0033.severity = warning +dotnet_diagnostic.IDE0034.severity = suggestion +dotnet_diagnostic.IDE0035.severity = warning +dotnet_diagnostic.IDE0036.severity = warning +dotnet_diagnostic.IDE0037.severity = suggestion +dotnet_diagnostic.IDE0038.severity = suggestion +dotnet_diagnostic.IDE0039.severity = suggestion +dotnet_diagnostic.IDE0040.severity = warning +dotnet_diagnostic.IDE0041.severity = suggestion +dotnet_diagnostic.IDE0042.severity = suggestion +dotnet_diagnostic.IDE0044.severity = warning +dotnet_diagnostic.IDE0045.severity = suggestion +dotnet_diagnostic.IDE0046.severity = none +dotnet_diagnostic.IDE0047.severity = suggestion +dotnet_diagnostic.IDE0048.severity = suggestion +dotnet_diagnostic.IDE0049.severity = warning +dotnet_diagnostic.IDE0051.severity = warning +dotnet_diagnostic.IDE0052.severity = warning +dotnet_diagnostic.IDE0053.severity = suggestion +dotnet_diagnostic.IDE0054.severity = suggestion +dotnet_diagnostic.IDE0056.severity = suggestion +dotnet_diagnostic.IDE0057.severity = suggestion +dotnet_diagnostic.IDE0058.severity = none +dotnet_diagnostic.IDE0059.severity = warning +dotnet_diagnostic.IDE0060.severity = suggestion +dotnet_diagnostic.IDE0061.severity = suggestion +dotnet_diagnostic.IDE0062.severity = suggestion +dotnet_diagnostic.IDE0063.severity = suggestion +dotnet_diagnostic.IDE0065.severity = warning +dotnet_diagnostic.IDE0066.severity = suggestion +dotnet_diagnostic.IDE0070.severity = suggestion +dotnet_diagnostic.IDE0071.severity = suggestion +dotnet_diagnostic.IDE0072.severity = suggestion +dotnet_diagnostic.IDE0074.severity = suggestion +dotnet_diagnostic.IDE0075.severity = warning +dotnet_diagnostic.IDE0078.severity = suggestion +dotnet_diagnostic.IDE0080.severity = suggestion +dotnet_diagnostic.IDE0082.severity = warning +dotnet_diagnostic.IDE0083.severity = suggestion +dotnet_diagnostic.IDE0090.severity = suggestion +dotnet_diagnostic.IDE0100.severity = warning +dotnet_diagnostic.IDE0110.severity = warning +dotnet_diagnostic.IDE0130.severity = warning +dotnet_diagnostic.IDE0150.severity = suggestion +dotnet_diagnostic.IDE0160.severity = suggestion +dotnet_diagnostic.IDE0161.severity = suggestion +dotnet_diagnostic.IDE0170.severity = suggestion +dotnet_diagnostic.IDE0180.severity = warning +dotnet_diagnostic.IDE1005.severity = suggestion dotnet_diagnostic.SA0001.severity = none dotnet_diagnostic.SA1003.severity = none dotnet_diagnostic.SA1008.severity = none @@ -161,6 +251,8 @@ dotnet_diagnostic.SA1633.severity = none dotnet_diagnostic.SA1642.severity = none dotnet_diagnostic.SA1643.severity = none dotnet_diagnostic.SX1101.severity = warning +dotnet_diagnostic.SYSLIB1045.severity = suggestion +dotnet_diagnostic.SYSLIB1054.severity = none dotnet_naming_rule.local_functions_rule.severity = warning dotnet_naming_rule.local_functions_rule.style = upper_camel_case_style dotnet_naming_rule.local_functions_rule.symbols = local_functions_symbols @@ -201,6 +293,7 @@ dotnet_sort_system_directives_first = true dotnet_style_coalesce_expression = true : warning dotnet_style_collection_initializer = true : suggestion dotnet_style_explicit_tuple_names = true : warning +dotnet_style_namespace_match_folder = true : warning dotnet_style_null_propagation = true : suggestion dotnet_style_object_initializer = true : suggestion dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity : none @@ -216,6 +309,8 @@ dotnet_style_prefer_conditional_expression_over_return = true : none dotnet_style_prefer_inferred_anonymous_type_member_names = true : suggestion dotnet_style_prefer_inferred_tuple_names = true : suggestion dotnet_style_prefer_is_null_check_over_reference_equality_method = true : suggestion +dotnet_style_prefer_simplified_boolean_expressions = true : warning +dotnet_style_prefer_simplified_interpolation = true : suggestion dotnet_style_qualification_for_event = false : warning dotnet_style_qualification_for_field = false : warning dotnet_style_qualification_for_method = false : warning diff --git a/Directory.Build.props b/Directory.Build.props index 25f933d..36814a4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,6 +21,8 @@ true true AllEnabledByDefault + true + true false false @@ -31,9 +33,9 @@ - + - + diff --git a/dotnet-tools.json b/dotnet-tools.json deleted file mode 100644 index 155104a..0000000 --- a/dotnet-tools.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "dotnet-format": { - "version": "5.1.250801", - "commands": [ - "dotnet-format" - ] - }, - "jetbrains.resharper.globaltools": { - "version": "2022.3.1", - "commands": [ - "jb" - ] - } - } -} \ No newline at end of file diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index 0fbf7e9..3fda495 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -6,7 +6,7 @@ - + diff --git a/tools/XmlDocGen/XmlDocGen.csproj b/tools/XmlDocGen/XmlDocGen.csproj index d14c2ae..c09765c 100644 --- a/tools/XmlDocGen/XmlDocGen.csproj +++ b/tools/XmlDocGen/XmlDocGen.csproj @@ -9,7 +9,7 @@ - + From bd1e19d69940c8bef08ddb41462b341795fca3b1 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 27 Jul 2023 14:06:42 -0700 Subject: [PATCH 2/3] Use full path in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fc0b4e..fa50145 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ Repository description. [![Build](https://github.com/FacilityApi/RepoTemplate/workflows/Build/badge.svg)](https://github.com/FacilityApi/RepoTemplate/actions?query=workflow%3ABuild) -[Documentation](https://facilityapi.github.io/) | [Release Notes](ReleaseNotes.md) | [Contributing](CONTRIBUTING.md) +[Documentation](https://facilityapi.github.io/) | [Release Notes](https://github.com/FacilityApi/RepoTemplate/blob/master/ReleaseNotes.md) | [Contributing](https://github.com/FacilityApi/RepoTemplate/blob/master/CONTRIBUTING.md) From 5431511acdfa99801419ee39ccac9b1e9be7eddd Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 27 Jul 2023 14:30:18 -0700 Subject: [PATCH 3/3] Remove unneeded NoWarn warnings. --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 36814a4..84c833b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ enable true en-US - $(NoWarn);1591;1998;NU5105;CA1014;CA1508;CA1852 + $(NoWarn);1591;1998;NU5105 embedded FacilityApi RepoTemplate