diff --git a/.gitattributes b/.gitattributes index c910553..fcb61f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,6 @@ *.png binary .editorconfig text eol=lf working-tree-encoding=UTF-8 +editorconfig.txt text eol=lf working-tree-encoding=UTF-8 Shared.sln.DotSettings text eol=lf working-tree-encoding=UTF-8 + diff --git a/ProjectDefaults/ProjectDefaults.nuspec b/ProjectDefaults/ProjectDefaults.nuspec index 50634e4..8e785e8 100644 --- a/ProjectDefaults/ProjectDefaults.nuspec +++ b/ProjectDefaults/ProjectDefaults.nuspec @@ -2,7 +2,7 @@ ProjectDefaults - 1.0.138 + 1.0.139 Simon Cropp true MIT diff --git a/ProjectDefaults/editorconfig.txt b/ProjectDefaults/editorconfig.txt index b2f0a42..ab7b07d 100644 --- a/ProjectDefaults/editorconfig.txt +++ b/ProjectDefaults/editorconfig.txt @@ -302,6 +302,8 @@ resharper_braces_for_for = required resharper_return_value_of_pure_method_is_not_used_highlighting = error +resharper_all_underscore_local_parameter_name_highlighting = none + # Xml files [*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}] indent_size = 2