diff --git a/.editorconfig b/.editorconfig
index a77e827f..3581d680 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,10 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
+[*]
+# editors create UTF-8 only
+charset = utf-8
+
 [*.{cs,xml,csproj,sln}]
 
 #Core editorconfig formatting - indentation
diff --git a/.gitattributes b/.gitattributes
index a1ffca9e..6410ea78 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,7 +9,7 @@
 *.msg text
 *.txt text
 *.yml text
-*.cs text diff=csharp
+*.cs text=auto eol=lf diff=csharp
 *.md text diff=markdown
 *.editorconfig text
 *.json text