diff --git a/.gitignore b/.gitignore
index e38451336c..f77341208e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ packages/
 artifacts/
 PublishProfiles/
 .vs/
-.vscode/
 *.user
 *.suo
 *.cache
@@ -26,8 +25,6 @@ nuget.exe
 *.ncrunchsolution
 *.*sdf
 *.ipch
-project.lock.json
-runtimes/
 .build/
 .testPublish/
 launchSettings.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..e69a4b3fda
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "ms-vscode.csharp",
+    "EditorConfig.EditorConfig",
+    "k--kato.docomment",
+    "PeterJausovec.vscode-docker"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000..e91f61ede0
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,75 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Attach: .NET Core",
+      "type": "coreclr",
+      "request": "attach",
+      "processId": "${command:pickProcess}"
+    },
+    {
+      "name": "Debug: SampleApp",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "Compile: solution",
+      "program": "${workspaceRoot}/samples/SampleApp/bin/Debug/netcoreapp1.1/SampleApp.dll",
+      "args": [],
+      "cwd": "${workspaceRoot}/samples/SampleApp",
+      "console": "internalConsole",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "openOnSessionStart",
+      "launchBrowser": {
+        "enabled": true,
+        "args": "${auto-detect-url}",
+        "windows": {
+          "command": "cmd.exe",
+          "args": "/C start ${auto-detect-url}"
+        },
+        "osx": {
+          "command": "open"
+        },
+        "linux": {
+          "command": "xdg-open"
+        }
+      }
+    },
+    {
+      "name": "Debug: LargeResponseApp",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "Compile: solution",
+      "program": "${workspaceRoot}/samples/LargeResponseApp/bin/Debug/netcoreapp1.1/LargeResponseApp.dll",
+      "args": [],
+      "cwd": "${workspaceRoot}/samples/LargeResponseApp",
+      "console": "internalConsole",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "openOnSessionStart",
+      "launchBrowser": {
+        "enabled": true,
+        "args": "${auto-detect-url}",
+        "windows": {
+          "command": "cmd.exe",
+          "args": "/C start ${auto-detect-url}"
+        },
+        "osx": {
+          "command": "open"
+        },
+        "linux": {
+          "command": "xdg-open"
+        }
+      }
+    },
+    {
+      "name": "Debug: CodeGenerator",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "Compile: CodeGenerator",
+      "program": "${workspaceRoot}/tools/CodeGenerator/bin/Debug/netcoreapp1.1/CodeGenerator.dll",
+      "args": [],
+      "cwd": "${workspaceRoot}",
+      "console": "internalConsole",
+      "stopAtEntry": true,
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..2c3c5e92d1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+  "[json]": {
+    "editor.tabSize": 2
+  },
+  "files.trimTrailingWhitespace": true,
+  "files.insertFinalNewline": true,
+  "files.associations": {
+    "*.props": "xml",
+    "*.targets": "xml"
+  }
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000000..1a78cbd21b
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,87 @@
+{
+  "version": "2.0.0",
+  "options": {
+    "env": {
+      "DOTNET_SKIP_FIRST_TIME_EXPERIENCE": "true"
+    }
+  },
+  "tasks": [
+    {
+      "taskName": "Restore: solution",
+      "command": "dotnet",
+      "args": [
+        "restore"
+      ]
+    },
+    {
+      "taskName": "Compile: solution",
+      "isBuildCommand": true,
+      "command": "dotnet",
+      "args": [
+        "build",
+        "${workspaceRoot}/KestrelHttpServer.sln"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "taskName": "Compile: CodeGenerator",
+      "command": "dotnet",
+      "args": [
+        "build"
+      ],
+      "options": {
+        "cwd": "${workspaceRoot}/tools/CodeGenerator/"
+      },
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "taskName": "Run: CodeGenerator",
+      "command": "dotnet",
+      "args": [
+        "run"
+      ],
+      "options": {
+        "cwd": "${workspaceRoot}/tools/CodeGenerator/"
+      }
+    },
+    {
+      "taskName": "Run: Benchmarks",
+      "command": "dotnet",
+      "args": [
+        "run",
+        "-c",
+        "Release"
+      ],
+      "options": {
+        "cwd": "${workspaceRoot}/test/Microsoft.AspNetCore.Server.Kestrel.Performance/"
+      }
+    },
+    {
+      "taskName": "Test: KestrelTests",
+      "isTestCommand": true,
+      "command": "dotnet",
+      "args": [
+        "test",
+        "-f",
+        "netcoreapp1.1"
+      ],
+      "options": {
+        "cwd": "${workspaceRoot}/test/Microsoft.AspNetCore.Server.KestrelTests"
+      },
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "taskName": "Test: FunctionalTests",
+      "command": "dotnet",
+      "args": [
+        "test",
+        "-f",
+        "netcoreapp1.1"
+      ],
+      "options": {
+        "cwd": "${workspaceRoot}/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests"
+      },
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}