Merge branch 'master' into data-logging-doc

editor/extension.ts

@@ -222,13 +222,9 @@ namespace pxt.editor {
         })
     }
 
-    export function deployCoreAsync(resp: pxtc.CompileResult, isCli = false): Promise<void> {
+    export function deployCoreAsync(resp: pxtc.CompileResult, d: pxt.commands.DeployOptions = {}): Promise<void> {
         let saveHexAsync = () => {
-            if (isCli) {
+            return pxt.commands.saveOnlyAsync(resp)
-                return Promise.resolve()
-            } else {
-                return pxt.commands.saveOnlyAsync(resp)
-            }
         }
 
         startTime = 0
@@ -331,8 +327,16 @@ namespace pxt.editor {
                         return wrap.cortexM.reset(false)
                     })
             })
-            .catch(e => {
+            .catch(e => {  
-                return saveHexAsync();
+                if (e.type === "devicenotfound" && d.reportError) {
+                    if (d.reportError) {
+                        d.reportError(Util.lf("Please connect your device."))
+                    } else {
+                        console.error(e)
+                    }
+                } else {
+                    saveHexAsync()
+                }           
             })
     }
 

package.json

@@ -38,6 +38,6 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.14.5"
+    "pxt-core": "0.14.7"
   }
 }