Merge branch 'feature/angular2' of https://github.com/aguacongas/chat…

…le.git
aguacongas · Sep 2, 2016 · 7885fb2 · 7885fb2
2 parents b74ee90 + d30eebf
commit 7885fb2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,9 +6,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/chatle.dll",
+            "program": "${workspaceRoot}/src/chatle/bin/Debug/netcoreapp1.0//osx.10.11-x64//chatle.dll",
             "args": [],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceRoot}/src/chatle",
             "stopAtEntry": false,
             "externalConsole": false
         },
@@ -17,9 +17,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/chatle.dll",
+            "program": "${workspaceRoot}/src/chatle/bin/Debug/netcoreapp1.0//osx.10.11-x64//chatle.dll",
             "args": [],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceRoot}/src/chatle",
             "stopAtEntry": false,
             "launchBrowser": {
                 "enabled": true,

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,16 +1,16 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "0.1.0",
     "command": "dotnet",
     "isShellCommand": true,
     "args": [],
+    "options":  {
+        "cwd": "${workspaceRoot}/src/chatle/"
+    },
     "tasks": [
         {
             "taskName": "build",
             "args": [ ],
             "isBuildCommand": true,
-            "showOutput": "always",
             "problemMatcher": "$msCompile"
         }
     ]