From b1e594a63e5099aa3ad88dd47e24251599c1573b Mon Sep 17 00:00:00 2001 From: duckdoom4 <60387522+duckdoom4@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:45:38 +0200 Subject: [PATCH] Force consistent line endings --- .editorconfig | 25 +------------------------ .gitattributes | 14 +++++++------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8934fb69..36b0a88c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,27 +7,14 @@ indent_style = space indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true - -# Solution Files -[*.sln] -indent_style = space -indent_size = 4 -insert_final_newline = true -trim_trailing_whitespace = true +end_of_line = lf # XML Project Files [*.csproj] -indent_style = space indent_size = 2 # Code Files [*.cs] -insert_final_newline = true -trim_trailing_whitespace = true -indent_style = space -indent_size = 4 -tab_width = 4 -end_of_line = crlf csharp_prefer_braces = when_multiline:warning dotnet_diagnostic.IDE0047.severity = none dotnet_diagnostic.IDE0048.severity = none @@ -51,14 +38,6 @@ csharp_style_expression_bodied_accessors = true:silent csharp_style_expression_bodied_lambdas = true:silent csharp_style_expression_bodied_local_functions = false:silent -[*.{cs,vb}] -#### Naming styles #### - -# Naming styles - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.capitalization = pascal_case - # Generated Code [**/obj/**.cs] generated_code = true @@ -119,8 +98,6 @@ dotnet_naming_style.pascal_case.required_suffix = dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case dotnet_style_operator_placement_when_wrapping = beginning_of_line -tab_width = 4 -end_of_line = lf dotnet_style_coalesce_expression = true:suggestion dotnet_style_null_propagation = true:suggestion dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion diff --git a/.gitattributes b/.gitattributes index bdb0cabc..482d32ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,17 @@ # Auto detect text files and perform LF normalization -* text=auto +* text=auto eol=lf # Custom for Visual Studio -*.cs diff=csharp +*.cs diff=csharp # Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain +*.doc diff=astextplain +*.DOC diff=astextplain *.docx diff=astextplain *.DOCX diff=astextplain *.dot diff=astextplain *.DOT diff=astextplain *.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain