diff --git a/.editorconfig b/.editorconfig
index 3aef28127..6c94905a5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,3 +4,14 @@ root = true
 charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
+
+[*.{vcxproj,filters,vcxitems}]
+insert_final_newline = false
+end_of_line = crlf
+tab_width = 2
+
+[*.sln]
+insert_final_newline = false
+end_of_line = crlf
+indent_style = tab
+tab_width = 4
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
index 9b320a0ba..a29cab2bd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -35,6 +35,25 @@
 *.isl           text
 *.iss           text
 
+# Visual Studio file exceptions
+
+*.sln        text eol=crlf
+*.csproj     text eol=crlf
+*.vbproj     text eol=crlf
+*.vcxproj    text eol=crlf
+*.vcproj     text eol=crlf
+*.dbproj     text eol=crlf
+*.fsproj     text eol=crlf
+*.lsproj     text eol=crlf
+*.wixproj    text eol=crlf
+*.modelproj  text eol=crlf
+*.sqlproj    text eol=crlf
+*.wwaproj    text eol=crlf
+*.xproj      text eol=crlf
+*.props      text eol=crlf
+*.filters    text eol=crlf
+*.vcxitems   text eol=crlf
+
 # All files that are binary and should not be normalized
 
 # Binary Java files