From 50c4c7a425b32f54e34dea96981e2cd4e441c5a1 Mon Sep 17 00:00:00 2001 From: Eyas Date: Sat, 12 Sep 2015 21:21:50 -0400 Subject: [PATCH 1/2] Update Visual Studio Code ignores In Visual Studio Code 0.8.0, .settings is renamed to .vscode; adds .vscode ignores to .gitignore with an override for tasks.json per #3156, and removes vscode override for .settings --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58a45545939..bd7bebb9d85 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ tests/services/baselines/local/* tests/baselines/prototyping/local/* tests/baselines/rwc/* tests/baselines/test262/* -tests/baselines/reference/projectOutput/* +tests/baselines/reference/projectOutput/* tests/baselines/local/projectOutput/* tests/services/baselines/prototyping/local/* tests/services/browser/typescriptServices.js @@ -48,5 +48,6 @@ scripts/*.js.map coverage/ internal/ **/.DS_Store -.settings/* -!.settings/tasks.json +.settings +.vscode/* +!.vscode/tasks.json From c43754f6d63d56d2342b2d43658586fd7aaeb58f Mon Sep 17 00:00:00 2001 From: Eyas Date: Sat, 12 Sep 2015 22:30:08 -0400 Subject: [PATCH 2/2] Also ignore .vscode from .npmignore --- .npmignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index 2b75d37f70a..5adb2d228c7 100644 --- a/.npmignore +++ b/.npmignore @@ -5,4 +5,5 @@ src tests Jakefile .travis.yml -.settings/ \ No newline at end of file +.settings/ +.vscode/ \ No newline at end of file