Merge pull request #395 from MicrosoftDX/dev

From Dev for 0.5
MicrosoftDX · Jan 20, 2017 · c3539de · c3539de
2 parents 75e6110 + 5512e23
commit c3539de
Show file tree

Hide file tree

Showing 80 changed files with 8,430 additions and 50 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -63,6 +63,32 @@
 			"runtimeExecutable": null,
 			"env": {}
 		},
+		{
+			"name": "Launch botbuilder sample",
+			"type": "node",
+			"program": "${workspaceRoot}/client samples/botbuilder/index.js",
+			"stopOnEntry": false,
+			"args": [
+				"--nolazy"
+			],
+			"cwd": "${workspaceRoot}/client samples/botbuilder",
+			"runtimeExecutable": null,
+			"env": {}
+		},
+		{
+			"name": "Launch ContosoFlowers sample",
+			"type": "node",
+			"program": "${workspaceRoot}/client samples/contosoflowers/app.js",
+			"stopOnEntry": false,
+			"args": [
+				"--nolazy"
+			],
+			"cwd": "${workspaceRoot}/client samples/contosoflowers",
+			"runtimeExecutable": null,
+			"env": {
+				"BING_MAPS_KEY":"K8LDhHtIMTPZO2lkv0RQ~obPXA8ITMZ2m8JanyFpxqg~Aix9KcaOiNfYAEfw3wIjvWXfmK6zMF9anDvj5u44vvPbgow2Ns_EsIsUz4pcmrSa"
+			}
+		},
 		{
 			// Name of configuration; appears in the launch configuration drop down menu.
 			"name": "Launch w/TypeScript",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,4 +2,8 @@
 {
 
 	"editor.fontSize": 15,
+	"search.exclude": {
+		"**/node_modules": false,
+		"**/bower_components": true
+	}
 }
diff --git a/Plugins/Vorlon/.gitignore b/Plugins/Vorlon/.gitignore
@@ -13,4 +13,5 @@
 !plugins/nodejs/**
 !plugins/nodejs/**/*.css
 !plugins/nodejs/**/*.js
-!plugins/nodejs/dom-timeline.js
+!plugins/nodejs/dom-timeline.js
+!plugins/botFrameworkInspector/**/*.css