Merge 57a358e into 6ccd353

microsoft · Dec 19, 2019 · 2e52ecd · 2e52ecd
2 parents 6ccd353 + 57a358e
commit 2e52ecd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 36 deletions.
diff --git a/build/build.yml b/build/build.yml
@@ -39,11 +39,6 @@ steps:
     verbose: false
     customCommand: 'install -g gulp-cli'
 
-- task: Gulp@0
-  displayName: 'gulp install'
-  inputs:
-    targets: install
-
 - bash: |
    export BUILDMACHINE=true
    export VsMsSqlEnv=dev

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,6 +1,5 @@
 var gulp = require('gulp');
 var rename = require('gulp-rename');
-var install = require('gulp-install');
 var gulpTsLint = require('gulp-tslint');
 var ts = require('gulp-typescript');
 var tslint = require('tslint');
@@ -238,29 +237,30 @@ gulp.task('ext:localization', gulp.series('ext:localization:xliff-to-ts', 'ext:l
 
 gulp.task('ext:build', gulp.series('ext:localization', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view')); // removed lint before copy
 
-gulp.task('ext:test', async () => {
+gulp.task('ext:test', (done) => {
     let workspace = process.env['WORKSPACE'];
     if (!workspace) {
         workspace = process.cwd();
     }
     process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml';
     var args = ['--verbose', '--disable-gpu', '--disable-telemetry', '--disable-updates', '-n'];
     let vscodeVersion = packageJson.engines.vscode.slice(1);
-    let vscodePath = await vscodeTest.downloadAndUnzipVSCode(vscodeVersion);
     let extensionTestsPath = `${workspace}/out/test`;
-    try {
-        await vscodeTest.runTests({
-            vscodeExecutablePath: vscodePath,
-            extensionDevelopmentPath: workspace,
-            extensionTestsPath: extensionTestsPath,
-            launchArgs: args
-        });
-    } catch (error) {
-        console.log(`stdout: ${stdout}`);
-        console.log(`stderr: ${stderr}`);
-        console.error(`exec error: ${error}`);
-        throw(error);
-    }
+    vscodeTest.downloadAndUnzipVSCode(vscodeVersion).then((vscodePath) => {
+        if (vscodePath) {
+            vscodeTest.runTests({
+                vscodeExecutablePath: vscodePath,
+                extensionDevelopmentPath: workspace,
+                extensionTestsPath: extensionTestsPath,
+                launchArgs: args
+            }).then(() => done()).catch((error) => {
+                console.log(`stdout: ${process.stdout}`);
+                console.log(`stderr: ${process.stderr}`);
+                console.error(`exec error: ${error}`);
+                throw(error);
+            });
+        }
+    })
 });
 
 gulp.task('test', gulp.series('ext:test'));
@@ -273,13 +273,8 @@ gulp.task('clean', function (done) {
 
 gulp.task('build', gulp.series('clean', 'ext:build', 'ext:install-service'));
 
-gulp.task('install', function() {
-    return gulp.src(['./package.json'])
-                .pipe(install());
-});
-
 gulp.task('watch', function(){
     return gulp.watch(config.paths.project.root + '/src/**/*', gulp.series('build'))
 });
 
-// gulp.task('lint', gulp.series('ext:lint'));
+gulp.task('lint', gulp.series('ext:lint'));
diff --git a/install.js b/install.js
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "@types/mocha": "^5.2.7",
     "@types/tmp": "0.0.28",
     "@types/underscore": "1.8.3",
-    "@types/vscode": "^1.1.33",
+    "@types/vscode": "^1.38.0",
     "assert": "^1.4.1",
     "chai": "^3.5.0",
     "copy-paste": "^1.3.0",

diff --git a/yarn.lock b/yarn.lock
@@ -120,7 +120,7 @@
   resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.3.tgz#d3cb512dd3dde32b2bbba4be0ca68bd3dad4a1f5"
   integrity sha512-DP70788BXjp9+CKArXOUlNkZaXa+rHonDpbqH3/74ez16dLL5z2/bMT37etbln5J+H9M07NbRUyduDIoTM2tnw==
 
-"@types/vscode@^1.1.33":
+"@types/vscode@^1.38.0":
   version "1.41.0"
   resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.41.0.tgz#b0d75920220f84e07093285e59180c0f11d336cd"
   integrity sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A==