Merge pull request #1 from PowerShell/master

Master

Author: PowerSchill

.gitignore

@@ -5,7 +5,9 @@ out/
 node_modules/
 logs/
 modules/*
+sessions/*
 !modules/README.md
 vscode-powershell.zip
 vscps-preview.zip
-*.vsix
+*.vsix
+npm-debug.log

.vscode/launch.json

@@ -9,12 +9,13 @@
 			"args": [ "--extensionDevelopmentPath=${workspaceRoot}" ],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/out",
-			"preLaunchTask": "compile"
+			"outFiles": ["${workspaceRoot}/out"],
+			"preLaunchTask": "Build"
 		},
 		{
 			"name": "Attach",
 			"type": "node",
+			"request": "attach",
 			"address": "localhost",
 			"port": 5858,
 			"sourceMaps": false

.vscode/settings.json

@@ -1,11 +1,9 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-	// Controls the rendering size of tabs in characters. Accepted values: "auto", 2, 4, 6, etc. If set to "auto", the value will be guessed when a file is opened.
-	"editor.tabSize": 4,
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true,
+    "files.trimTrailingWhitespace": true,
 
-	// Controls if the editor will insert spaces for tabs. Accepted values:  "auto", true, false. If set to "auto", the value will be guessed when a file is opened.
-	"editor.insertSpaces": true,
-
-	// When enabled, will trim trailing whitespace when you save a file.
-	"files.trimTrailingWhitespace": true
+    // Lock the TypeScript SDK path to the version we use
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }

.vscode/tasks.json

@@ -1,54 +1,37 @@
-// Available variables which can be used inside of strings.
-// ${workspaceRoot}: the root folder of the team
-// ${file}: the current opened file
-// ${fileBasename}: the current opened file's basename
-// ${fileDirname}: the current opened file's dirname
-// ${fileExtname}: the current opened file's extension
-// ${cwd}: the current working directory of the spawned process
-
-// A task runner that calls a custom npm script that compiles the extension.
 {
-	"version": "0.1.0",
-
-	// we want to run npm
-	"command": "npm",
-
-	// the command is a shell script
-	"isShellCommand": true,
+    "version": "2.0.0",
+
+    "windows": {
+        "command": "${env.windir}\\sysnative\\windowspowershell\\v1.0\\PowerShell.exe",
+        "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ]
+    },
+    "linux": {
+        "command": "/usr/bin/powershell",
+        "args": [ "-NoProfile" ]
+    },
+    "osx": {
+        "command": "/usr/local/bin/powershell",
+        "args": [ "-NoProfile" ]
+    },
+
+    "showOutput": "always",
 
     "tasks": [
         {
-            "taskName": "install",
-            "showOutput": "always"
+            "taskName": "Install",
+            "suppressTaskName": true,
+            "args": [ "Invoke-Build Restore" ]
         },
         {
-            "taskName": "compile",
+            "taskName": "Clean",
             "suppressTaskName": true,
-
-            // show the output window only if unrecognized errors occur.
-            "showOutput": "silent",
-
-            // we run the custom script "compile" as defined in package.json
-            "args": ["run", "compile"],
-
-            // use the standard tsc problem matcher to find compile problems in the output.
-            "problemMatcher": "$tsc"
+            "args": [ "Invoke-Build Clean" ]
         },
         {
-            "taskName": "compile-watch",
+            "taskName": "Build",
             "suppressTaskName": true,
-
-            // show the output window only if unrecognized errors occur.
-            "showOutput": "silent",
-
-            // we run the custom script "compile-watch" as defined in package.json
-            "args": ["run", "compile-watch"],
-
-            // The tsc compiler is started in watching mode
-            "isWatching": true,
-
-            // use the standard tsc in watch mode problem matcher to find compile problems in the output.
-            "problemMatcher": "$tsc-watch"
+            "isBuildCommand": true,
+            "args": [ "Invoke-Build Build" ]
         }
     ]
 }

.vscodeignore

@@ -1,4 +1,5 @@
 .vscode/**
+vscode-powershell.build.ps1
 typings/**
 **/*.ts
 .gitignore
@@ -7,5 +8,7 @@ build/**
 bin/EditorServices.log
 bin/DebugAdapter.log
 bin/*.vshost.*
-logs/
-
+bin/PowerShell/**
+logs/**
+sessions/**
+scripts/Install-VSCode.ps1