Merge pull request #1009 from microsoft/sync-develop-with-master

Sync develop with master

Author: dilin-MS2

.travis.yml

@@ -21,6 +21,7 @@ addons:
 branches:
   only:
   - master
+  - develop
   - /v?[0-9]+\.[0-9]+\.[0-9]+(.*)?/
 
 env:

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Version 0.3.0
+
+- Release date: March 26, 2020
+
+### Fixed
+
+- Support Electron v7. Fix issue of "Unable to use serial port in VS Code Version 1.43.0". [[#980](https://github.com/microsoft/vscode-arduino/issues/980)]
+- Fix issue of "Fail to debug on Ubuntu". [[#933](https://github.com/microsoft/vscode-arduino/issues/933)]
+- Remove line ending selection. Fix the issue of "Save the last used end of line". [[#952](https://github.com/microsoft/vscode-arduino/issues/952)]
+- Fix the issue of "Can't install libraries from VS Code for ESP8266". [[#930](https://github.com/microsoft/vscode-arduino/issues/930)]
+- Fix the issue of "Project path can not be changed". [[#978](https://github.com/microsoft/vscode-arduino/issues/978)]
+
+Special thanks to [raomin](https://github.com/raomin), thanks for your contributions and feedbacks.
+
 ## Version 0.2.29
 
 - Release date: January 2, 2020

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-arduino",
   "displayName": "Arduino",
   "description": "Arduino for Visual Studio Code",
-  "version": "0.3.0-rc3",
+  "version": "0.3.0",
   "publisher": "vsciot-vscode",
   "aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
   "preview": true,
@@ -537,7 +537,7 @@
   },
   "scripts": {
     "vscode:prepublish": "gulp build --mode=production",
-    "postinstall": "node ./node_modules/vscode/bin/install && cd ./src/views && npm install",
+    "postinstall": "node ./node_modules/vscode/bin/install && cd ./src/views && npm install && node ../../node_modules/node-usb-native/scripts/rebuild-serialport.js",
     "test": "gulp test"
   },
   "extensionDependencies": [
@@ -580,8 +580,8 @@
     "glob": "^7.1.1",
     "iconv-lite": "^0.4.18",
     "impor": "^0.1.1",
+    "node-usb-native": "^0.0.13",
     "properties": "^1.2.1",
-    "usb-native": "^5.0.12",
     "uuid": "^3.0.1",
     "vscode-extension-telemetry": "0.0.18",
     "winreg": "^1.2.3",

package.json

@@ -43,7 +43,7 @@ export class DebuggerManager {
                 }
             }
         }
-        this._usbDetector = require("usb-native").detector;
+        this._usbDetector = require("node-usb-native").detector;
         this._debugServerPath = platform.findFile(platform.getExecutableFileName("openocd"),
             path.join(this._arduinoSettings.packagePath, "packages"));
         if (!util.fileExistsSync(this._debugServerPath)) {

src/debug/debuggerManager.ts

@@ -15,26 +15,25 @@ interface ISerialPortDetail {
 export class SerialPortCtrl {
   public static get serialport(): any {
     if (!SerialPortCtrl._serialport) {
-      SerialPortCtrl._serialport = require("usb-native").SerialPort;
+      SerialPortCtrl._serialport = require("node-usb-native").SerialPort;
     }
     return SerialPortCtrl._serialport;
   }
 
-  public static list(): Promise<ISerialPortDetail[]> {
-    return new Promise((resolve, reject) => {
-      SerialPortCtrl.serialport.list().then(
-        (ports) => resolve(ports),
-        (err) => reject(err),
-      );
-    });
+  public static async list(): Promise<ISerialPortDetail[]> {
+    try {
+      const lists = SerialPortCtrl.serialport.list();
+      return lists;
+    } catch (err) {
+      throw err;
+    }
   }
 
   private static _serialport: any;
 
   private _currentPort: string;
   private _currentBaudRate: number;
   private _currentSerialPort = null;
-  // private const ending = ;
 
   public constructor(port: string, baudRate: number, private _outputChannel: OutputChannel) {
     this._currentBaudRate = baudRate;

src/serialmonitor/serialportctrl.ts

@@ -45,7 +45,7 @@ export class UsbDetector {
         if (os.platform() === "linux" || !enableUSBDetection) {
             return;
         }
-        this._usbDetector = require("usb-native").detector;
+        this._usbDetector = require("node-usb-native").detector;
 
         if (!this._usbDetector) {
             return;

src/serialmonitor/usbDetector.ts

@@ -68,7 +68,7 @@ suite("Arduino: Extension Tests", () => {
         // When running test on osx, the vscode instance is hanging there after tests finished and cause mocha timeout.
         // As a workaround, closing usb-detection process manually would make test window exit normally.
         if (os.platform() !== "linux") {
-            const usbDector = require("usb-native").detector;
+            const usbDector = require("node-usb-native").detector;
             usbDector.stopMonitoring();
         }
     });

test/extension.test.ts

@@ -12,7 +12,7 @@ function getEntry() {
   const mod = JSON.parse(npmListRes);
   const unbundledModule = ['impor', 'uuid',
   // usb-native modules can not be bundled
-  'usb-native', 'usb-detection', '@serialport/bindings', 'bindings', 'serialport'];
+  'node-usb-native', 'usb-detection', '@serialport/bindings', 'bindings', 'serialport'];
 
   for (const mod of unbundledModule) {
     const p = 'node_modules/' + mod;