diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..4cab1f4d2676
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
diff --git a/.gitignore b/.gitignore
index 9ec00d3de5f0..75d0a52fa21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,6 @@ SdkCodeGen
 # Visual Studio #
 .settings/
 .vs/
-.vscode/
 /app.js
 *.suo
 *.user
@@ -105,4 +104,9 @@ output/*
 errors.txt
 warnings.txt
 
-/dist/
\ No newline at end of file
+# VS Code files
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json