diff --git a/samples/serverReports/package-lock.json b/samples/serverReports/package-lock.json
index 34c133dcf5..b6649ff650 100644
--- a/samples/serverReports/package-lock.json
+++ b/samples/serverReports/package-lock.json
@@ -1697,8 +1697,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -1719,14 +1718,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -1741,20 +1738,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -1871,8 +1865,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -1884,7 +1877,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -1899,7 +1891,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -1907,14 +1898,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -1933,7 +1922,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -2014,8 +2002,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -2027,7 +2014,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -2113,8 +2099,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2150,7 +2135,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -2170,7 +2154,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2214,14 +2197,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
diff --git a/samples/sp_whoIsActive/package-lock.json b/samples/sp_whoIsActive/package-lock.json
index bbdd82fa24..05ca031a0c 100644
--- a/samples/sp_whoIsActive/package-lock.json
+++ b/samples/sp_whoIsActive/package-lock.json
@@ -45,15 +45,6 @@
"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
"dev": true
},
- "agent-base": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
- "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
- "dev": true,
- "requires": {
- "es6-promisify": "^5.0.0"
- }
- },
"ajv": {
"version": "6.8.1",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.8.1.tgz",
@@ -693,21 +684,6 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
"dev": true
},
- "azdata": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/azdata/-/azdata-1.0.0.tgz",
- "integrity": "sha512-aPdpEBOEfSlkB4LY2m3VRujtYNKR6hCtNUksHj51Pga2JtSNEORx9o4HmPMcK6mjESHfz8OQDM7fXuL1VsbdOA==",
- "dev": true,
- "requires": {
- "glob": "^7.1.2",
- "mocha": "^4.0.1",
- "request": "^2.88.0",
- "semver": "^5.4.1",
- "source-map-support": "^0.5.0",
- "url-parse": "^1.4.4",
- "vscode-test": "^0.1.4"
- }
- },
"bach": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -1657,21 +1633,6 @@
"es6-symbol": "^3.1.1"
}
},
- "es6-promise": {
- "version": "4.2.8",
- "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
- "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
- "dev": true
- },
- "es6-promisify": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
- "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
- "dev": true,
- "requires": {
- "es6-promise": "^4.0.3"
- }
- },
"es6-symbol": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
@@ -2298,8 +2259,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -2714,8 +2674,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2771,7 +2730,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2815,14 +2773,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -3740,16 +3696,6 @@
}
}
},
- "http-proxy-agent": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
- "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
- "dev": true,
- "requires": {
- "agent-base": "4",
- "debug": "3.1.0"
- }
- },
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -3761,16 +3707,6 @@
"sshpk": "^1.7.0"
}
},
- "https-proxy-agent": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
- "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
- "dev": true,
- "requires": {
- "agent-base": "^4.3.0",
- "debug": "^3.1.0"
- }
- },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -7741,16 +7677,6 @@
}
}
},
- "vscode-test": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.1.5.tgz",
- "integrity": "sha512-s+lbF1Dtasc0yXVB9iQTexBe2JK6HJAUJe3fWezHKIjq+xRw5ZwCMEMBaonFIPy7s95qg2HPTRDR5W4h4kbxGw==",
- "dev": true,
- "requires": {
- "http-proxy-agent": "^2.1.0",
- "https-proxy-agent": "^2.2.1"
- }
- },
"vso-node-api": {
"version": "6.5.0",
"resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.5.0.tgz",
diff --git a/samples/sp_whoIsActive/package.json b/samples/sp_whoIsActive/package.json
index b5479f578b..fb0abbaaac 100644
--- a/samples/sp_whoIsActive/package.json
+++ b/samples/sp_whoIsActive/package.json
@@ -241,7 +241,7 @@
"compile": "gulp compile",
"watch": "gulp watch",
"typings": "gulp copytypings",
- "postinstall": "node ./node_modules/vscode/bin/install && node ./node_modules/azdata/bin/install && gulp copytypings"
+ "postinstall": "node ./node_modules/vscode/bin/install && gulp copytypings"
},
"dependencies": {
"fs-extra": "^5.0.0",
@@ -251,7 +251,6 @@
"devDependencies": {
"@types/mocha": "^2.2.42",
"@types/node": "^7.0.43",
- "azdata": "^1.0.0",
"child-process-promise": "^2.2.1",
"del": "^3.0.0",
"gulp": "^4.0.0",
diff --git a/samples/sp_whoIsActive/tasks/buildtasks.js b/samples/sp_whoIsActive/tasks/buildtasks.js
index b201e4a495..9302f225d6 100644
--- a/samples/sp_whoIsActive/tasks/buildtasks.js
+++ b/samples/sp_whoIsActive/tasks/buildtasks.js
@@ -24,8 +24,7 @@ gulp.task('clean', function(done) {
gulp.task('lint', () => {
return gulp.src([
- config.paths.project.root + '/src/**/*.ts',
- config.paths.project.root + '/test/**/*.ts'
+ config.paths.project.root + '/src/**/*.ts'
])
.pipe((tslint({
formatter: "verbose"
@@ -62,27 +61,8 @@ gulp.task('compile:src', function(done) {
.pipe(gulp.dest('out/src/'));
});
-gulp.task('compile:test', function(done) {
- let srcFiles = [
- config.paths.project.root + '/test/**/*.ts',
- config.paths.project.root + '/typings/**/*.ts'
- ];
-
- return gulp.src(srcFiles)
- .pipe(srcmap.init())
- .pipe(tsProject())
- .on('error', function() {
- if(process.env.BUILDMACHINE) {
- done('Failed to compile test source, see above.');
- process.exit(1);
- }
- })
- .pipe(srcmap.write('.', {sourceRoot: function(file) { return file.cwd + '/test'; }}))
- .pipe(gulp.dest('out/test/'));
-});
-
// COMPOSED GULP TASKS /////////////////////////////////////////////////////
-gulp.task("compile", gulp.series("compile:src", "compile:test"));
+gulp.task("compile", gulp.series("compile:src"));
gulp.task("build", gulp.series("clean", "lint", "compile"));
@@ -91,33 +71,3 @@ gulp.task("watch", function() {
config.paths.project.root + '/test/**/*.ts'],
gulp.series('build'));
});
-
-gulp.task('test', (done) => {
- let workspace = process.env['WORKSPACE'];
- if (!workspace) {
- workspace = process.cwd();
- }
- process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml';
-
- let azuredatastudioPath = 'azuredatastudio';
- if (process.env['VSCODE_DEV']) {
- let suffix = os.platform === 'win32' ? 'bat' : 'sh';
- azuredatastudioPath = `${process.env['VSCODE_DEV']}/scripts/sql-cli.${suffix}`;
- }
- console.log(`Using ADS Path of ${azuredatastudioPath}`);
-
- cproc.exec(`${azuredatastudioPath} --extensionDevelopmentPath="${workspace}" --extensionTestsPath="${workspace}/out/test" --verbose`, (error, stdout, stderr) => {
- if (error) {
- console.error(`exec error: ${error}`);
- process.exit(1);
- }
- console.log(`stdout: ${stdout}`);
- console.log(`stderr: ${stderr}`);
- done();
- });
-});
-
-gulp.task('copytypings', function() {
- return gulp.src(config.paths.project.root + '/../../src/sql/azdata.d.ts')
- .pipe(gulp.dest('typings/'));
-});
diff --git a/samples/sp_whoIsActive/typings/ref.d.ts b/samples/sp_whoIsActive/typings/ref.d.ts
new file mode 100644
index 0000000000..c86da564fa
--- /dev/null
+++ b/samples/sp_whoIsActive/typings/ref.d.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+///
+///
\ No newline at end of file