From d4247bc1debf44e3bc39d9792db1fff47c1be9ce Mon Sep 17 00:00:00 2001 From: Russell Smith Date: Tue, 16 May 2023 20:00:46 +1000 Subject: [PATCH] Normalize line endings to lf. lf is used on linux and Mac. Most of the code is lf already, with items of crlf mixed in. This will change future checkouts to be lf only. --- .editorconfig | 15 ++++++++++++ .gitattributes | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..a666e7d6a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +root = true + + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true + +[*.aspx.designer.cs] +trim_trailing_whitespace = false +end_of_line = crlf + +[*.js] +indent_size = 2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..176d6e231 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,64 @@ +# Using recommended .gitattributes from +# https://github.com/alexkaratarakis/gitattributes/blob/master/VisualStudio.gitattributes + +################################### +# Set default diff settings +################################### +*.cs text diff=csharp +*.cshtml text diff=html +*.csx text diff=csharp + +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just comment the entries below and +# uncomment the group further below +############################################################################### + +*.sln text eol=lf +*.csproj text eol=lf +*.vbproj text eol=lf +*.vcxproj text eol=lf +*.vcproj text eol=lf +*.dbproj text eol=lf +*.fsproj text eol=lf +*.lsproj text eol=lf +*.wixproj text eol=lf +*.modelproj text eol=lf +*.sqlproj text eol=lf +*.wmaproj text eol=lf + +*.xproj text eol=lf +*.props text eol=lf +*.filters text eol=lf +*.vcxitems text eol=lf + + +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +#*.xproj merge=binary +#*.props merge=binary +#*.filters merge=binary +#*.vcxitems merge=binary +