From c41761b7fc84c8fc68e3c0a5e2e271e41047ce96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?= Date: Thu, 12 Jun 2025 11:38:09 -0400 Subject: [PATCH] chore: sync conventions closes #4 closes #5 --- .../.editorconfig | 18 +++++++++++------- src/global.json | 6 ++++++ src/nullinside-api | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 src/global.json diff --git a/src/[ApplicationNameUpperCamelCase]/.editorconfig b/src/[ApplicationNameUpperCamelCase]/.editorconfig index 5ef8a11..c50c605 100644 --- a/src/[ApplicationNameUpperCamelCase]/.editorconfig +++ b/src/[ApplicationNameUpperCamelCase]/.editorconfig @@ -4,6 +4,9 @@ root = true [*] indent_style = space +# ReSharper properties +resharper_csharp_wrap_lines = false + # Xml files [*.xml] indent_size = 2 @@ -22,7 +25,6 @@ end_of_line = lf insert_final_newline = false #### .NET Coding Conventions #### -[*.{cs,vb}] # Organize usings dotnet_separate_import_directive_groups = true @@ -75,7 +77,6 @@ dotnet_code_quality_unused_parameters = all:suggestion dotnet_remove_unnecessary_suppression_exclusions = none #### C# Coding Conventions #### -[*.cs] # var preferences csharp_style_var_elsewhere = false:silent @@ -172,7 +173,6 @@ csharp_preserve_single_line_blocks = true csharp_preserve_single_line_statements = true #### Naming styles #### -[*.{cs,vb}] # Naming rules @@ -226,19 +226,19 @@ dotnet_naming_rule.private_static_fields_should_be_s_camelcase.style = s_camelca dotnet_naming_rule.public_constant_fields_should_be_pascalcase.severity = suggestion dotnet_naming_rule.public_constant_fields_should_be_pascalcase.symbols = public_constant_fields -dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = pascalcase +dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = all_upper dotnet_naming_rule.private_constant_fields_should_be_pascalcase.severity = suggestion dotnet_naming_rule.private_constant_fields_should_be_pascalcase.symbols = private_constant_fields -dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = pascalcase +dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = all_upper dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.severity = suggestion dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.symbols = public_static_readonly_fields -dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = pascalcase +dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = all_upper dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.severity = suggestion dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.symbols = private_static_readonly_fields -dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = pascalcase +dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = all_upper dotnet_naming_rule.enums_should_be_pascalcase.severity = suggestion dotnet_naming_rule.enums_should_be_pascalcase.symbols = enums @@ -362,3 +362,7 @@ dotnet_naming_style.s_camelcase.required_suffix = dotnet_naming_style.s_camelcase.word_separator = dotnet_naming_style.s_camelcase.capitalization = camel_case +dotnet_naming_style.all_upper.required_prefix = +dotnet_naming_style.all_upper.required_suffix = +dotnet_naming_style.all_upper.word_separator = _ +dotnet_naming_style.all_upper.capitalization = all_upper diff --git a/src/global.json b/src/global.json new file mode 100644 index 0000000..eafb435 --- /dev/null +++ b/src/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "rollForward": "latestMajor", + "allowPrerelease": false + } +} \ No newline at end of file diff --git a/src/nullinside-api b/src/nullinside-api index 4f5a582..2ce470f 160000 --- a/src/nullinside-api +++ b/src/nullinside-api @@ -1 +1 @@ -Subproject commit 4f5a58228a7e7e1670c02ffb438c747a711653c4 +Subproject commit 2ce470f89cd6704200870e354802677b978afccf