diff --git a/.gitignore b/.gitignore
index 5251ae17d..5d034f20d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 **/vendor/
 **/node_modules/
 **/bin
-**/.vscode/
+**/.vscode/**/*
 **/.vs/
 **/.ionide/
 **/.idea/
@@ -17,6 +17,9 @@ coverage.cov
 # VSCode creates this binary when running tests in the debugger
 **/debug.test
 
+# Check in vscode settings for this workspace. This is so we can save common settings like setting go build tags to use by default.
+!**/.vscode/settings.json
+
 # Go tests run "in tree" and this folder will linger if they fail (the integration test framework cleans
 # it up when they pass.)
 **/command-output/
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..58553e414
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "go.buildTags": "all"
+}
\ No newline at end of file